From a25c7697644a40d3aa3a9746085a9a7618dd098a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 10 十月 2023 08:15:09 +0800
Subject: [PATCH] 修改称重提示错误 修改判断
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 44 ++++++++++----------------------------------
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 3 ++-
store/index.js | 2 +-
3 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index f7db267..c26f4d9 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -759,7 +759,8 @@
type: 2,
weighingNumber: 1
}
- this.$reqPost('printer', Object.assign(form, JSON.parse(uni.getStorageSync('WeighHouseForm'))),
+ let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
+ this.$reqPost('printer', Object.assign(form, JSON.parse(form1)),
'json').then(
res => {
uni.hideLoading()
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..c07442d 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
@@ -194,7 +194,7 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||isExceedOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
@@ -206,18 +206,10 @@
class="jiajian"
v-if="outBuy||!isSkinWeigh"></u-button>
</view>
- <view v-show="isConfirmWeighLoading"
+ <view v-show="isExceedOrigin"
style="color: #ff6363;width: auto;margin: 0 auto;">
瓒呭嚭姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�
</view>
- <!-- <view class="four">
- <u-button type="primary"
- text="鍒锋柊"
- @click.stop="RefreshHandle"
- icon="reload"
- throttle-time="800"
- :loading="refreshLoading"></u-button>
- </view> -->
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -231,7 +223,7 @@
<view class="">
<u-modal :show="abnormalModalShow"
title="寮傚父鍘熷洜"
- :showCancelButton="true"
+ :showCancelButton="false"
@confirm="abnormalConfirm"
confirmText="鎻愪氦">
<view class="slot-content">
@@ -287,6 +279,9 @@
this.realTimeWeigh = 0
},
onShow() {
+ if (this.timer) {
+ clearTimeout(this.timer)
+ }
this.timer = setTimeout(() => {
if (!this.globalweigh) {
console.log('绉伴噸鏃惰嚜鍔ㄩ噸杩�');
@@ -386,7 +381,7 @@
mergeState: true, //鍚堝崱鐘舵��
mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
- isExceedOrigin: false, //鏄惁瓒呭嚭鍘熷彂姣涢噸
+ isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
timer: null
};
@@ -454,11 +449,6 @@
}
}
},
- confirmWeighVisiable(v) {
- if (v) {
- uni.hideLoading()
- }
- }
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
@@ -496,18 +486,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 +564,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
diff --git a/store/index.js b/store/index.js
index ec18080..fd6fdcb 100644
--- a/store/index.js
+++ b/store/index.js
@@ -295,7 +295,7 @@
clearInterval(state.reconnectTimeOut)
state.socketTask = null
commit('changereconnectState', false)
- if (state.connectNum < 6 || state.connectNum.connectNum < 6 && state.globalisLogin) {
+ if ((state.connectNum < 6 || state.connectNum.connectNum < 6) && state.globalisLogin) {
uni.showToast({
title: '杩炴帴澶辫触锛屾鍦ㄥ皾璇曢噸鏂拌繛鎺�',
icon: 'none'
--
Gitblit v1.9.1