From 4f940f90c4458bfa4e5f514eeca639ac97c71039 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 01 八月 2023 16:33:47 +0800
Subject: [PATCH] 修改抢单错误

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 9f7d048..c768dd8 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
@@ -175,7 +175,8 @@
 				:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
 				:loading="isConfirmWeighLoading"
 				loadingText="纭"
-				@click="confirmWeigh"></u-button>
+				@click="confirmWeigh"
+				v-show="historyBtn"></u-button>
 			<u-button type="primary"
 				text="杩斿洖鍔犲噺鍚�"
 				:disabled="addAndSubtractCoalDisabled"
@@ -184,7 +185,7 @@
 				v-if="outBuy"></u-button>
 		</view>
 		<view style="width: 200rpx;margin: auto;position: relative;"
-			v-if="historyBtn"><u-button type="primary"
+			v-if="!historyBtn"><u-button type="primary"
 				text="鏄剧ず鍘嗗彶鐨噸"
 				@click.stop="displayHistory"></u-button></view>
 		<Transition name="slide-fade">
@@ -339,8 +340,8 @@
 						.orderType ==
 						'杞嚭') {
 						if (this.weighList.skin == 0) {
-							this.getAverageSkin()
 							this.temporaryWeighObj.skin = newV;
+							this.getAverageSkin()
 							if (this.avgSkin < newV) {
 								this.abnormalModalShow = true
 								this.historyBtn = true
@@ -359,6 +360,11 @@
 							this.temporaryWeighObj.hair = newV;
 						} else {
 							this.temporaryWeighObj.skin = newV;
+							this.getAverageSkin()
+							if (this.avgSkin < newV) {
+								this.abnormalModalShow = true
+								this.historyBtn = true
+							}
 							this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
 								2);
 							this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this

--
Gitblit v1.9.1