From fc3b818f35aae344350dfb59551db257f261c580 Mon Sep 17 00:00:00 2001
From: xuefei <564615061@qq.cm>
Date: 星期日, 02 七月 2023 11:53:26 +0800
Subject: [PATCH] bug:外购净重不对

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 bd6195d..4a300a1 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
@@ -71,19 +71,19 @@
 				<view class="main-information">
 					<view class="prefix">鐨噸:</view>
 					<view class="suffix">
-						{{temporaryWeighObj.skin?temporaryWeighObj.skin:showWeigh.clean?'':showWeigh.skin}}
+						{{temporaryWeighObj.skin||''}}
 					</view>
 				</view>
 				<view class="main-information">
 					<view class="prefix">姣涢噸:</view>
 					<view class="suffix">
-						{{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.clean?showWeigh.skin:''}}
+						{{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.skin?(showWeigh.skin||''):(showWeigh.hair||'')}}
 					</view>
 				</view>
 				<view class="main-information">
 					<view class="prefix">鍑�閲�:</view>
 					<view class="suffix">
-						{{ temporaryWeighObj.clean?temporaryWeighObj.clean:showWeigh.clean?'': showWeigh.clean}}
+						{{ temporaryWeighObj.clean||''}}
 					</view>
 				</view>
 				<view class="main-information">
@@ -267,8 +267,8 @@
 						this.temporaryWeighObj.hair = newV;
 					} else {
 						this.temporaryWeighObj.skin = newV;
-						this.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
-						this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
+						this.temporaryWeighObj.clean = (this.showWeigh.hair -this.temporaryWeighObj.skin).toFixed(2);
+						this.isweigh = this.temporaryWeighObj
 							.clean < 0 || this.showWeigh.skin < newV && this.showWeigh.skin > 0;
 					}
 				}

--
Gitblit v1.9.1