From aef949a659d073443e81f22686b44bd440a69a0e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 25 十二月 2023 14:15:46 +0800
Subject: [PATCH] 修改称重连点问题 增加司机注册字段

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   46 ++++++++++++++++++++++------------------------
 1 files changed, 22 insertions(+), 24 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 6ecdc32..88d9137 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
@@ -503,33 +503,31 @@
 			 * @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
 			 */
 			confirmWeigh() {
-				if (this.isConfirmWeighLoading == false) {
-					this.isConfirmWeighLoading = true;
-					if (this.weighData.weigh != 0) {
-						// 濡傛灉姝e湪绉扮毊
-						if (this.isSkinWeigh) {
-							// 濡傛灉骞冲潎鐨噸涓�0
-							if (this.isAbnormalAvgSkin) {
-								this.abnormalModalShow = false
-								this.saveWeigh();
-							} else {
-								let xx = new BigNumber(this.avgSkin)
-								let yy = new BigNumber(this.globalweigh)
-								if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
-									this.abnormalModalShow = true
-									this.skinAbnormal()
-								} else {
-									this.saveWeigh();
-								}
-							}
-						} else {
+				this.isConfirmWeighLoading = true;
+				if (this.weighData.weigh != 0) {
+					// 濡傛灉姝e湪绉扮毊
+					if (this.isSkinWeigh) {
+						// 濡傛灉骞冲潎鐨噸涓�0
+						if (this.isAbnormalAvgSkin) {
+							this.abnormalModalShow = false
 							this.saveWeigh();
+						} else {
+							let xx = new BigNumber(this.avgSkin)
+							let yy = new BigNumber(this.globalweigh)
+							if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+								this.abnormalModalShow = true
+								this.skinAbnormal()
+							} else {
+								this.saveWeigh();
+							}
 						}
-
 					} else {
-						this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
-						this.isConfirmWeighLoading = false;
+						this.saveWeigh();
 					}
+
+				} else {
+					this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+					this.isConfirmWeighLoading = false;
 				}
 			},
 			// 纭绉伴噸鎺ュ彛
@@ -540,11 +538,11 @@
 						console.log(res, '绉伴噸鎺ュ彛');
 						if (res.code == 0) {
 							this.$u.toast('绉伴噸鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
-							this.isConfirmWeighLoading = false;
 							setTimeout(() => {
 								uni.navigateBack({
 									delta: 1
 								});
+								this.isConfirmWeighLoading = false;
 							}, 1000);
 						} else if (res.code === 3) {
 							this.isExceedOrigin = true

--
Gitblit v1.9.1