From 6d3886ba1e4b3630da947a7a046433feb3759d17 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 九月 2024 17:59:39 +0800
Subject: [PATCH] ll
---
h5/pages/driver/taskConfirm.vue | 270 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 151 insertions(+), 119 deletions(-)
diff --git a/h5/pages/driver/taskConfirm.vue b/h5/pages/driver/taskConfirm.vue
index 97860e4..bcfbe59 100644
--- a/h5/pages/driver/taskConfirm.vue
+++ b/h5/pages/driver/taskConfirm.vue
@@ -16,16 +16,28 @@
<view class="label">鎵嬫満鍙�</view>
<view class="value">{{ param.drivierPhone }}</view>
</view>
- <view class="line">
+ <view class="line" v-if="type != 4">
<view class="label">杩愯緭鍗曞彿</view>
<view class="value" @click="wmsDetail">
<text class="waybill_num">{{ param.billCode }}</text>
<text class="btn">杩愬崟璇︽儏</text>
</view>
</view>
- <view class="line">
+ <view class="line" v-else>
+ <view class="label">鍚堝悓缂栧彿</view>
+ <view class="value">{{param.contractNum}}</view>
+ </view>
+ <view class="line" v-if="type != 4">
<view class="label">浣滀笟绫诲瀷</view>
- <view class="value">{{ param.inType == 0 ? '鏁存墭鐩�' : '浠剁儫' }}</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>
+ <view class="line" v-if="type == 4">
+ <view class="label">鍏ュ簱绫诲瀷</view>
+ <view class="value" v-if="param.inType == 0">鏁存墭鐩�</view>
+ <view class="value" v-if="param.inType == 1">浠剁儫</view>
</view>
<view class="empty"></view>
<!-- -->
@@ -85,18 +97,20 @@
</view>
</view>
<view class="separate"></view>
- <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 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>
@@ -360,109 +374,127 @@
}
.detail_modal {
- padding: 36rpx 30rpx;
-
- .modal_title {
- font-weight: 600;
- font-size: 32rpx;
- color: #222222;
- line-height: 44rpx;
- text-align: center;
- margin-bottom: 36rpx;
+ height: calc( 100vh - 88rpx );
+ padding: 36rpx 30rpx;
+ border-radius: 12rpx;
+ box-shadow: 0 0 6rpx rgba(0, 0, 0, 0.5);
+ .modal_title {
+ font-weight: 600;
+ font-size: 32rpx;
+ color: #222222;
+ line-height: 44rpx;
+ text-align: center;
+ margin-bottom: 36rpx;
+ }
+ .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;
+ }
+ .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;
+ }
+ }
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
+ &:nth-last-child(1){
+ margin-bottom: 0rpx;
+ }
+ .label {
+ color: #666666;
+ width: 92rpx;
+ }
+
+ .value {
+ flex: 1;
+ color: #222222;
+ }
+ }
+ }
+
+ .title {
+ font-weight: 600;
+ font-size: 30rpx;
+ color: $uni-color-primary;
+ margin-bottom: 12rpx;
+ }
+
+ .address {
+ font-size: 26rpx;
+ color: #666666;
+ margin-bottom: 20rpx;
+ }
+ }
+
+ .info {
+ .line {
+ display: flex;
+ margin-bottom: 20rpx;
+
+ .label {
+ font-size: 30rpx;
+ color: #666666;
+ width: 150rpx;
+ }
+
+ .value {
+ flex: 1;
+ font-size: 30rpx;
+ color: #222222;
+ }
+ }
+ }
+
+ .separate {
+ width: 750rpx;
+ height: 2rpx;
+ margin: 30rpx -30rpx;
+ border: 1rpx solid #e5e5e5;
+ }
+
+ .id_card {
+ display: flex;
+ font-weight: 600;
+ height: 60rpx;
+ line-height: 60rpx;
+ font-size: 32rpx;
+ color: #111111;
+ border-radius: 8rpx;
+ border: 1rpx solid #dfdede;
+ width: 220rpx;
+ margin-bottom: 15rpx;
+
+ text {
+ &:nth-of-type(1) {
+ background: #e9f5f6;
+ padding: 0 12rpx;
+ }
+
+ &:nth-of-type(2) {
+ padding-left: 10rpx;
+ }
+
+ &:nth-of-type(4) {
+ padding-right: 6rpx;
+ }
+ }
+ }
}
-
- .contract_list {
- .list {
- background: #f7f7f7;
- border-radius: 8rpx;
- padding: 20rpx;
-
- .line {
- display: flex;
- margin-bottom: 20rpx;
-
- &:nth-of-type(3n) {
- border-top: 1rpx solid #e5e5e5;
- padding-top: 20rpx;
- }
-
- .label {
- color: #666666;
- width: 86rpx;
- }
-
- .value {
- flex: 1;
- color: #222222;
- }
- }
- }
-
- .title {
- font-weight: 600;
- font-size: 30rpx;
- color: $uni-color-primary;
- margin-bottom: 12rpx;
- }
-
- .address {
- font-size: 26rpx;
- color: #666666;
- margin-bottom: 20rpx;
- }
- }
-
- .info {
- .line {
- display: flex;
- margin-bottom: 20rpx;
-
- .label {
- font-size: 30rpx;
- color: #666666;
- width: 150rpx;
- }
-
- .value {
- flex: 1;
- font-size: 30rpx;
- color: #222222;
- }
- }
- }
-
- .separate {
- width: 750rpx;
- height: 2rpx;
- margin: 30rpx -30rpx;
- border: 1rpx solid #e5e5e5;
- }
-
- .id_card {
- display: flex;
- font-weight: 600;
- height: 60rpx;
- line-height: 60rpx;
- font-size: 32rpx;
- color: #111111;
- border-radius: 8rpx;
- border: 1rpx solid #dfdede;
- width: 220rpx;
- margin-bottom: 15rpx;
- text {
- &:nth-of-type(1) {
- background: #e9f5f6;
- padding: 0 12rpx;
- }
-
- &:nth-of-type(2) {
- padding-left: 10rpx;
- }
-
- &:nth-of-type(4) {
- padding-right: 6rpx;
- }
- }
- }
-}
</style>
--
Gitblit v1.9.3