From 3e5ccc0369e0b8e61ce50e186246e57c1547ae00 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 30 七月 2024 18:00:59 +0800
Subject: [PATCH] 申请复磅细节

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   15 ++++++---------
 1 files changed, 6 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 370433b..98bd6b3 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
@@ -103,7 +103,7 @@
 			<!-- .澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
 			<u-button type="primary"
 				text="纭畾绉伴噸"
-				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
+				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning || weighList.isReWeigh == 1"
 				:loading="isConfirmWeighLoading"
 				loadingText="纭"
 				@click="confirmWeigh"></u-button>
@@ -119,7 +119,7 @@
 				:loading="UnloadingAgainLoading"
 				loadingText="纭"
 				:disabled="isweigh||realTimeWeigh == 0"
-				v-if='canUnload && !isJixuxiehuo'></u-button>
+				v-if='canUnload && isJixuxiehuo'></u-button>
 			<!-- 鏀剧┖ -->
 			<u-button type="primary"
 				text="鏀剧┖"
@@ -322,7 +322,6 @@
 			...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
 				'globalisLogin', 'socketTask','is_open_socket'
 			]),
-      ...mapGetters(['yuanFaList']),
 			token() {
 				return uni.getStorageSync('token');
 			},
@@ -415,11 +414,9 @@
 				}
 			},
       isJixuxiehuo() {   //鏄惁鏄剧ず缁х画鍗歌揣鎸夐挳
-        console.log(this.yuanFaList,'this.yuanFaList====鏄惁鏄剧ず缁х画鍗歌揣')
-        console.log(this.$store.getters.yuanFaList,'yuanFaList====getters')
         console.log(this.weighList?.tmTaskCoalItems,'this.weighList?.tmTaskCoalItems')
-        if(this.weighList?.tmTaskCoalItems && this.weighList?.tmTaskCoalItems.length > 0 && this.yuanFaList && this.yuanFaList.length > 0) {
-          return this.weighList?.tmTaskCoalItems.length == this.yuanFaList.length
+        if(this.weighList?.tmTaskCoalItems && this.weighList?.tmTaskCoalItems.length > 0) {
+          return this.weighList?.tmTaskCoalItems.length > 0
         }else {
           return false
         }
@@ -445,6 +442,7 @@
 						this.outBuy = (this.weighList.orderType.indexOf('閿�') !== -1) && this.showWeigh.skin > 0;
 						// 缁х画鍗歌揣鍙湁澶栬喘绫诲瀷绗簩娆′細鏈�
 						this.canUnload = this.weighList.orderType === '澶栬喘' && this.showWeigh.hair > 0;
+            console.log(this.canUnload,'this.canUnload====')
 					}
 				});
 			},
@@ -535,7 +533,6 @@
 					carNo: this.weighData.carNo,
 					tmId: this.weighData.tmId,
 					filedId: this.weighData.filedId,
-					tmId: this.weighData.tmId,
 					gateCameraId: this.weighData.gateCameraId,
 					equipmentCode: this.weighData.equipmentCode,
 					tmCode: this.weighData.tmCode,
@@ -551,7 +548,7 @@
 							});
 						}, 1000);
 					} else {
-						this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅�欓噸璇�');
+						this.$u.toast(res.msg);
 					}
 				})
 			},

--
Gitblit v1.9.1