From 37a0b120e66bcda386b0a8c256ca0fe9f09b29cb Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 29 六月 2023 18:16:26 +0800
Subject: [PATCH] 司机首页添加状态,细节修改

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index 58d7001..ba94a84 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -290,7 +290,6 @@
 					'杞嚭') {
 					if (this.weighList.skin == 0) {
 						this.temporaryWeighObj.skin = newV;
-						this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus;
 					} else {
 						this.temporaryWeighObj.hair = newV;
 						this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
@@ -301,7 +300,6 @@
 					.orderType == '杞叆') {
 					if (this.weighList.hair == 0) {
 						this.temporaryWeighObj.hair = newV;
-						this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus;
 					} else {
 						this.temporaryWeighObj.skin = newV;
 						this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
@@ -373,9 +371,9 @@
 						this.weighData.filedId = res.data.filedId;
 						this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
 						this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
-						this.outBuy = (this.weighList.orderType.indexOf('閿�') !== -1) && this.showWeigh.hair > 0;
-						// 缁х画鍗歌揣绗簩娆$О閲嶅氨浼氭湁锛屾棤璁㈠崟绫诲瀷闄愬埗
-						this.canUnload = this.showWeigh.hair > 0 || this.showWeigh.skin > 0;
+						this.outBuy = (this.weighList.orderType.indexOf('閿�') !== -1) && this.showWeigh.skin > 0;
+						// 缁х画鍗歌揣鍙湁澶栬喘绫诲瀷绗簩娆′細鏈�
+						this.canUnload = this.weighList.orderType === '澶栬喘' && this.showWeigh.hair > 0;
 					}
 				});
 			},
@@ -437,7 +435,8 @@
 					gateCameraId: this.weighData.gateCameraId,
 					equipmentCode: this.weighData.equipmentCode,
 					tmCode: this.weighData.tmCode,
-					sceneInOut: this.weighData.sceneInOut
+					sceneInOut: this.weighData.sceneInOut,
+					weigh: this.realTimeWeigh
 				}, 'json').then(res => {
 					if (res.code == 0) {
 						this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -465,11 +464,16 @@
 					gateCameraId: this.weighData.gateCameraId,
 					equipmentCode: this.weighData.equipmentCode,
 					tmCode: this.weighData.tmCode,
-					sceneInOut: this.weighData.sceneInOut
+					sceneInOut: this.weighData.sceneInOut,
+					weigh: this.realTimeWeigh
 				}, 'json').then(res => {
 					if (res.code == 0) {
-						this.$u.toast('鎿嶄綔鎴愬姛');
-
+						this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1000);
 					} else {
 						this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅�欓噸璇�');
 					}

--
Gitblit v1.9.1