From 97d88adcdfa7e13b2203c8716c02866fae087704 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 26 九月 2023 09:38:47 +0800
Subject: [PATCH] 修改磅房忙碌问题及其他问题
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 8a1686f..7e18b5a 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
@@ -130,7 +130,7 @@
height="150"
:previewFullImage="true"
:disabled="isModifyoriginInfo"
- :deletable='!deletable'></u-upload>
+ :deletable="!deletable"></u-upload>
</u-form-item>
</u-form>
<view class="submit-button">
@@ -241,7 +241,7 @@
</view>
<!-- 纾呮埧蹇欑鎻愮ず寮圭獥 -->
<view class="">
- <u-modal :show="wsgVisiable"
+ <u-modal :show="wsgShow"
title="鎻愮ず"
:content="wsgContent"
@confirm="wsgContentConfirm"></u-modal>
@@ -256,7 +256,6 @@
import combinedTitle from '@/components/combined-title/combined-title.vue';
import BigNumber from "bignumber.js"
const dayjs = require('dayjs')
- import isBetween from 'dayjs/plugin/isBetween'
export default {
components: {
combinedTitle
@@ -270,8 +269,9 @@
this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
}
this.fileList1 = []
- dayjs.extend(isBetween)
+ this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
+ console.log('鑾峰彇璇︽儏 onload');
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
this.init(); //鑾峰彇鏃ュ織
@@ -279,6 +279,7 @@
onShow() {
this.coalDayPage(); //鑾峰彇鏃ュ織 瀹氭椂浠诲姟
if (this.globalIsFirstWeighing === 2) {
+ console.log('鑾峰彇璇︽儏 onShow');
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
}
},
@@ -402,8 +403,17 @@
}
},
timeout: '0',
+ wsgShow: false
};
+ },
+ watch: {
+ '$store.state.wsgVisiable': {
+ deep: true,
+ handler: function(val) {
+ this.wsgShow = val
+ }
+ }
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'wsgVisiable', 'wsgContent', 'globalIsFirstWeighing']),
@@ -517,19 +527,11 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
- // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
- let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this.coalDetailsData
- .yuYueSection.slice(-5);
- if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
- this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
- this.timeout = '1'
- }
// 鍏ラ棬璇� 鍜� 鍑洪棬璇� 鏄惁鏄剧ず
this.ablePrintInduction = this.coalDetailsData.hair || this.coalDetailsData.skin
this.ablePrintOut = this.coalDetailsData.hair && this.coalDetailsData.skin || this
.coalDetailsData.status === 6
// 鍘熷彂淇℃伅鍥炴樉浠ュ強鎺у埗鏄惁鍙慨鏀�
-
this.haveInputOrigin = !this.coalDetailsData.skinTwo && this.coalDetailsData.orderType ===
'澶栬喘'
this.deletable = this.isModifyoriginInfo = this.coalDetailsData.status > 3
@@ -566,6 +568,17 @@
}
}).then(() => {
this.getgetService(); //鑾峰彇瀹㈡湇
+ }).then(() => {
+ // 鍒ゆ柇褰撳墠鏃堕棿鏄惁瓒呭嚭棰勭害鏃堕棿
+ setTimeout(() => {
+ let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
+ .coalDetailsData
+ .yuYueSection.slice(-5);
+ if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
+ this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
+ this.timeout = '1'
+ }
+ }, 1000)
})
},
// 鏃ュ織鏌ヨ
--
Gitblit v1.9.1