From 17427143356e8a410552cb44120a02eb6eb35540 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 17 七月 2023 15:44:22 +0800
Subject: [PATCH] 增加销类型称重判断逻辑
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 f83188c..f294eaf 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
@@ -85,23 +85,16 @@
{{ currentClean}}
</view>
</view>
- <view class="main-information">
+ <!-- <view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
<view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
- </view>
+ </view> -->
</view>
</view>
<!-- 绉伴噸鍘嗗彶-->
<weigh-item :list="weighHistory"></weigh-item>
<view class="three">
- <!-- 鏀剧┖ -->
- <u-button type="primary"
- text="鏀剧┖"
- plain
- @click="evacuation"
- throttleTime="500"
- :disabled="!isEvacuation"></u-button>
- <!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
+ <!-- .澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
@@ -121,6 +114,14 @@
loadingText="纭"
:disabled="isweigh||realTimeWeigh == 0"
v-if='canUnload'></u-button>
+ <!-- 鏀剧┖ -->
+ <u-button type="primary"
+ text="鏀剧┖"
+ plain
+ @click="evacuation"
+ throttleTime="500"
+ :disabled="!isEvacuation"></u-button>
+
</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
@@ -233,8 +234,7 @@
this.temporaryWeighObj.skin = newV;
} else {
this.temporaryWeighObj.hair = newV;
- this.isweigh = Number(this.currentClean) > this.weighList.orderSurplus || Number(this
- .currentClean) < 0;
+ this.isweigh = Number(this.currentClean) < 0;
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -287,11 +287,15 @@
return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
},
currentHair() {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
+ '杞嚭') {
+ return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : ''
+ }
return this.temporaryWeighObj.hair ? this.temporaryWeighObj.hair : this.showWeigh.skin ? (this.showWeigh
.skin || '') : (this.showWeigh.hair || '')
},
currentSkin() {
- return this.temporaryWeighObj.skin || ''
+ return this.temporaryWeighObj.skin ? this.temporaryWeighObj.skin : (this.showWeigh.skin || '')
},
currentClean() {
if (!this.currentSkin) return ''
@@ -299,7 +303,8 @@
.orderType == '杞叆') {
return (this.currentHair - this.currentSkin).toFixed(2)
} else {
- return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin).toFixed(2)
+ return !this.showWeigh.skin ? this.currentSkin : (this.currentHair - this.currentSkin) > 0 ? (this
+ .currentHair - this.currentSkin).toFixed(2) : ''
}
}
@@ -744,15 +749,16 @@
.three {
margin: 0 auto vww(5);
+ margin-bottom: vww(60);
width: 96%;
display: grid;
- grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+ grid-template-columns: repeat(auto-fit, minmax(140rpx, 1fr));
justify-content: center;
gap: vww(10);
color: #939393;
.u-button {
- width: vww(90);
+ width: vww(70);
}
}
--
Gitblit v1.9.1