From d40527c10a2aa2ea481e1bf85ba0ac75ade9b670 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期六, 16 九月 2023 19:57:56 +0800
Subject: [PATCH] 增加磅房忙碌提示
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 123 +++++++++++++++++++++++++++--------------
1 files changed, 81 insertions(+), 42 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 1ee26ca..e729c0f 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="orderSurplusLess">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
</view>
@@ -246,11 +252,14 @@
@cancel="abnormalCancel"
confirmText="鎻愪氦">
<view class="slot-content">
- <u--form labelPosition="top">
- <u-form-item>
- <u-textarea v-model="abnormalContent"
+ <u--form labelPosition="top"
+ :model='abnormalForm'
+ :rules="rules"
+ ref="uForm">
+ <u-form-item prop="abnormalContent">
+ <u-textarea v-model="abnormalForm.abnormalContent"
confirmType="done"
- placeholder="璇疯緭鍏ュ紓甯稿師鍥�"
+ placeholder="璇疯緭鍏ュ紓甯稿師鍥�(瀛楁暟涓嶅皯浜�5涓瓧)"
height='140'
count
border="surround"
@@ -280,7 +289,7 @@
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);
@@ -334,6 +343,7 @@
primaryClean: null,
// 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
isweigh: false,
+ orderSurplusLess: false,
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
coalContactHair: '',
@@ -344,7 +354,9 @@
// 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
outBuy: true,
// 鐨噸寮傚父鐩稿叧
- abnormalContent: '',
+ abnormalForm: {
+ abnormalContent: '',
+ },
avgSkin: '', // 骞冲潎鐨噸
isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
tmTaskCoalList: [],
@@ -352,13 +364,30 @@
historyBtn: false,
historyShow: false,
// 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
- isSkinWeigh: false
+ isSkinWeigh: false,
+ errorTipShow: false,
+ rules: {
+ abnormalContent: [{
+ required: true,
+ message: "璇峰～鍐欏紓甯稿師鍥�",
+ trigger: ['blur', 'change'],
+ type: 'string'
+ },
+ {
+ validator: (rule, value, callback) => {
+ if (value.length < 5) {
+ callback(new Error('鍘熷洜涓嶅彲灏戜簬5涓瓧'))
+ } else {
+ callback()
+ }
+ }
+ },
+ ]
+ }
+
};
},
watch: {
- realTimeWeigh(newV, oldV) {
-
- },
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
deep: true,
@@ -370,6 +399,9 @@
if (this.weighList.skin == 0) {
this.isSkinWeigh = true
this.temporaryWeighObj.skin = newV;
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
} else {
this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
@@ -387,11 +419,15 @@
} else {
this.isSkinWeigh = true;
this.temporaryWeighObj.skin = newV;
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(newV)
+ this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0;
+ this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
}
}
}
@@ -400,7 +436,9 @@
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
coalContactClean() {
- return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
+ let xx = BigNumber(this.weighData.coalContactHair)
+ let yy = BigNumber(this.weighData.coalContactSkin)
+ return xx.minus(yy).toNumber().toFixed(2)
},
token() {
return uni.getStorageSync('token');
@@ -474,7 +512,7 @@
if (this.weighData.weigh != 0) {
// 濡傛灉姝ｅ湪绉扮毊
if (this.isSkinWeigh) {
- // 濡傛灉绗竴娆＄О閲�
+ // 濡傛灉骞冲潎鐨噸涓�0
if (this.isAbnormalAvgSkin) {
this.abnormalModalShow = false
this.saveWeigh();
@@ -529,7 +567,8 @@
carNo: this.weighData.carNo,
tmId: this.weighData.tmId,
filedId: this.weighData.filedId,
- equipmentCode: this.weighData.equipmentCode
+ equipmentCode: this.weighData.equipmentCode,
+ weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -552,7 +591,12 @@
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛');
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 1000);
this.evacuationModalShow = false;
} else {
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
@@ -592,9 +636,10 @@
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
/**
- * @description true鐨勮瘽鏄笉寮傚父 false灏辨槸寮傚父 娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆℃甯� */
- this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
- .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+ * @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
+ // this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
+ // .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+ this.isAbnormalAvgSkin = this.avgSkin == 0
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -604,36 +649,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>
@@ -865,6 +893,7 @@
@include flex;
justify-content: flex-start;
overflow: hidden;
+ position: relative;
.prefix {
min-width: vww(60);
@@ -874,6 +903,11 @@
flex: 1;
margin-left: vww(12);
text-align: left;
+ }
+
+ .error-tip {
+ position: absolute;
+ right: 200rpx;
}
}
}
@@ -914,6 +948,11 @@
&_item {
width: 50%;
+
+ .error-tip {
+ display: inline-block;
+ margin-left: 34rpx;
+ }
}
.btn {
--
Gitblit v1.9.1