From 971e1fa03492e34e67edd6346f442d120fbe5343 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 14 七月 2023 16:21:31 +0800
Subject: [PATCH] 展示字段和样式修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 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 214e8f2..f83188c 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
@@ -51,18 +51,18 @@
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
- <view class="prefix">鐭垮満:</view>
+ <view class="prefix">浠撳簱:</view>
<view class="suffix">{{ weighList.deptName || '' }}</view>
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
- <view class="prefix">鐓ゅ満:</view>
+ <view class="prefix">鍩哄湴:</view>
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
- <view class="main-information">
+ <!-- <view class="main-information">
<view class="prefix">鐓ょ鍚嶇О:</view>
<view class="suffix">{{ weighList.coalName || '' }}</view>
- </view>
+ </view> -->
<view class="main-information">
<view class="prefix">璁㈠崟绫诲瀷:</view>
<view class="suffix">{{ weighList.orderType || '' }}</view>
@@ -104,7 +104,7 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"></u-button>
@@ -221,31 +221,32 @@
},
watch: {
realTimeWeigh(newV, oldV) {
- if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
- '杞嚭') {
- if (!this.showWeigh.skin) {
- this.temporaryWeighObj.skin = newV;
- } else {
- this.temporaryWeighObj.hair = newV;
- this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
- .currentClean) < 0;
- }
- } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
- .orderType == '杞叆') {
- if (!this.showWeigh.hair) {
- this.temporaryWeighObj.hair = newV;
- } else {
- this.temporaryWeighObj.skin = newV;
- this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this.showWeigh
- .skin > 0;
- }
- }
+
},
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
handler: function(newV) {
this.weighData.weigh = this.realTimeWeigh = newV;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+ .orderType == '杞嚭') {
+ if (!this.showWeigh.skin) {
+ this.temporaryWeighObj.skin = newV;
+ } else {
+ this.temporaryWeighObj.hair = newV;
+ this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
+ .currentClean) < 0;
+ }
+ } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ if (!this.showWeigh.hair) {
+ this.temporaryWeighObj.hair = newV;
+ } else {
+ this.temporaryWeighObj.skin = newV;
+ this.isweigh = Number(this.currentClean) < 0 || this.showWeigh.skin < newV && this
+ .showWeigh
+ .skin > 0;
+ }
+ }
},
deep: true
}
@@ -255,7 +256,7 @@
// this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
token() {
return uni.getStorageSync('token');
},
@@ -294,7 +295,13 @@
},
currentClean() {
if (!this.currentSkin) return ''
- return (this.currentHair - this.currentSkin).toFixed(2)
+ if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') {
+ return (this.currentHair - this.currentSkin).toFixed(2)
+ } else {
+ return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin).toFixed(2)
+ }
+
}
},
methods: {
--
Gitblit v1.9.1