From 3a11109642961896bd5ae64ead123cf1a31e5216 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 15:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/queueup.vue | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 0909f05..5deb4b4 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -35,7 +35,7 @@
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
<view class="status" v-if="item.signDate"
- >绛惧埌鏃堕棿锛歿{ item.signDate.slice(11, 16) }}</view
+ >绛惧埌鏃堕棿锛歿{ item.signDate.slice(5, 16) }}</view
>
</view>
<view class="line" v-if="item.billCode">
@@ -48,6 +48,10 @@
<text class="value">{{ item.contractNum }}</text>
<text class="primaryColor" @click="subDetail(item)">棰勭害璇︽儏</text>
</view>
+ <view class="line line2" v-if="item.billCode && item.wmsContractNum">
+ <text class="label">鍚堝悓鍗曞彿</text>
+ <text class="value">{{ item.wmsContractNum }}</text>
+ </view>
<view class="line">
<text class="label">椹鹃┒鍛�</text>
<text class="value"
@@ -100,7 +104,7 @@
<view class="value">{{ wmsInfo.carrierName }}</view>
</view>
</view>
- <view class="separate"></view>
+ <!-- <view class="separate"></view> -->
<view class="contract_wrap">
<view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
<view class="title">鍚堝悓鍙凤細{{ item.contractCode }}</view>
@@ -188,6 +192,11 @@
}).then(res => {
if (res.data) {
this.platformLineUpList = [...this.platformLineUpList, ...res.data.records || []]
+ this.platformLineUpList.forEach(item => {
+ if(item.wmsContractNum){
+ item.wmsContractNum = item.wmsContractNum.split(',').join('锛�')
+ }
+ })
this.total = res.data.total || 0
}
})
@@ -298,6 +307,7 @@
margin-bottom: 20rpx;
.label {
width: 144rpx;
+ flex-shrink: 0;
color: #666666;
}
.value {
@@ -451,4 +461,8 @@
}
}
}
+ .line2{
+ margin-right: -30rpx;
+ padding-right: 0;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3