From ae1aad66a165ee7253bed2127a3b53baa40c2361 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 08:35:33 +0800
Subject: [PATCH] 修复错误,增加验证

---
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue |   55 +++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 16 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 6cdfb20..78cd944 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
@@ -59,7 +59,7 @@
 					<u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle"></u-button>
 				</view>
 				<view class="bottom-button">
-					<u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="!isEvacuation"></u-button>
+					<u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="isEvacuation || isapproach"></u-button>
 					<u-button text="鍛煎彨瀹㈡湇" type="primary" plain @click="callCustomerService" shape="circle"></u-button>
 				</view>
 			</view>
@@ -143,11 +143,15 @@
 			primaryClean: null,
 			scrollTop: 0,
 			// 纾呭崟绫诲瀷
-			orderType: ''
+			orderType: '',
+			interval: ''
 		};
 	},
 	onShow() {
 		this.init();
+	},
+	beforeDestroy() {
+		clearInterval(this.interval);
 	},
 	computed: {
 		...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -170,10 +174,27 @@
 		//
 		isEvacuation() {
 			return this.coalDetailsData.hair == 0 || this.coalDetailsData.skin == 0;
+		},
+		isapproach() {
+			return this.currentPageCoalStatus < 3;
 		}
 	},
 	methods: {
 		init() {
+			this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+				if (res.code == 0) {
+					this.dayRZ = res.data;
+					this.dayRZ = this.dayRZ.map(v => {
+						let slicedate = v.taskStatusDes.slice(0, 10);
+						if (slicedate == this.currentDate) {
+							return {
+								...v,
+								taskStatusDes: v.taskStatusDes.slice(10)
+							};
+						}
+					});
+				}
+			});
 			this.coalDayPage(); //鑾峰彇鏃ュ織
 			this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
 			this.getgetService(); //鑾峰彇瀹㈡湇
@@ -231,20 +252,22 @@
 		},
 		// 鏃ュ織鏌ヨ
 		coalDayPage() {
-			this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
-				if (res.code == 0) {
-					this.dayRZ = res.data;
-					this.dayRZ = this.dayRZ.map(v => {
-						let slicedate = v.taskStatusDes.slice(0, 10);
-						if (slicedate == this.currentDate) {
-							return {
-								...v,
-								taskStatusDes: v.taskStatusDes.slice(10)
-							};
-						}
-					});
-				}
-			});
+			this.interval = setInterval(() => {
+				this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+					if (res.code == 0) {
+						this.dayRZ = res.data;
+						this.dayRZ = this.dayRZ.map(v => {
+							let slicedate = v.taskStatusDes.slice(0, 10);
+							if (slicedate == this.currentDate) {
+								return {
+									...v,
+									taskStatusDes: v.taskStatusDes.slice(10)
+								};
+							}
+						});
+					}
+				});
+			}, 5000);
 		},
 		// 灞曠ず鎻愮叅鍗曡鎯�
 		showCaolPickUpBill() {

--
Gitblit v1.9.1