From 393cdcbef072e52f3a046e884c8349c903c4081f Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 12 九月 2023 10:18:48 +0800
Subject: [PATCH] 修改空数据提示
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 73 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 30 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 90bfe6c..2a19181 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>
@@ -280,13 +286,14 @@
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
this.primaryClean = params.primaryClean;
- if (params.overTmWaixiao) {
+ if (params.overTmWaixiao !== 'null') {
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
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
@@ -528,7 +546,8 @@
sceneId: this.weighData.sceneId,
carNo: this.weighData.carNo,
tmId: this.weighData.tmId,
- filedId: this.weighData.filedId
+ filedId: this.weighData.filedId,
+ equipmentCode: this.weighData.equipmentCode
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -591,8 +610,8 @@
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
/**
- * @description true鐨勮瘽鏄笉寮傚父 false灏辨槸寮傚父 娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆℃甯� */
- this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList.length === 0) && this
+ * @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
+ this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
.tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
} else {
uni.hideLoading()
@@ -603,36 +622,19 @@
abnormalCancel() {
this.abnormalModalShow = false
this.isConfirmWeighLoading = false;
+ this.$u.toast('鍙告満鍙栨秷鎻愪氦')
},
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
this.weighData.abnormalText = this.abnormalContent
+ this.skinAbnormal()
this.saveWeigh()
- // uni.showLoading({
- // title: "鎻愪氦涓�"
- // })
- // this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
- // 'params').then(
- // res => {
- // if (res.code == 0) {
- // uni.hideLoading()
- // this.$u.toast('鎻愪氦鎴愬姛')
- // this.abnormalModalShow = false
- // this.isConfirmWeighLoading = false
- // setTimeout(() => {
- // uni.navigateBack({
- // delta: 1
- // });
- // }, 1000);
-
- // } else {
- // uni.hideLoading()
- // this.$u.toast('鎻愪氦澶辫触')
- // this.abnormalModalShow = true
- // this.isConfirmWeighLoading = false
- // }
- // })
},
+ skinAbnormal() {
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
+ this.abnormalModalShow = false
+ })
+ }
}
};
</script>
@@ -864,6 +866,7 @@
@include flex;
justify-content: flex-start;
overflow: hidden;
+ position: relative;
.prefix {
min-width: vww(60);
@@ -873,6 +876,11 @@
flex: 1;
margin-left: vww(12);
text-align: left;
+ }
+
+ .error-tip {
+ position: absolute;
+ right: 200rpx;
}
}
}
@@ -913,6 +921,11 @@
&_item {
width: 50%;
+
+ .error-tip {
+ display: inline-block;
+ margin-left: 34rpx;
+ }
}
.btn {
--
Gitblit v1.9.1