From c234dffcd3adaf7b8d87a5a8301871493c0cadbd Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 21 九月 2023 14:20:35 +0800
Subject: [PATCH] 修改皮重异常弹窗不正确弹出
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 8 ++++----
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 3 ++-
pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue | 13 ++++++++++---
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 0661bfa..96da3d1 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -360,7 +360,8 @@
this.primaryClean = this.coalDetailsData.cleanTwo;
// 鍏ラ棬璇� 鍜� 鍑洪棬璇� 鏄惁鏄剧ず
this.ablePrintInduction = this.coalDetailsData.hair || this.coalDetailsData.skin
- this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin
+ this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin || this
+ .coalDetailsData.status === 6
} else {
this.$u.toast('鍔犺浇澶辫触');
}
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 7b2e230..696260a 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
@@ -549,6 +549,7 @@
let yy = new BigNumber(this.globalweigh)
if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
this.abnormalModalShow = true
+ this.skinAbnormal()
} else {
this.saveWeigh();
}
@@ -566,6 +567,7 @@
// 纭绉伴噸鎺ュ彛
saveWeigh() {
this.weighData.coalContactClean = this.coalContactClean;
+ console.log(this.weighData);
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
@@ -682,13 +684,11 @@
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
this.weighData.abnormalText = this.abnormalContent
- this.skinAbnormal()
this.saveWeigh()
+ this.abnormalModalShow = false
},
skinAbnormal() {
- this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
- this.abnormalModalShow = false
- })
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
},
mergeStateChange(e) {
if (e.length !== 0) {
diff --git a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
index 8c89119..ae5b74f 100644
--- a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
+++ b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -53,7 +53,7 @@
@click.stop="loadOrder(item.id)"
:loading="loading"
loadingText="纭"
- v-if='item.isPretendDischar===0'></u-button>
+ v-if='!item.ableDischar'></u-button>
</view>
</view>
</view>
@@ -77,7 +77,7 @@
loading: false,
id: "",
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�',
], // 鐘舵��
}
},
@@ -93,7 +93,14 @@
this.$reqGet('getAccordingCoalNameAll', { coalName: this.name }).then(res => {
uni.hideLoading()
if (res.code === 0) {
- this.detailData = res.data
+ const errorStatusArr = [0, 1, 2, 3, 6, 11, 12, 13];
+ this.detailData = res.data.map(v => {
+ return {
+ ...v,
+ ableDischar: v.skin === v.hair || v.hair === 0 && v.skin === 0 || v
+ .isPretendDischar !== 0 || errorStatusArr.indexOf(v.status) !== -1
+ }
+ })
} else {
this.$u.toast('鍔犺浇澶辫触')
}
--
Gitblit v1.9.1