From 2adce788c1a411959b81f08d5569d92861c7f300 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 17 十月 2023 16:54:52 +0800
Subject: [PATCH] 删除无用代码 修改部分逻辑 调整部分样式
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 110 +++++++++++++++++++++++++-----------------------------
1 files changed, 51 insertions(+), 59 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 0381b1f..ea56d85 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
@@ -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||isExceedOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
@@ -204,20 +204,18 @@
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy||!isSkinWeigh"></u-button>
+ v-if="outBuy||!isSkinWeigh"
+ :loading="addAndSubtractCoalLoading"></u-button>
</view>
- <view v-show="isConfirmWeighLoading"
+ <view v-show="isExceedOrigin"
style="color: #ff6363;width: auto;margin: 0 auto;">
- 瓒呭嚭姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�
+ <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-else>瓒呭嚭鏈�澶ф瘺閲�,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
</view>
- <!-- <view class="four">
- <u-button type="primary"
- text="鍒锋柊"
- @click.stop="RefreshHandle"
- icon="reload"
- throttle-time="800"
- :loading="refreshLoading"></u-button>
- </view> -->
+ <view v-show="afterEvacuationStatus"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text>{{afterEvacuationText}}</text>
+ </view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -231,7 +229,7 @@
<view class="">
<u-modal :show="abnormalModalShow"
title="寮傚父鍘熷洜"
- :showCancelButton="true"
+ :showCancelButton="false"
@confirm="abnormalConfirm"
confirmText="鎻愪氦">
<view class="slot-content">
@@ -287,6 +285,9 @@
this.realTimeWeigh = 0
},
onShow() {
+ if (this.timer) {
+ clearTimeout(this.timer)
+ }
this.timer = setTimeout(() => {
if (!this.globalweigh) {
console.log('绉伴噸鏃惰嚜鍔ㄩ噸杩�');
@@ -386,9 +387,13 @@
mergeState: true, //鍚堝崱鐘舵��
mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
- isExceedOrigin: false, //鏄惁瓒呭嚭鍘熷彂姣涢噸
+ isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
- timer: null
+ timer: null,
+ afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
+ afterEvacuationText: '',
+ TwoEvacuationLoading: false,
+ addAndSubtractCoalLoading: false
};
},
watch: {
@@ -412,8 +417,11 @@
this.isSkinWeigh = false;
this.outBuy = true;
this.temporaryWeighObj.hair = newV;
- this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
- 2);
+ 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;
@@ -426,15 +434,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 //绉扮毊娌℃湁杩斿洖瑁呭嵏
@@ -443,8 +442,11 @@
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);
+ 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;
@@ -454,15 +456,10 @@
}
}
},
- confirmWeighVisiable(v) {
- if (v) {
- uni.hideLoading()
- }
- }
},
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)
@@ -496,18 +493,6 @@
...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh', 'changeconfirmWeighVisiable',
'changesocketTask', 'changereconnectNum'
]),
- RefreshHandle() {
- if (this.globalisconnect) return this.$u.toast('宸茶繛鎺ワ紝鏃犻渶鍒锋柊')
- this.refreshLoading = true
- if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
- if (!this.is_open_socket) {
- this.$store.dispatch('websocketInit')
- this.changeisconnect(true);
- this.refreshLoading = false
- this.$u.toast('鍒锋柊鎴愬姛')
- }
- }
- },
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -586,17 +571,15 @@
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
if (res.code == 0) {
- this.$u.toast('绉伴噸鎴愬姛');
+ this.$u.toast('绉伴噸鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ this.isConfirmWeighLoading = false;
setTimeout(() => {
uni.navigateBack({
delta: 1
});
- this.isConfirmWeighLoading = false;
}, 1000);
} else if (res.code === 3) {
- uni.showLoading({
- title: '纾呮埧浜哄憳纭涓�',
- })
+ this.isExceedOrigin = true
} else {
this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
@@ -609,6 +592,7 @@
},
// 鍔犲噺鐓�
addAndSubtractCoal() {
+ this.addAndSubtractCoalLoading = true
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
@@ -619,6 +603,7 @@
weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
+ this.addAndSubtractCoalLoading = false
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
@@ -626,7 +611,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
- console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
}
});
},
@@ -636,19 +622,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;
}
});
},
@@ -724,6 +715,7 @@
confirmWeighConfirm() {
this.changeconfirmWeighVisiable(false)
this.isConfirmWeighLoading = false
+ this.TwoEvacuationLoading = false;
setTimeout(() => {
this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
uni.navigateBack({
--
Gitblit v1.9.1