From 97d88adcdfa7e13b2203c8716c02866fae087704 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 26 九月 2023 09:38:47 +0800
Subject: [PATCH] 修改磅房忙碌问题及其他问题

---
 pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 7549489..7e18b5a 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
@@ -130,7 +130,7 @@
 								height="150"
 								:previewFullImage="true"
 								:disabled="isModifyoriginInfo"
-								:deletable='!deletable'></u-upload>
+								:deletable="!deletable"></u-upload>
 						</u-form-item>
 					</u-form>
 					<view class="submit-button">
@@ -241,7 +241,7 @@
 		</view>
 		<!-- 纾呮埧蹇欑鎻愮ず寮圭獥 -->
 		<view class="">
-			<u-modal :show="wsgVisiable"
+			<u-modal :show="wsgShow"
 				title="鎻愮ず"
 				:content="wsgContent"
 				@confirm="wsgContentConfirm"></u-modal>
@@ -269,7 +269,9 @@
 				this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
 			}
 			this.fileList1 = []
+			this.changeglobalIsFirstWeighing(1)
 			if (this.globalIsFirstWeighing === 1) {
+				console.log('鑾峰彇璇︽儏 onload');
 				this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
 			}
 			this.init(); //鑾峰彇鏃ュ織
@@ -277,6 +279,7 @@
 		onShow() {
 			this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
 			if (this.globalIsFirstWeighing === 2) {
+				console.log('鑾峰彇璇︽儏 onShow');
 				this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
 			}
 		},
@@ -400,9 +403,18 @@
 					}
 				},
 				timeout: '0',
+				wsgShow: false
 
 			};
 		},
+		watch: {
+			'$store.state.wsgVisiable': {
+				deep: true,
+				handler: function(val) {
+					this.wsgShow = val
+				}
+			}
+		},
 		computed: {
 			...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing']),
 			name() {

--
Gitblit v1.9.1