From 8c4dd05b10fcaeb94c09613699aab923318a1c6d Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 02 七月 2023 18:13:27 +0800
Subject: [PATCH] 称重逻辑简化，提高可读性
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 ea90236..f6abe3b 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
@@ -70,19 +70,19 @@
<view class="main-information">
<view class="prefix">鐨噸:</view>
<view class="suffix">
- {{temporaryWeighObj.skin||''}}
+ {{currentSkin}}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
- {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.skin?(showWeigh.skin||''):(showWeigh.hair||'')}}
+ {{currentHair}}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
- {{ temporaryWeighObj.clean||''}}
+ {{ currentClean}}
</view>
</view>
<view class="main-information">
@@ -257,9 +257,8 @@
this.temporaryWeighObj.skin = newV;
} else {
this.temporaryWeighObj.hair = newV;
- this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.showWeigh.skin).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
- .clean < 0;
+ this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
+ .currentClean) < 0;
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -267,8 +266,7 @@
this.temporaryWeighObj.hair = newV;
} else {
this.temporaryWeighObj.skin = newV;
- this.temporaryWeighObj.clean = (this.showWeigh.skin - newV).toFixed(2);
- this.isweigh = this.temporaryWeighObj.clean < 0 || this.showWeigh.skin < newV && this.showWeigh
+ this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
.skin > 0;
}
}
@@ -286,9 +284,6 @@
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
- // coalContactClean() {
- // return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
- // },
token() {
return uni.getStorageSync('token');
},
@@ -309,15 +304,24 @@
.temporaryWeighObj.hair;
}
},
- sideline() {
- return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
- },
+
showWeigh() {
return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
.weighList.tmTaskCoalItems[0] : {}) : {}
},
+ // 绉伴噸鍘嗗彶
weighHistory() {
return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
+ },
+ currentHair() {
+ return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
+ .skin || 0) : (this.showWeigh.hair || 0)
+ },
+ currentSkin() {
+ return this.temporaryWeighObj.skin || 0
+ },
+ currentClean() {
+ return (this.currentHair - this.currentSkin).toFixed(2)
}
},
methods: {
--
Gitblit v1.9.1