From e96eb325b42b25ecd83c065c4abd8ce9999cd468 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 18 九月 2023 15:17:21 +0800
Subject: [PATCH] 修改放空逻辑,增加合卡功能
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 49 ++++++++++++++++++++++++++++++++++++++-----------
pages/loadUnload-page/selectTarget/selectTarget.vue | 1 +
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 2 +-
3 files changed, 40 insertions(+), 12 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 be7a631..3444a6c 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
@@ -285,7 +285,7 @@
}
},
methods: {
- ...mapMutations(['changewsgVisiable'])
+ ...mapMutations(['changewsgVisiable']),
init() {
this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
if (res.code == 0) {
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 e729c0f..82a486f 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
@@ -218,11 +218,12 @@
plain
@click="evacuation"
throttleTime="500"
- :disabled="!isEvacuation"></u-button>
+ :disabled="!isEvacuation"
+ v-if='weighList.skin||weighList.hair'></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin||!mergeState"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
@@ -268,6 +269,14 @@
</u--form>
</view>
</u-modal>
+ </view>
+ <view class="mergeState">
+ <u-modal :show="mergeStateShow"
+ title="鍚堝崱纭"
+ content="鏄惁纭鍚堝崱"
+ :showCancelButton="true"
+ @confirm="mergeConfirm"
+ @cancel="mergeCancel"></u-modal>
</view>
</view>
</template>
@@ -315,7 +324,8 @@
sceneInOut: '',
coalContactClean: 0,
coalContactHair: 0,
- coalContactSkin: 0
+ coalContactSkin: 0,
+ isMerge: 0 //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
},
// 鏄惁濉啓鍘熷彂淇℃伅
isInputOrigin: false,
@@ -383,8 +393,9 @@
}
},
]
- }
-
+ },
+ mergeState: true, //鍚堝崱鐘舵��
+ mergeStateShow: false, //鍚堝崱寮圭獥
};
},
watch: {
@@ -410,6 +421,8 @@
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0;
+ this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
+ this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -428,6 +441,7 @@
.temporaryWeighObj
.clean < 0;
this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
+ this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
}
}
@@ -451,13 +465,11 @@
isEvacuation() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
- .temporaryWeighObj.hair;
+ return this.weighList.skin == this.temporaryWeighObj.hair;
}
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
'杞叆') {
- return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
- .temporaryWeighObj.hair;
+ return this.weighList.hair == this.temporaryWeighObj.skin;
}
},
sideline() {
@@ -483,6 +495,7 @@
this.weighData.filedId = res.data.filedId;
this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
+ this.weighList.source = res.data.source
if (this.weighList.orderType == '澶栬喘') {
this.firstHairCustomernameShow = true;
if (this.weighList.hair > 0) {
@@ -550,7 +563,7 @@
this.isConfirmWeighLoading = false;
}, 1000);
} else {
- this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
}
})
@@ -661,7 +674,21 @@
this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
this.abnormalModalShow = false
})
- }
+ },
+ mergeConfirm() {
+ this.mergeStateShow = false
+ this.weighData.isMerge = 1
+ this.MergeState = true
+ this.isweigh = false
+ this.orderSurplusLess = false
+ },
+ mergeCancel() {
+ this.mergeStateShow = false
+ this.weighData.isMerge = 0
+ this.MergeState = false
+ this.isweigh = true
+ this.orderSurplusLess = true
+ },
}
};
</script>
diff --git a/pages/loadUnload-page/selectTarget/selectTarget.vue b/pages/loadUnload-page/selectTarget/selectTarget.vue
index 77b3642..63098b4 100644
--- a/pages/loadUnload-page/selectTarget/selectTarget.vue
+++ b/pages/loadUnload-page/selectTarget/selectTarget.vue
@@ -151,6 +151,7 @@
this.selectedCoal = e
},
formHandle() {
+ if (!this.dataForm.firstClass || !this.dataForm.secondClass) return this.$u.toast('璇烽�夋嫨鐓ゅ満鎴栬�呯叅浠�')
this.$reqPost('updateUser', Object.assign(this.userInfo, {
responsibilityCoal: this.selectedCoal.join(),
filedId: this
--
Gitblit v1.9.1