From aef949a659d073443e81f22686b44bd440a69a0e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 25 十二月 2023 14:15:46 +0800
Subject: [PATCH] 修改称重连点问题 增加司机注册字段
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 81f6902..45a2f92 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
@@ -286,10 +286,10 @@
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
this.originInfoVisible = value.orderType === '澶栬喘'
- if (value.overTmWaixiao) {
- this.overTmWaixiao = value.overTmWaixiao
- this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
- }
+ // if (value.overTmWaixiao) {
+ // this.overTmWaixiao = value.overTmWaixiao
+ // this.getWeightHouseObj.overTmWaixiao = value.overTmWaixiao
+ // }
this.fileList1 = []
this.changeglobalIsFirstWeighing(1)
if (this.globalIsFirstWeighing === 1) {
@@ -580,7 +580,12 @@
let endTime = this.coalDetailsData.yuYueSection.slice(0, 10) + ' ' + this
.coalDetailsData
.yuYueSection.slice(-5);
- if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
+ // 鏈�澶х害鏉熸椂闂� maxRestrainTime
+ const maxRestrainTime = dayjs().subtract(this.coalDetailsData.flexibleTime,
+ 'minute')
+ .format('YYYY-MM-DD HH:mm:ss');
+ console.log(maxRestrainTime, this.correctStatus);
+ if (dayjs(maxRestrainTime).isAfter(endTime) && this.correctStatus <= 1) {
// this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
this.timeout = '1'
}
--
Gitblit v1.9.1