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 | 83 +++++++++++++++++++++++------------------
1 files changed, 47 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 33a1f34..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
@@ -38,6 +38,12 @@
<view class="order-code"
v-if="!isSpecial">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
+ <view class="stream-view"
+ style="color: #475bfd;"
+ @click="streamView"
+ v-show="timeLineStatus===9">
+ 鏌ョ湅瀹炴椂杞﹁締
+ </view>
<view class="weigh-item">
<view class="item">
<view class="concrete"
@@ -168,7 +174,7 @@
plain
@click="rcsqClick"
shape="circle"
- :disabled="coalDetailsData.status >= 2"></u-button>
+ :disabled="currentPageCoalStatus>= 3"></u-button>
<!-- <u-button text="鍏ュ満鐢宠"
type="primary"
plain
@@ -194,8 +200,15 @@
</view>
</view>
<view class="weigh-ability">
+ <view class="weigh-button">
+ <u-button text="涓婄璁￠噺"
+ @click="cengZhongClick"
+ type="primary"
+ shape="circle"
+ :disabled="haveInputOrigin&&!isSpecial"></u-button>
+ </view>
<view class="weigh-button"
- v-show='ablePrintInduction'>
+ v-show='ablePrintInduction&&!(coalDetailsData.skin&&coalDetailsData.hair)'>
<u-button text="鎵撳嵃鍏ラ棬璇�"
@click="printBefore('in')"
type="primary"
@@ -216,11 +229,6 @@
@click="showCaolPickUpBill"
type="primary"
shape="circle"></u-button></view>
- <view class="weigh-button"><u-button text="涓婄璁￠噺"
- @click="cengZhongClick"
- type="primary"
- shape="circle"
- :disabled="haveInputOrigin&&!isSpecial"></u-button></view>
</view>
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -230,14 +238,14 @@
@confirm="evacuationConfirm"
@cancel="evacuationCancel"></u-modal>
</view>
- <view class="completeOutSale">
+ <!-- <view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
- </view>
+ </view> -->
<view class="serviece-customer">
<u-action-sheet :actions="list"
@select="selectClick"
@@ -278,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) {
@@ -404,6 +412,7 @@
timeout: '0',
wsgShow: false,
timeLineStatus: null,
+ timeLineEqCode: '',
originInfoNotice: '濉啓鍘熷彂淇℃伅鍚庡彲涓婄璁￠噺',
submitOriginInfoLoading: false,
ischeckedDefault: 0,
@@ -473,6 +482,7 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -516,11 +526,11 @@
this.orderType = this.coalDetailsData.orderType;
//
this.isSpecial = res.data.isSpecial
- // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
- this.completeOutSale.orderType = this.coalDetailsData.orderType;
- this.completeOutSale.deptId = this.coalDetailsData.deptId;
- this.completeOutSale.filedId = this.coalDetailsData.filedId;
- this.completeOutSale.clean = this.coalDetailsData.clean;
+ // // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
+ // this.completeOutSale.orderType = this.coalDetailsData.orderType;
+ // this.completeOutSale.deptId = this.coalDetailsData.deptId;
+ // this.completeOutSale.filedId = this.coalDetailsData.filedId;
+ // this.completeOutSale.clean = this.coalDetailsData.clean;
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -565,28 +575,17 @@
this.$u.toast('鍔犺浇澶辫触');
}
}).then(() => {
- if (this.completeOutSale.orderType == "鍐呰喘" || this.completeOutSale.orderType == "杞叆") {
- if (this.completeOutSale.clean !== 0 && this.currentPageCoalStatus !== 6 && this
- .currentPageCoalStatus !== 11 && this.currentPageCoalStatus !== 12) {
- this.$reqGet('getTmTaskCoalOrderType', {
- deptId: this.completeOutSale.deptId,
- filedId: this.completeOutSale.filedId,
- orderType: '澶栭攢'
- }).then(res => {
- if (res.data && res.data?.length !== 0) {
- this.completeOutSaleShow = true
- console.log(res, '瀹屾垚澶栭攢璁㈠崟');
- }
- })
- }
- }
- }).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) {
+ // 鏈�澶х害鏉熸椂闂� 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'
}
@@ -599,6 +598,7 @@
this.$reqGet('coalDayPage', { id: this.orderPlanId, timeout: this.timeout }).then(res => {
if (res.code == 0) {
this.timeLineStatus = res.data[0].taskStatus
+ this.timeLineEqCode = res.data[0].eqCode
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -635,7 +635,7 @@
uni.navigateTo({
url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
this.getYuYueDataParams.deptId
- }&sendDate=${this.getYuYueDataParams.sendDate}&coalStatus=${this.correctStatus}&yuYueSection=${this.coalDetailsData.yuYueSection}&tmId=${this.getWeightHouseObj.tmId}`
+ }&sendDate=${this.getYuYueDataParams.sendDate}&coalStatus=${this.currentPageCoalStatus}&yuYueSection=${this.coalDetailsData.yuYueSection}&tmId=${this.getWeightHouseObj.tmId}`
});
},
callCustomerService() {
@@ -964,6 +964,11 @@
} else {
uni.$u.toast('璇峰～鍐欏畬鏁村師鍙戜俊鎭�')
}
+ },
+ streamView() {
+ uni.navigateTo({
+ url: `/pages/public-page/driverStream/driverStream?eqCode=${this.timeLineEqCode}`
+ })
}
}
};
@@ -1124,6 +1129,12 @@
color: #7d7d7d;
}
+ .stream-view {
+ height: vww(18);
+ margin: vww(8);
+ margin-left: 0;
+ }
+
.weigh-item {
width: 100%;
height: vww(36);
--
Gitblit v1.9.1