From ae1aad66a165ee7253bed2127a3b53baa40c2361 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 08:35:33 +0800
Subject: [PATCH] 修复错误，增加验证
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 151 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 114 insertions(+), 37 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 633f96d..78cd944 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
@@ -2,32 +2,33 @@
<view class="bill-of-lading-details">
<view class="top-banner" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
<view class="top-information">
- <view class="cutomer-name">瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
+ <view class="cutomer-name" v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ <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="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
+ <view class="">鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
<view class="block-main">
<view class="basic">
<view class="coalName">{{ coalDetailsData.coalName }}</view>
- <view class="black-block"></view>
- <view class="order-type">{{ coalDetailsData.orderType }}</view>
+ <!-- <view class="black-block"></view>
+ <view class="order-type">{{ coalDetailsData.orderType }}</view> -->
<view
class="status-button"
style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
background-size: cover;"
>
- {{ coalStatus[coalDetailsData.status] }}
+ {{ coalStatus[coalDetailsData.status] || '' }}
</view>
</view>
<view class="time">
<view class="time-icon"><u-icon name="clock" color="#515151" size="40"></u-icon></view>
<view class="send-date">{{ coalDetailsData.sendDate }}</view>
</view>
- <view class="coal-code">鎻愮叅鍗曠紪鐮亄{ coalDetailsData.code || '' }}</view>
- <view class="order-code">璁㈠崟缂栧彿:{{ coalDetailsData.orderCode || '' }}</view>
+ <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
+ <view class="order-code">璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
<view class="weigh-item">
<view class="item">
<view class="concrete" style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">鐨�</view>
@@ -58,7 +59,7 @@
<u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick" shape="circle"></u-button>
</view>
<view class="bottom-button">
- <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500" shape="circle"></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>
@@ -122,7 +123,7 @@
openId: null,
openName: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�', '鏀剧┖'], // 鐘舵��
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -140,11 +141,17 @@
primarySkin: null,
primaryHair: null,
primaryClean: null,
- scrollTop: 0
+ scrollTop: 0,
+ // 纾呭崟绫诲瀷
+ orderType: '',
+ interval: ''
};
},
onShow() {
this.init();
+ },
+ beforeDestroy() {
+ clearInterval(this.interval);
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -153,10 +160,41 @@
},
openid() {
return uni.getStorageSync('openid');
+ },
+ // 鑾峰彇浠婂ぉ鏃ユ湡
+ currentDate() {
+ let time = new Date();
+ let year = time.getFullYear();
+ let month = time.getMonth() + 1;
+ month = month < 10 ? '0' + month : month;
+ let date = time.getDate();
+ date = date < 10 ? '0' + date : date;
+ return `${year}-${month}-${date}`;
+ },
+ //
+ 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(); //鑾峰彇瀹㈡湇
@@ -179,10 +217,15 @@
},
// 鑾峰彇鎻愮叅鍗曡鎯�
getTakeCoal() {
+ uni.showLoading({
+ title: '鍔犺浇涓�'
+ });
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
+ uni.hideLoading();
console.log(res, '鎻愮叅鍗曡鎯�');
this.coalDetailsData = res.data;
+ this.orderType = this.coalDetailsData.orderType;
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -202,16 +245,29 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
+ } else {
+ this.$u.toast('鍔犺浇澶辫触');
}
});
},
// 鏃ュ織鏌ヨ
coalDayPage() {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
- if (res.code == 0) {
- this.dayRZ = res.data;
- }
- });
+ 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() {
@@ -340,7 +396,6 @@
.u-text {
.u-text__value {
font-size: 31rpx !important;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
@@ -373,11 +428,14 @@
top: vww(25);
color: #ffffff;
font-size: 31rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
.fild-name {
- @include flex justify-content: space-between;
+ @include flex;
+ justify-content: space-between;
width: 100%;
+ view {
+ min-width: 296rpx;
+ }
}
}
.block-information {
@@ -389,7 +447,6 @@
border-radius: 20rpx;
position: relative;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
overflow: hidden;
@@ -407,21 +464,21 @@
text-align: center;
line-height: vww(33);
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
position: absolute;
right: vww(10);
color: #fff;
}
.basic {
- width: 40%;
+ width: 100%;
height: vww(15);
- @include flex justify-content: space-between;
- .coalName {
- width: 50%;
+ @include flex;
+ justify-content: flex-start;
+ .coalName,
+ .order-type {
+ width: 45%;
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
position: relative;
@@ -430,18 +487,20 @@
width: 2rpx;
height: 30rpx;
background: #515151;
+ position: relative;
+ top: vww(2);
}
}
.time {
- width: 30%;
+ width: 35%;
height: vww(12);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
.send-date {
width: 148rpx;
height: 24rpx;
+ margin-left: vww(14);
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -451,19 +510,18 @@
width: 100%;
height: 24rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #7d7d7d;
}
.weigh-item {
width: 100%;
height: vww(36);
- @include flex justify-content: space-around;
+ @include flex;
+ justify-content: space-around;
.item {
- width: vww(50);
+ min-width: vww(50);
height: vww(45);
font-size: 21rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
text-align: center;
@@ -475,7 +533,6 @@
}
.num {
font-size: 40rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
@@ -489,6 +546,22 @@
position: relative;
top: vww(120);
overflow-y: overlay;
+ padding: vww(20);
+ .u-steps {
+ .u-steps-item {
+ padding-bottom: vww(35);
+ .u-steps-item__wrapper {
+ .u-steps-item__wrapper__dot {
+ background: linear-gradient(-29deg, #426cff 0%, #7991ff 100%);
+ box-shadow: 2rpx 7rpx 10rpx 0rpx rgba(172, 172, 172, 0.64);
+ }
+ }
+ .u-steps-item__line {
+ height: vww(52) !important;
+ background: #e9e6ea !important;
+ }
+ }
+ }
}
.utilsBox {
width: 94%;
@@ -501,14 +574,15 @@
.top-button,
.bottom-button {
width: 100%;
- height: vww(80);
+ height: vww(47);
@include flex;
.u-button {
width: 40%;
+ height: 60rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #497bfb;
+ border: 2px solid #3b56eb;
}
}
}
@@ -525,9 +599,12 @@
height: vww(89);
.u-button {
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
+ background: #497bfb;
+ letter-spacing: 4rpx;
+ border-radius: 37rpx 37rpx 37rpx 37rpx;
+ box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
}
}
}
--
Gitblit v1.9.1