From 22881a4d6409c7d17867e1d40bf81a13578208df Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 31 十月 2025 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 pda/pages/index/queueup.vue |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/pda/pages/index/queueup.vue b/pda/pages/index/queueup.vue
index aad2d5b..7cb8ab1 100644
--- a/pda/pages/index/queueup.vue
+++ b/pda/pages/index/queueup.vue
@@ -17,6 +17,7 @@
           type="text"
           placeholder="鎼滅储杞﹁締鐗岀収"
           placeholder-class="placeholder9"
+					confirm-type="search"
           @confirm="handleQuery"
         />
       </view>
@@ -26,7 +27,7 @@
     </view>
     <!--  -->
     <view class="dataList">
-      <view class="item" v-for="item in platformLineUpList" :key="item.id">
+      <view class="item" v-for="item,i in platformLineUpList" :key="i">
         <view class="head">
           <view v-if="item.carCodeFront" class="code">
             <text>{{ item.carCodeFront.slice(0, 1) }}</text>
@@ -34,9 +35,10 @@
             <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 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 +50,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"
@@ -56,12 +62,16 @@
         </view>
         <view class="line">
           <text class="label">鎬昏繍杈撻噺</text>
-          <text class="value">{{ item.totalNum }}涓囨敮</text>
+          <text class="value">{{ item.totalNum || item.ioQty }}涓囨敮</text>
         </view>
         <view class="line" v-if="item.carrierName">
           <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 +110,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>
@@ -154,7 +164,13 @@
   },
 	onReachBottom() {
 		if(this.total > this.platformLineUpList.length){
+			this.page ++
 			this.getList()
+		}else{
+			uni.showToast({
+				title:'鏆傛棤鏇村鏁版嵁',
+				icon: 'none'
+			})
 		}
 	},
   methods: {
@@ -188,6 +204,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 +313,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 +476,8 @@
 			}
 		}
 	}
+	.line2{
+		margin-right: -30rpx;
+		padding-right: 0;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3