From ab6404eb9a63f990d1e734dbfc38eb5910dee681 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 27 十月 2023 11:39:09 +0800
Subject: [PATCH] 修改转发 增加磅单打印样式 增加自主配送 修改部分页面跳转逻辑
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 42 +++++++++++++++++-------------------------
1 files changed, 17 insertions(+), 25 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 0877f51..f2cb1c9 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
@@ -158,11 +158,11 @@
<view class="suffix">{{ weighList.orderSurplus ||"" }}</view>
<text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
class="error-tip"
- v-show="orderSurplusLess">* 璁㈠崟浣欓噺涓嶈冻</text>
+ v-show="orderSurplusLess&&!isSpecial">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
</view>
- <view v-show="mergeStateShow">
+ <!-- <view v-show="mergeStateShow">
<view class="mergeState">
<view class="merge-wrap">
<view>鏄惁纭鍚堝苟</view>
@@ -181,7 +181,7 @@
</view>
</view>
</view>
- </view>
+ </view> -->
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -194,7 +194,7 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
@@ -385,7 +385,7 @@
]
},
mergeState: true, //鍚堝崱鐘舵��
- mergeStateShow: false, //鍚堝崱寮圭獥
+ // mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
@@ -393,7 +393,8 @@
afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
afterEvacuationText: '',
TwoEvacuationLoading: false,
- addAndSubtractCoalLoading: false
+ addAndSubtractCoalLoading: false,
+ isSpecial: null //1 鏄壒娈� 0涓嶆槸鐗规畩
};
},
watch: {
@@ -422,11 +423,11 @@
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
// this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
// 2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
- .clean < 0;
+ .clean < 0) && !this.isSpecial
this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
- this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
+ // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
@@ -447,11 +448,11 @@
this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
// this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
// 2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ this.isweigh = (this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
- .clean < 0;
+ .clean < 0) && !this.isSpecial
this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
- this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
+ // this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
}
}
@@ -486,6 +487,9 @@
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
+ },
+ isNeedOrigin() {
+ return uni.getStorageSync('isNeedOrigin')
}
},
@@ -503,6 +507,7 @@
if (res.code == 0) {
uni.hideLoading()
this.weighList = res.data;
+ this.isSpecial = res.data.isSpecial
this.weighData.deptId = res.data.deptId;
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
@@ -698,19 +703,6 @@
},
skinAbnormal() {
this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
- },
- mergeStateChange(e) {
- if (e.length !== 0) {
- this.weighData.isMerge = 1
- this.MergeState = true
- this.isweigh = false
- this.orderSurplusLess = false
- } else {
- this.weighData.isMerge = 0
- this.MergeState = false
- this.isweigh = true
- this.orderSurplusLess = true
- }
},
confirmWeighConfirm() {
this.changeconfirmWeighVisiable(false)
--
Gitblit v1.9.1