From 81b3c20184fe89b4c8e9bdbe45276748778a1d95 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 08 三月 2024 15:40:34 +0800
Subject: [PATCH] 添加注释
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 12e0f29..47a3abb 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -38,6 +38,12 @@
<view class="order-code"
v-if="!isSpecial">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
+ <view class="stream-view"
+ style="color: #475bfd;"
+ @click="streamView"
+ v-show="timeLineStatus===9">
+ 鏌ョ湅瑁呰浇鎯呭喌
+ </view>
<view class="weigh-item">
<view class="item">
<view class="concrete"
@@ -199,10 +205,11 @@
@click="cengZhongClick"
type="primary"
shape="circle"
- :disabled="haveInputOrigin&&!isSpecial"></u-button>
+ :disabled="haveInputOrigin&&!isSpecial"
+ :loading="weighHouseLoading"></u-button>
</view>
<view class="weigh-button"
- v-show='ablePrintInduction'>
+ v-show='ablePrintInduction&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
<u-button text="鎵撳嵃鍏ラ棬璇�"
@click="printBefore('in')"
type="primary"
@@ -232,14 +239,14 @@
@confirm="evacuationConfirm"
@cancel="evacuationCancel"></u-modal>
</view>
- <view class="completeOutSale">
+ <!-- <view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
- </view>
+ </view> -->
<view class="serviece-customer">
<u-action-sheet :actions="list"
@select="selectClick"
@@ -280,10 +287,10 @@
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
this.originInfoVisible = value.orderType === '澶栬喘'
- if (value.overTmWaixiao) {
- this.overTmWaixiao = value.overTmWaixiao
- this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
- }
+ // if (value.overTmWaixiao) {
+ // this.overTmWaixiao = value.overTmWaixiao
+ // this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
+ // }
this.fileList1 = []
this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
@@ -406,11 +413,13 @@
timeout: '0',
wsgShow: false,
timeLineStatus: null,
+ timeLineEqCode: '',
originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
submitOriginInfoLoading: false,
ischeckedDefault: 0,
isSpecial: null, //1 鏄壒娈� 0涓嶆槸鐗规畩
printerType: '', //鍒ゆ柇鎵撳嵃鐨勬槸鍑洪棬璇佽繕鏄叆闂ㄨ瘉
+ weighHouseLoading: false
};
},
watch: {
@@ -475,6 +484,7 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -518,11 +528,11 @@
this.orderType = this.coalDetailsData.orderType;
//
this.isSpecial = res.data.isSpecial
- // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
- this.completeOutSale.orderType = this.coalDetailsData.orderType;
- this.completeOutSale.deptId = this.coalDetailsData.deptId;
- this.completeOutSale.filedId = this.coalDetailsData.filedId;
- this.completeOutSale.clean = this.coalDetailsData.clean;
+ // // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
+ // this.completeOutSale.orderType = this.coalDetailsData.orderType;
+ // this.completeOutSale.deptId = this.coalDetailsData.deptId;
+ // this.completeOutSale.filedId = this.coalDetailsData.filedId;
+ // this.completeOutSale.clean = this.coalDetailsData.clean;
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -572,7 +582,12 @@
let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
.coalDetailsData
.yuYueSection.slice(-5);
- if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
+ // 鏈�澶х害鏉熸椂闂� maxRestrainTime
+ const maxRestrainTime = dayjs().subtract(this.coalDetailsData.flexibleTime,
+ 'minute')
+ .format('YYYY-MM-DD HH:mm:ss');
+ console.log(maxRestrainTime, this.correctStatus);
+ if (dayjs(maxRestrainTime).isAfter(endTime) && this.correctStatus <= 1) {
// this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
this.timeout = '1'
}
@@ -585,6 +600,7 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -688,8 +704,10 @@
// 绉伴噸
cengZhongClick() {
this.changeglobalIsFirstWeighing(2)
+ this.weighHouseLoading = true
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
console.log(res, '鑾峰彇纾呮埧');
+ this.weighHouseLoading = false
if (res.code == 0) {
this.weighData.sceneId = res.data.id;
this.weighData.gateCameraId = res.data.lastEquipmentId;
@@ -713,7 +731,9 @@
} else {
this.$u.toast(res.msg ? res.msg : '鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
- });
+ }).catch(() => {
+ this.weighHouseLoading = false
+ })
},
// 鏀剧┖
evacuation() {
@@ -950,6 +970,11 @@
} else {
uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
}
+ },
+ streamView() {
+ uni.navigateTo({
+ url: `/pages/public-page/driverStream/driverStream?eqCode=${this.timeLineEqCode}`
+ })
}
}
};
@@ -1110,6 +1135,12 @@
color: #7d7d7d;
}
+ .stream-view {
+ height: vww(18);
+ margin: vww(8);
+ margin-left: 0;
+ }
+
.weigh-item {
width: 100%;
height: vww(36);
--
Gitblit v1.9.1