From 05273ace3da665cb10c36ca0dac4413a8284302a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 18:10:36 +0800
Subject: [PATCH] 增加部分限制，增加新功能
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 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 6cdfb20..3b23e08 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
@@ -6,7 +6,8 @@
<view class="cutomer-name" v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
<view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
- <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+ <view class="" v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+ <view class="" v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
@@ -55,11 +56,11 @@
<view class="utilsBox">
<view class="utils_chil utils_chilTop">
<view class="top-button">
- <u-button text="绛惧埌" type="primary" plain @click="arriveClick" shape="circle"></u-button>
- <u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle"></u-button>
+ <u-button text="绛惧埌" type="primary" plain @click="arriveClick" shape="circle" :disabled="coalDetailsData.status >= 2"></u-button>
+ <u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle" :disabled="coalDetailsData.status >= 3"></u-button>
</view>
<view class="bottom-button">
- <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="!isEvacuation"></u-button>
+ <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle" :disabled="isEvacuation || isapproach"></u-button>
<u-button text="鍛煎彨瀹㈡湇" type="primary" plain @click="callCustomerService" shape="circle"></u-button>
</view>
</view>
@@ -143,11 +144,18 @@
primaryClean: null,
scrollTop: 0,
// 纾呭崟绫诲瀷
- orderType: ''
+ orderType: '',
+ interval: ''
};
},
onShow() {
this.init();
+ },
+ onHide() {
+ clearInterval(this.interval);
+ },
+ beforeDestroy() {
+ clearInterval(this.interval);
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -170,10 +178,27 @@
//
isEvacuation() {
return this.coalDetailsData.hair == 0 || this.coalDetailsData.skin == 0;
+ },
+ isapproach() {
+ return this.currentPageCoalStatus < 3;
}
},
methods: {
init() {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ if (res.code == 0) {
+ this.dayRZ = res.data;
+ this.dayRZ = this.dayRZ.map(v => {
+ let slicedate = v.taskStatusDes.slice(0, 10);
+ if (slicedate == this.currentDate) {
+ return {
+ ...v,
+ taskStatusDes: v.taskStatusDes.slice(10)
+ };
+ }
+ });
+ }
+ });
this.coalDayPage(); //鑾峰彇鏃ュ織
this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
this.getgetService(); //鑾峰彇瀹㈡湇
@@ -231,20 +256,22 @@
},
// 鏃ュ織鏌ヨ
coalDayPage() {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
- if (res.code == 0) {
- this.dayRZ = res.data;
- this.dayRZ = this.dayRZ.map(v => {
- let slicedate = v.taskStatusDes.slice(0, 10);
- if (slicedate == this.currentDate) {
- return {
- ...v,
- taskStatusDes: v.taskStatusDes.slice(10)
- };
- }
- });
- }
- });
+ this.interval = setInterval(() => {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ if (res.code == 0) {
+ this.dayRZ = res.data;
+ this.dayRZ = this.dayRZ.map(v => {
+ let slicedate = v.taskStatusDes.slice(0, 10);
+ if (slicedate == this.currentDate) {
+ return {
+ ...v,
+ taskStatusDes: v.taskStatusDes.slice(10)
+ };
+ }
+ });
+ }
+ });
+ }, 5000);
},
// 灞曠ず鎻愮叅鍗曡鎯�
showCaolPickUpBill() {
--
Gitblit v1.9.1