From 4f940f90c4458bfa4e5f514eeca639ac97c71039 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 01 八月 2023 16:33:47 +0800
Subject: [PATCH] 修改抢单错误
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 12 +++++++++---
pages/driver-page/driver-index/driver-index.vue | 8 ++++----
2 files changed, 13 insertions(+), 7 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 9f7d048..c768dd8 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
@@ -175,7 +175,8 @@
:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
:loading="isConfirmWeighLoading"
loadingText="纭"
- @click="confirmWeigh"></u-button>
+ @click="confirmWeigh"
+ v-show="historyBtn"></u-button>
<u-button type="primary"
text="杩斿洖鍔犲噺鍚�"
:disabled="addAndSubtractCoalDisabled"
@@ -184,7 +185,7 @@
v-if="outBuy"></u-button>
</view>
<view style="width: 200rpx;margin: auto;position: relative;"
- v-if="historyBtn"><u-button type="primary"
+ v-if="!historyBtn"><u-button type="primary"
text="鏄剧ず鍘嗗彶鐨噸"
@click.stop="displayHistory"></u-button></view>
<Transition name="slide-fade">
@@ -339,8 +340,8 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
- this.getAverageSkin()
this.temporaryWeighObj.skin = newV;
+ this.getAverageSkin()
if (this.avgSkin < newV) {
this.abnormalModalShow = true
this.historyBtn = true
@@ -359,6 +360,11 @@
this.temporaryWeighObj.hair = newV;
} else {
this.temporaryWeighObj.skin = newV;
+ this.getAverageSkin()
+ if (this.avgSkin < newV) {
+ this.abnormalModalShow = true
+ this.historyBtn = true
+ }
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index cddf65a..b00d209 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -292,13 +292,13 @@
// 鎶㈠崟鎸夐挳
qiangDanBtn(value) {
if (value.tmcCount == '0') {
- this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === '' ? '0' : value.customerId,
- value.xsUserId === '' ? '0' : value.xsUserId);
+ this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId,
+ value.xsUserId === null ? '0' : value.xsUserId);
} else {
this.qiangDanOrderPlanId = value.orderPlanId;
this.fleetId = value.fleetId;
- this.customerId = value.customerId === '' ? '0' : value.customerId;
- this.xsUserId = value.xsUserId === '' ? '0' : value.xsUserId;
+ this.customerId = value.customerId === null ? '0' : value.customerId;
+ this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
this.qiangDanShow = true;
this.qiangDanContent = `宸叉姠${value.tmcCount}鍗曪紝纭畾鎶㈠崟锛焋;
}
--
Gitblit v1.9.1