From dd40769e3c2dac33693fa5765b216540a4ce5cf9 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 07 六月 2024 15:56:55 +0800
Subject: [PATCH] feat:多产品称重页面修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 f192276..a75b5b1 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
@@ -138,19 +138,19 @@
<view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">
- {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
+ {{ temporaryWeighObj.skin == 0 ? weightObj.skin : temporaryWeighObj.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
- {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
+ {{ temporaryWeighObj.hair == 0 ? weightObj.hair : temporaryWeighObj.hair||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
+ {{ temporaryWeighObj.clean == 0 ? weightObj.clean : temporaryWeighObj.clean ||"" }}
</view>
</view>
<view class="main-information">
@@ -404,7 +404,7 @@
this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
let x = new BigNumber(this.temporaryWeighObj.hair)
- let y = new BigNumber(this.weighList.skin)
+ let y = new BigNumber(this.weightObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
@@ -424,7 +424,7 @@
let yy = new BigNumber(newV)
this.errorTipShow = (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0;
- let x = new BigNumber(this.weighList.hair)
+ let x = new BigNumber(this.weightObj.hair)
let y = new BigNumber(this.temporaryWeighObj.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -457,13 +457,27 @@
isEvacuation() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return this.weighList.skin == this.temporaryWeighObj.hair;
+ return this.weightObj.skin == this.temporaryWeighObj.hair;
}
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
'杞叆') {
- return this.weighList.hair == this.temporaryWeighObj.skin;
+ return this.weightObj.hair == this.temporaryWeighObj.skin;
}
},
+ weightObj(){
+ const index = this.weighList.tmTaskCoalList.length - 1;//涓嬫爣浣� 锛岃鍙栫鍑犵粍鐨勭毊姣涘噣锛�,榛樿鏈�鍚庝竴缁�;
+ const tempArr = this.weighList.tmTaskCoalList.filter(item=> item.isWeight === 1);
+ const result =tempArr.find(item=>!item.skin || !item.hair || !item.clean);
+ console.log(result,'result')
+ if(result){
+ return result
+ }else{
+ return tempArr[index];
+ }
+
+
+
+ },
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
},
--
Gitblit v1.9.1