From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pda/pages/index/queueup.vue | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index 0909f05..5cb664e 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -34,9 +34,9 @@
<text>路</text>
<text>{{ item.carCodeFront.slice(2) }}</text>
</view>
- <view class="status" v-if="item.signDate"
- >绛惧埌鏃堕棿锛歿{ item.signDate.slice(11, 16) }}</view
- >
+ <view class="status green" v-if="item.status == 2">鏈堝彴绛夊緟</view >
+ <view class="status" v-if="item.status == 3">鍏ュ洯绛夊緟</view >
+ <view class="status" v-if="item.status == 7">杞Щ涓�</view >
</view>
<view class="line" v-if="item.billCode">
<text class="label">杩愯緭鍗曞彿</text>
@@ -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"
@@ -62,6 +66,10 @@
<text class="label">杩愯緭鍏徃</text>
<text class="value">{{ item.carrierName }}</text>
</view>
+ <view class="line">
+ <text class="label primaryColor">绛惧埌鏃堕棿</text>
+ <text class="value primaryColor" v-if="item.signDate">{{ item.signDate.slice(5, 16) }}</text>
+ </view>
<!-- <view class="btns">
<view class="btn active">鍏ュ洯</view>
</view> -->
@@ -100,7 +108,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 +196,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
}
})
@@ -292,12 +305,16 @@
font-size: 30rpx;
color: $uni-color-primary;
}
+ .green{
+ color: #00BA67;
+ }
}
.line {
display: flex;
margin-bottom: 20rpx;
.label {
width: 144rpx;
+ flex-shrink: 0;
color: #666666;
}
.value {
@@ -451,4 +468,8 @@
}
}
}
+ .line2{
+ margin-right: -30rpx;
+ padding-right: 0;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3