From eec82b55813387e20087989536cd32810b59cd48 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 13 十月 2023 09:42:49 +0800
Subject: [PATCH] 大部分按钮增加loading 放空操作逻辑修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 141 ++++++++++++++++++++++++++++++-----------------
1 files changed, 90 insertions(+), 51 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 b3b9105..72ae6c0 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,15 +204,17 @@
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy"></u-button>
+ v-if="outBuy||!isSkinWeigh"
+ :loading="addAndSubtractCoalLoading"></u-button>
</view>
- <view class="four">
- <u-button type="primary"
- text="鍒锋柊"
- @click.stop="RefreshHandle"
- icon="reload"
- throttle-time="800"
- :loading="refreshLoading"></u-button>
+ <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">
@@ -227,9 +229,8 @@
<view class="">
<u-modal :show="abnormalModalShow"
title="寮傚父鍘熷洜"
- :showCancelButton="true"
+ :showCancelButton="false"
@confirm="abnormalConfirm"
- @cancel="abnormalCancel"
confirmText="鎻愪氦">
<view class="slot-content">
<u--form labelPosition="top"
@@ -249,11 +250,17 @@
</view>
</u-modal>
</view>
+ <!-- 纭鍚庣О閲嶆彁绀哄脊绐� -->
+ <view class="">
+ <u-modal :show="confirmWeighVisiable"
+ title="鎻愮ず"
+ :content="confirmWeighContent"
+ @confirm="confirmWeighConfirm"></u-modal>
+ </view>
</view>
</template>
<script>
- let socket = null;
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
@@ -277,6 +284,26 @@
this.changeWeigh('')
this.realTimeWeigh = 0
},
+ onShow() {
+ if (this.timer) {
+ clearTimeout(this.timer)
+ }
+ this.timer = setTimeout(() => {
+ if (!this.globalweigh) {
+ console.log('绉伴噸鏃惰嚜鍔ㄩ噸杩�');
+ this.socketTask.close();
+ this.changesocketTask(null);
+ this.changereconnectNum({ connectNum: 1, isWeigh: true })
+ this.$store.dispatch('websocketInit');
+ }
+ }, 3000)
+ },
+ onHide() {
+ clearTimeout(this.timer)
+ },
+ onUnload() {
+ clearTimeout(this.timer)
+ },
components: {
combinedTitle
},
@@ -296,7 +323,8 @@
coalContactClean: 0,
coalContactHair: 0,
coalContactSkin: 0,
- isMerge: 0 //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
+ isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
+ isBackground: '0'
},
takeCoalId: null,
weighHouseCode: '',
@@ -359,8 +387,13 @@
mergeState: true, //鍚堝崱鐘舵��
mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
- isExceedOrigin: false, //鏄惁瓒呭嚭鍘熷彂姣涢噸
- refreshLoading: false
+ isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
+ refreshLoading: false,
+ timer: null,
+ afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
+ afterEvacuationText: '',
+ TwoEvacuationLoading: false,
+ addAndSubtractCoalLoading: false
};
},
watch: {
@@ -373,7 +406,8 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
- this.isSkinWeigh = true
+ this.isSkinWeigh = true //绉扮毊娌℃湁杩斿洖瑁呭嵏
+ this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
@@ -381,6 +415,7 @@
this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
+ this.outBuy = true;
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
2);
@@ -394,17 +429,11 @@
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
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
- }
- }
} else {
- this.isSkinWeigh = true;
+ this.isSkinWeigh = true; //绉扮毊娌℃湁杩斿洖瑁呭嵏
+ this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
@@ -420,11 +449,11 @@
}
}
}
- }
+ },
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
- 'is_open_socket'
+ 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
]),
coalContactClean() {
let xx = BigNumber(this.weighData.coalContactHair)
@@ -455,19 +484,9 @@
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
- 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('鍒锋柊鎴愬姛')
- }
- }
- },
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh', 'changeconfirmWeighVisiable',
+ 'changesocketTask', 'changereconnectNum'
+ ]),
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -542,18 +561,19 @@
// 纭绉伴噸鎺ュ彛
saveWeigh() {
this.weighData.coalContactClean = this.coalContactClean;
- console.log(this.weighData);
this.$reqPost('saveWeigh', this.weighData, 'json')
.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) {
+ this.isExceedOrigin = true
} else {
this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
@@ -566,6 +586,7 @@
},
// 鍔犲噺鐓�
addAndSubtractCoal() {
+ this.addAndSubtractCoalLoading = true
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
@@ -576,6 +597,7 @@
weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
+ this.addAndSubtractCoalLoading = false
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
@@ -583,7 +605,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
- console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
}
});
},
@@ -593,19 +616,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;
}
});
},
@@ -678,6 +706,17 @@
this.orderSurplusLess = true
}
},
+ confirmWeighConfirm() {
+ this.changeconfirmWeighVisiable(false)
+ this.isConfirmWeighLoading = false
+ this.TwoEvacuationLoading = false;
+ setTimeout(() => {
+ this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 800)
+ }
}
};
</script>
--
Gitblit v1.9.1