From 9a63b4c5f5dfcfa14a52fb726a0f5604077bba9c Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 十一月 2023 11:06:41 +0800
Subject: [PATCH] 修改原发信息提交限制 称重限制
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 45 ++++++---------------------------------------
1 files changed, 6 insertions(+), 39 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 3609e98..6ecdc32 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
@@ -162,26 +162,6 @@
</view>
</view>
</view>
- <!-- <view v-show="mergeStateShow">
- <view class="mergeState">
- <view class="merge-wrap">
- <view>鏄惁纭鍚堝苟</view>
- <view class="merge-checkbox">
- <u-checkbox-group v-model="checkboxValue1"
- placement="column"
- @change="mergeStateChange">
- <u-checkbox :customStyle="{marginBottom: '8px'}"
- :label="mergeState?'纭':'鍙栨秷'"
- name="confirm"
- label-size="30"
- size="30"
- activeColor="#48a2ff">
- </u-checkbox>
- </u-checkbox-group>
- </view>
- </view>
- </view>
- </view> -->
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -204,7 +184,7 @@
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy||!isSkinWeigh"
+ v-if="outBuy&&!isSkinWeigh"
:loading="addAndSubtractCoalLoading"></u-button>
</view>
<view v-show="isExceedOrigin"
@@ -408,7 +388,6 @@
'杞嚭') {
if (this.weighList.skin == 0) {
this.isSkinWeigh = true //绉扮毊娌℃湁杩斿洖瑁呭嵏
- this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
@@ -416,14 +395,13 @@
this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
- this.outBuy = true;
this.temporaryWeighObj.hair = newV;
let x = new BigNumber(this.temporaryWeighObj.hair)
let y = new BigNumber(this.weighList.skin)
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
- .clean < 0) && !this.isSpecial
+ .clean < 0) && !this.isSpecial && !this.weighList.source
this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
this.weighList.source
}
@@ -431,11 +409,9 @@
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
this.isSkinWeigh = false;
- this.outBuy = true;
this.temporaryWeighObj.hair = newV;
} else {
this.isSkinWeigh = true; //绉扮毊娌℃湁杩斿洖瑁呭嵏
- this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
@@ -446,7 +422,7 @@
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
- .clean < 0) && !this.isSpecial
+ .clean < 0) && !this.isSpecial && !this.weighList.source
this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
this.weighList.source
}
@@ -512,18 +488,9 @@
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 //0鎵嬪姩 1涓嶆槸 鏄�0鍒ゆ柇浣欓噺涓嶈冻
- if (this.weighList.orderType == '澶栬喘') {
- this.firstHairCustomernameShow = true;
- if (this.weighList.hair > 0) {
- this.haveInputOrigin = true;
- this.isInputOrigin = true;
- }
- if (this.weighList.hair == 0) {
- this.outBuy = false;
- }
- } else {
- this.isInputOrigin = true;
- }
+ this.outBuy = !(this.weighList.orderType === '澶栬喘' || this.weighList.orderType ===
+ '鍐呰喘' ||
+ this.weighList.orderType === '杞叆')
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
--
Gitblit v1.9.1