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 | 111 +++++++++++++++++++++++++++++--------------------------
1 files changed, 59 insertions(+), 52 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 9f8bb93..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
@@ -1,7 +1,7 @@
<template>
<view class="weighingDevice">
<view class="one"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/weighbanner.png') no-repeat;
background-size: cover;">
<view class="top">
<view class="top_left">
@@ -31,19 +31,19 @@
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
<view class="num">{{ weighList.skinTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
<view class="num">{{ weighList.hairTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num">{{ weighList.cleanTwo }}</view>
</view>
@@ -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"
@@ -189,12 +189,12 @@
plain
@click="evacuation"
throttleTime="500"
- :disabled="!isEvacuation"
+ :loading="TwoEvacuationLoading"
v-if='weighList.skin||weighList.hair'></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
@@ -204,12 +204,17 @@
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy||!isSkinWeigh"></u-button>
+ v-if="outBuy||!isSkinWeigh"
+ :loading="addAndSubtractCoalLoading"></u-button>
</view>
<view v-show="isExceedOrigin"
style="color: #ff6363;width: auto;margin: 0 auto;">
<text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
<text v-else>瓒呭嚭鏈�澶ф瘺閲�,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ </view>
+ <view v-show="afterEvacuationStatus"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text>{{afterEvacuationText}}</text>
</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
@@ -380,11 +385,16 @@
]
},
mergeState: true, //鍚堝崱鐘舵��
- mergeStateShow: false, //鍚堝崱寮圭獥
+ // mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
- timer: null
+ timer: null,
+ afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
+ afterEvacuationText: '',
+ TwoEvacuationLoading: false,
+ addAndSubtractCoalLoading: false,
+ isSpecial: null //1 鏄壒娈� 0涓嶆槸鐗规畩
};
},
watch: {
@@ -408,13 +418,16 @@
this.isSkinWeigh = false;
this.outBuy = true;
this.temporaryWeighObj.hair = newV;
- this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
- 2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ let x = new BigNumber(this.temporaryWeighObj.hair)
+ let y = new BigNumber(this.weighList.skin)
+ 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
.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 == '杞叆') {
@@ -422,15 +435,6 @@
this.isSkinWeigh = false;
this.outBuy = true;
this.temporaryWeighObj.hair = newV;
- // if (this.weighList.orderType == '澶栬喘') {
- // let xx = new BigNumber(newV)
- // let yy = new BigNumber(this.weighList.hairTwo)
- // if (xx.minus(yy) > 0.3) {
- // this.$u.toast('瓒呭嚭鍘熷彂淇℃伅姣涢噸,璇风瓑寰呯鐞嗕汉鍛樺鐞�')
- // this.isExceedOrigin = true
- // this.saveWeigh()
- // }
- // }
} else {
this.isSkinWeigh = true; //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
@@ -439,13 +443,16 @@
let yy = new BigNumber(newV)
this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
this.avgSkin !== 0;
- this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
- 2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ let x = new BigNumber(this.weighList.hair)
+ let y = new BigNumber(this.temporaryWeighObj.skin)
+ 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
.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
}
}
}
@@ -453,7 +460,7 @@
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
- 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent'
+ 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
]),
coalContactClean() {
let xx = BigNumber(this.weighData.coalContactHair)
@@ -480,6 +487,9 @@
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
+ },
+ isNeedOrigin() {
+ return uni.getStorageSync('isNeedOrigin')
}
},
@@ -497,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;
@@ -586,6 +597,7 @@
},
// 鍔犲噺鐓�
addAndSubtractCoal() {
+ this.addAndSubtractCoalLoading = true
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
@@ -596,6 +608,7 @@
weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
+ this.addAndSubtractCoalLoading = false
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
@@ -603,7 +616,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
- console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
}
});
},
@@ -613,19 +627,24 @@
},
// 鏀剧┖寮圭獥纭
evacuationConfirm() {
+ this.TwoEvacuationLoading = true;
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ if (res.msg.length > 4) { //澶т簬4鏄瓑寰呭悗鍙扮‘璁�
+ this.TwoEvacuationLoading = true;
+ this.evacuationModalShow = false;
+ this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
+ this.afterEvacuationText = res.msg
+
+ } else { //灏忎簬4鎴愬姛
+ this.TwoEvacuationLoading = false;
+ this.evacuationModalShow = false;
+ this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�');
setTimeout(() => {
uni.navigateBack({
delta: 1
});
}, 1000);
- this.evacuationModalShow = false;
- } else {
- this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
- this.evacuationModalShow = true;
}
});
},
@@ -685,22 +704,10 @@
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)
this.isConfirmWeighLoading = false
+ this.TwoEvacuationLoading = false;
setTimeout(() => {
this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
uni.navigateBack({
--
Gitblit v1.9.1