From 3dd852a77ff1fcb8c4c0ceb3a8df727c15ae643e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 16 八月 2023 15:39:13 +0800
Subject: [PATCH] 称重异常判断逻辑修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 91 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 46 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 86c51bc..90bfe6c 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
@@ -219,7 +219,8 @@
:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
:loading="isConfirmWeighLoading"
loadingText="纭"
- @click="confirmWeigh"></u-button>
+ @click="confirmWeigh"
+ throttleTime="800"></u-button>
<u-button type="primary"
text="杩斿洖鍔犲噺鍚�"
:disabled="addAndSubtractCoalDisabled"
@@ -345,6 +346,7 @@
// 鐨噸寮傚父鐩稿叧
abnormalContent: '',
avgSkin: '', // 骞冲潎鐨噸
+ isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
tmTaskCoalList: [],
abnormalModalShow: false,
historyBtn: false,
@@ -470,28 +472,25 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
+ // 濡傛灉姝ｅ湪绉扮毊
if (this.isSkinWeigh) {
- let xx = new BigNumber(this.avgSkin)
- let yy = new BigNumber(this.globalweigh)
- if (xx.minus(yy).toNumber() > 0.2) {
- this.abnormalModalShow = true
- } else {
+ // 濡傛灉绗竴娆＄О閲�
+ if (this.isAbnormalAvgSkin) {
this.abnormalModalShow = false
this.saveWeigh();
+ } else {
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
+ this.abnormalModalShow = true
+ } else {
+ this.saveWeigh();
+ }
}
} else {
this.saveWeigh();
}
- // if (this.weighList.orderType == '澶栭攢') {
- // if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
- // this.saveWeigh();
- // } else {
- // this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- // this.isConfirmWeighLoading = false;
- // }
- // } else {
- // this.saveWeigh();
- // }
+
} else {
this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
this.isConfirmWeighLoading = false;
@@ -514,6 +513,7 @@
}, 1000);
} else {
this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.isConfirmWeighLoading = false
}
})
.catch(err => {
@@ -590,13 +590,10 @@
uni.hideLoading()
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
- // let xx = new BigNumber(this.avgSkin)
- // let yy = new BigNumber(weigh)
- // console.log(weigh, this.avgSkin, yy.minus(xx).toNumber());
- // if (xx.minus(yy).toNumber() <= 0.2) {
- // this.abnormalModalShow = true
- // this.historyBtn = true
- // }
+ /**
+ * @description true鐨勮瘽鏄笉寮傚父 false灏辨槸寮傚父 娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆℃甯� */
+ this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList.length === 0) && this
+ .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -609,30 +606,32 @@
},
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
- 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);
+ this.weighData.abnormalText = this.abnormalContent
+ 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
- }
- })
+ // } else {
+ // uni.hideLoading()
+ // this.$u.toast('鎻愪氦澶辫触')
+ // this.abnormalModalShow = true
+ // this.isConfirmWeighLoading = false
+ // }
+ // })
},
}
};
--
Gitblit v1.9.1