From 10cd77285a9d54b0e889e2917c0a5e3e55e83cf6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 十月 2024 14:48:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/driver/taskDetail.vue | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index d8ab8f0..2b56631 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -4,8 +4,8 @@
<image class="bg" src="../../static/driver/bg_renwu@2x.png" mode=""></image>
<view class="name" v-if="param.status == 1">璇蜂笌{{ param.arriveDate.slice(0,11) }}鐜板満绛惧埌</view>
<view class="name" v-if="param.status == 2">鍓嶆柟鎺掗槦锛歿{param.lineUpNum}}杈�</view>
- <view class="name" v-if="param.status == 3">鍏ュ洯绛夊緟</view>
- <view class="name" v-if="param.status == 4">璇峰叆鍥仠闈爗{param.platformName}}浣滀笟</view>
+ <view class="name" v-if="param.status == 3">鍏ュ洯绛夊緟</view>
+ <view class="name" v-if="param.status == 4">璇峰叆鍥仠闈爗{param.platformName}}浣滀笟</view>
<view class="name" v-if="param.status == 5">鏈堝彴浣滀笟涓�</view>
<view class="name" v-if="param.status == 6">浣滀笟宸插畬鎴�</view>
<view class="id_card">{{ param.carCodeFront }}</view>
@@ -21,7 +21,7 @@
<view class="label">鎵嬫満鍙�</view>
<view class="value">{{param.drivierPhone}}</view>
</view>
- <template v-if="param.type != 4">
+ <template v-if="param.billCode">
<view class="line">
<view class="label">杩愯緭鍗曞彿</view>
<view class="value" @click="wmsDetail">
@@ -31,9 +31,9 @@
</view>
<view class="line">
<view class="label">浣滀笟绫诲瀷</view>
- <view class="value" v-if="param.type == 0">鑷湁杞﹀嵏璐�</view>
- <view class="value" v-if="param.type == 1">鑷湁杞﹁璐�</view>
- <view class="value" v-if="param.type == 2">澶栧崗杞﹀嵏璐�</view>
+ <view class="value" v-if="param.type == 0">鑷湁杞﹀嵏璐�</view>
+ <view class="value" v-if="param.type == 1">鑷湁杞﹁璐�</view>
+ <view class="value" v-if="param.type == 2">澶栧崗杞﹀嵏璐�</view>
<view class="value" v-if="param.type == 3">澶栧崗杞﹁璐�</view>
</view>
</template>
@@ -139,24 +139,24 @@
<view class="label">杩愯緭鍏徃</view>
<view class="value">{{ wmsInfo.carrierName }}</view>
</view>
- </view>
- <view class="contract_wrap">
- <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
- <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
- <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
- <view class="list">
- <view class="item" v-for="line in item.platformWmsDetailList">
- <view class="line">
- <view class="label">鐗╂枡锛�</view>
- <view class="value">{{ line.materialName }}</view>
- </view>
- <view class="line">
- <view class="label">鏁伴噺锛�</view>
- <view class="value">{{ line.ioQty }}</view>
- </view>
- </view>
- </view>
- </view>
+ </view>
+ <view class="contract_wrap">
+ <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
+ <view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
+ <view class="address">鏀惰揣鍦帮細{{ item.address }}</view>
+ <view class="list">
+ <view class="item" v-for="line in item.platformWmsDetailList">
+ <view class="line">
+ <view class="label">鐗╂枡锛�</view>
+ <view class="value">{{ line.materialName }}</view>
+ </view>
+ <view class="line">
+ <view class="label">鏁伴噺锛�</view>
+ <view class="value">{{ line.ioQty }}</view>
+ </view>
+ </view>
+ </view>
+ </view>
</view>
</view>
</u-popup>
@@ -438,10 +438,10 @@
}
}
-.detail_modal {
+.detail_modal {
height: calc( 100vh - 88rpx );
- padding: 36rpx 30rpx;
- border-radius: 12rpx;
+ padding: 36rpx 30rpx;
+ border-radius: 12rpx;
box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
.modal_title {
font-weight: 600;
@@ -451,36 +451,36 @@
text-align: center;
margin-bottom: 36rpx;
}
- .contract_wrap{
- height: calc( 100% - 400rpx );
- overflow-y: auto;
+ .contract_wrap{
+ height: calc( 100% - 400rpx );
+ overflow-y: auto;
}
- .contract_list {
- border-top: 1rpx solid #E5E5E5;
- margin-bottom: 30rpx;
- padding-top: 30rpx;
- &:nth-last-child(1){
- margin-bottom: 0;
+ .contract_list {
+ border-top: 1rpx solid #E5E5E5;
+ margin-bottom: 30rpx;
+ padding-top: 30rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0;
}
.list {
background: #f7f7f7;
border-radius: 8rpx;
padding: 20rpx;
- .item{
- border-bottom: 1rpx solid #e5e5e5;
- padding-bottom: 20rpx;
- margin-bottom: 20rpx;
- &:nth-last-child(1){
- border: none;
- padding-bottom: 0;
- margin-bottom: 0;
- }
+ .item{
+ border-bottom: 1rpx solid #e5e5e5;
+ padding-bottom: 20rpx;
+ margin-bottom: 20rpx;
+ &:nth-last-child(1){
+ border: none;
+ padding-bottom: 0;
+ margin-bottom: 0;
+ }
}
.line {
display: flex;
margin-bottom: 20rpx;
- &:nth-last-child(1){
- margin-bottom: 0rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0rpx;
}
.label {
color: #666666;
@@ -561,5 +561,5 @@
}
}
}
- }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3