From 09c2ac7911db8993b6b435cb5af23fcf69c0fbe2 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 24 三月 2023 14:40:50 +0800
Subject: [PATCH] 增加货代详情
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 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 0fbcc08..0080b04 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,23 +2,23 @@
<view class="bill-of-lading-details">
<view class="bangDanMessage">
<view class="">
- <text>瀹㈡埛锛歿{ coalDetailsData.customerName }}</text>
- <text>鐭垮巶锛歿{ coalDetailsData.deptName }}</text>
+ <text>瀹㈡埛锛歿{ coalDetailsData.customerName || '' }}</text>
+ <text>鐭垮巶锛歿{ coalDetailsData.deptName || '' }}</text>
</view>
<view class="">
- <text>鐨噸锛歿{ coalDetailsData.skin }}</text>
- <text>姣涢噸锛歿{ coalDetailsData.hair }}</text>
- <text>鍑�閲嶏細{{ coalDetailsData.clean }}</text>
+ <text>鐨噸锛歿{ coalDetailsData.skin || '' }}</text>
+ <text>姣涢噸锛歿{ coalDetailsData.hair || '' }}</text>
+ <text>鍑�閲嶏細{{ coalDetailsData.clean || '' }}</text>
</view>
<view class="">
- <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderTye }}</text>
+ <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderTye || '' }}</text>
<text>鐘舵�侊細{{ coalStatus[coalDetailsData.status] }}</text>
</view>
<view class="">
- <text>鐓ゅ満锛歿{ coalDetailsData.filedName }}</text>
- <text>鍙戣繍鏃堕棿锛歿{ coalDetailsData.sendDate }}</text>
- <text>鎻愮叅鍗曠紪鍙凤細{{ coalDetailsData.code }}</text>
- <text>璁㈠崟缂栧彿锛歿{ coalDetailsData.orderCode }}</text>
+ <text>鐓ゅ満锛歿{ coalDetailsData.filedName || '' }}</text>
+ <text>鍙戣繍鏃堕棿锛歿{ coalDetailsData.sendDate || '' }}</text>
+ <text>鎻愮叅鍗曠紪鍙凤細{{ coalDetailsData.code || '' }}</text>
+ <text>璁㈠崟缂栧彿锛歿{ coalDetailsData.orderCode || '' }}</text>
</view>
</view>
<view class="timeLine" style="font-size: 16rpx;">
@@ -52,6 +52,7 @@
yyId: null,
dayRZ: [],
coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
+ currentPageCoalStatus:0,// 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -76,7 +77,8 @@
openId: null,
openName: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] ,// 鐘舵��
+
};
},
onShow() {
@@ -128,6 +130,8 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
+ // 鑾峰彇鎻愮叅鍗曠姸鎬�
+ this.currentPageCoalStatus = this.coalDetailsData.status
}
});
},
@@ -148,7 +152,7 @@
// 绛惧埌
arriveClick() {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${this.currentPageCoalStatus}`
});
},
// 鍏ュ満鐢宠
@@ -238,35 +242,39 @@
margin: vww(20);
margin-bottom: vww(10);
height: 40%;
- font-size:vww(16);
- font-weight: 500;
- .u-text {
- margin-bottom: vww(5) !important;
- }
+ font-size: vww(18);
+ font-weight: 600;
view {
- margin-bottom: vww(5);
+ margin-bottom: vww(10);
}
view:nth-of-type(1) {
display: flex;
- text{
- width:50%;
+ text {
+ width: 50%;
+ text-align: center;
}
}
view:nth-of-type(2) {
display: flex;
- text{
- width:33%;
+ text {
+ width: 33%;
+ text-align: center;
}
}
view:nth-of-type(3) {
display: flex;
- text{
- width:50%;
+ text {
+ width: 50%;
+ text-align: center;
}
}
- view:nth-of-type(4){
- display:flex;
+ view:nth-of-type(4) {
+ display: flex;
flex-direction: column;
+ text {
+ margin-bottom: vww(10);
+ text-align: center;
+ }
}
}
.timeLine {
@@ -284,7 +292,7 @@
}
}
.utilsBox {
- padding: vww(20);
+ padding: vww(10) vww(20);
flex: 1;
display: flex;
flex-direction: column;
--
Gitblit v1.9.1