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 |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 19 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 5700c82..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
@@ -2,7 +2,8 @@
 	<view class="bill-of-lading-details">
 		<view class="top-banner" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
 			<view class="top-information">
-				<view class="cutomer-name">瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
+				<view class="cutomer-name" v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+				<view class="cutomer-name" v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
 				<view class="fild-name">
 					<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
 					<view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
@@ -19,7 +20,7 @@
 							style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
 										background-size: cover;"
 						>
-							{{ coalStatus[coalDetailsData.status] }}
+							{{ coalStatus[coalDetailsData.status] || '' }}
 						</view>
 					</view>
 					<view class="time">
@@ -27,7 +28,7 @@
 						<view class="send-date">{{ coalDetailsData.sendDate }}</view>
 					</view>
 					<view class="coal-code">鎻愮叅鍗曠紪鍙�:&nbsp;&nbsp;{{ coalDetailsData.code || '' }}</view>
-					<view class="order-code">璁㈠崟缂栧彿:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ coalDetailsData.orderCode || '' }}</view>
+					<view class="order-code">璁㈠崟缂栧彿:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ coalDetailsData.orderCode || '' }}</view>
 					<view class="weigh-item">
 						<view class="item">
 							<view class="concrete" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">鐨�</view>
@@ -58,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"></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>
@@ -140,11 +141,17 @@
 			primarySkin: null,
 			primaryHair: null,
 			primaryClean: null,
-			scrollTop: 0
+			scrollTop: 0,
+			// 纾呭崟绫诲瀷
+			orderType: '',
+			interval: ''
 		};
 	},
 	onShow() {
 		this.init();
+	},
+	beforeDestroy() {
+		clearInterval(this.interval);
 	},
 	computed: {
 		...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -163,10 +170,31 @@
 			let date = time.getDate();
 			date = date < 10 ? '0' + date : date;
 			return `${year}-${month}-${date}`;
+		},
+		//
+		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(); //鑾峰彇瀹㈡湇
@@ -189,10 +217,15 @@
 		},
 		// 鑾峰彇鎻愮叅鍗曡鎯�
 		getTakeCoal() {
+			uni.showLoading({
+				title: '鍔犺浇涓�'
+			});
 			this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
 				if (res.code == 0) {
+					uni.hideLoading();
 					console.log(res, '鎻愮叅鍗曡鎯�');
 					this.coalDetailsData = res.data;
+					this.orderType = this.coalDetailsData.orderType;
 					// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
 					this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
 					this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -212,25 +245,29 @@
 					this.primarySkin = this.coalDetailsData.skinTwo;
 					this.primaryHair = this.coalDetailsData.hairTwo;
 					this.primaryClean = this.coalDetailsData.cleanTwo;
+				} else {
+					this.$u.toast('鍔犺浇澶辫触');
 				}
 			});
 		},
 		// 鏃ュ織鏌ヨ
 		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