From 46acd5c32a3eb1bc64df27c85c5e656d737f81b0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 11 九月 2023 16:37:21 +0800
Subject: [PATCH] 增加皮重异常提示 修改隐私协议
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 2f82a84..f86efe3 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
@@ -103,7 +103,10 @@
style="width: 100%;height: 40rpx;"></view>
<view class="history-utils">
<view class="history-utils_item">
- 骞冲潎鐨噸:{{avgSkin}}
+ <text>骞冲潎鐨噸:{{avgSkin}}</text>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-if="errorTipShow">* 寮傚父</text>
</view>
<view class="history-utils_item btn">
<u-button plain
@@ -202,6 +205,9 @@
<view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
<view class="suffix">{{ weighList.orderSurplus ||"" }}</view>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-show="isweigh">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
</view>
@@ -287,6 +293,7 @@
this.init();
this.changeWeigh('')
this.realTimeWeigh = 0
+ console.log(this.abnormalModalShow);
},
components: {
combinedTitle
@@ -352,7 +359,8 @@
historyBtn: false,
historyShow: false,
// 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
- isSkinWeigh: false
+ isSkinWeigh: false,
+ errorTipShow: false
};
},
watch: {
@@ -370,6 +378,11 @@
if (this.weighList.skin == 0) {
this.isSkinWeigh = true
this.temporaryWeighObj.skin = newV;
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.errorTipShow = true
+ }
} else {
this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
@@ -387,6 +400,11 @@
} else {
this.isSkinWeigh = true;
this.temporaryWeighObj.skin = newV;
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.errorTipShow = true
+ }
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -592,7 +610,7 @@
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
/**
- * @description true鐨勮瘽鏄笉寮傚父 false灏辨槸寮傚父 娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
+ * @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
.tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
} else {
@@ -845,6 +863,7 @@
@include flex;
justify-content: flex-start;
overflow: hidden;
+ position: relative;
.prefix {
min-width: vww(60);
@@ -854,6 +873,11 @@
flex: 1;
margin-left: vww(12);
text-align: left;
+ }
+
+ .error-tip {
+ position: absolute;
+ right: 200rpx;
}
}
}
@@ -894,6 +918,11 @@
&_item {
width: 50%;
+
+ .error-tip {
+ display: inline-block;
+ margin-left: 34rpx;
+ }
}
.btn {
--
Gitblit v1.9.1