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/center.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/pda/pages/index/center.vue b/pda/pages/index/center.vue
index c07d174..74990cb 100644
--- a/pda/pages/index/center.vue
+++ b/pda/pages/index/center.vue
@@ -41,6 +41,10 @@
<text class="label">鍚堝悓鍗曞彿</text>
<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>
@@ -82,6 +86,10 @@
<u-icon name="search" class="mr12" size="19" color="#999999" />
<input v-model="platformCallSearch" type="text" placeholder="鎼滅储杞﹁締鐗岀収" placeholder-class="placeholder9"
@confirm="callQuery" />
+ </view>
+ <view v-if="platformCallList.length == 0" class="empty_wrap">
+ <image src="@/static/default_nodata@2x.png" />
+ <text>鏆傛棤鎺掗槦杞﹁締</text>
</view>
<view class="order_list">
<scroll-view scroll-y="true" @scrolltolower="callScrolltolower" class="scroll_view">
@@ -106,6 +114,10 @@
<text class="label">鍚堝悓鍗曞彿</text>
<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>
@@ -253,9 +265,6 @@
},
onLoad() {
this.getPlatformGroup()
- // setInterval(() => {
- // this.getPlatformGroup()
- // }, 1000 * 30)
},
onHide(){
if(this.timer1){
@@ -328,7 +337,10 @@
let time = this.currentDate
if (this.platformTaskInfo && this.platformTaskInfo.platformJobList && this.platformTaskInfo.platformJobList
.length > 0) {
- this.platformTaskInfo.platformJobList.forEach(item => {
+ this.platformTaskInfo.platformJobList.forEach(item => {
+ if(item.wmsContractNum){
+ item.wmsContractNum = item.wmsContractNum.split(',').join('锛�')
+ }
if (item.newCallDate) {
let timeNum = 0
if(time > new Date(item.newCallDate).getTime()){
@@ -497,7 +509,12 @@
page: platformCallPage
}).then(res => {
if (res.data && res.data.records) {
- this.platformCallList = [...this.platformCallList, ...res.data.records]
+ this.platformCallList = [...this.platformCallList, ...res.data.records]
+ this.platformCallList.forEach(item => {
+ if(item.wmsContractNum){
+ item.wmsContractNum = item.wmsContractNum.split(',').join('锛�')
+ }
+ })
this.platformCallTotal = res.data.total
}
})
@@ -694,12 +711,15 @@
margin-bottom: 20rpx;
.label {
- width: 144rpx;
- color: #666666;
+ width: 132rpx;
+ color: #666666;
+ flex-shrink: 0;
}
.value {
- flex: 1;
+ flex: 1;
+ display: flex;
+ flex-wrap: wrap;
}
}
@@ -840,7 +860,8 @@
.label {
font-size: 28rpx;
color: #666666;
- width: 88rpx;
+ width: 88rpx;
+ flex-shrink: 0;
}
.value {
@@ -1082,5 +1103,9 @@
}
}
}
+ }
+ .line2{
+ margin-right: -30rpx;
+ padding-right: 0;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3