From 0293d4f776f88ebc307a750f38a16454f4553701 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期二, 19 八月 2025 21:01:35 +0800
Subject: [PATCH] 首检、巡检一致性前端代码提交

---
 pages/QC/LLJ/List.vue |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/pages/QC/LLJ/List.vue b/pages/QC/LLJ/List.vue
index aa4f94d..2efb071 100644
--- a/pages/QC/LLJ/List.vue
+++ b/pages/QC/LLJ/List.vue
@@ -12,6 +12,14 @@
 			</view>
 			
 			<view class="filter-controls" style="margin-bottom: 5px;">
+				<view class="status-tabs" style="margin-right: 10px;">
+					<button :class="['tab-button', arrivalFilter === -1 ? 'active' : '']"
+						@click="switchArrivalFilter(-1)">鍏ㄩ儴</button>
+					<button :class="['tab-button', arrivalFilter === 1 ? 'active' : '']"
+						@click="switchArrivalFilter(1)">宸插埌杈�</button>
+					<button :class="['tab-button', arrivalFilter === 0 ? 'active' : '']"
+						@click="switchArrivalFilter(0)">鏈埌杈�</button>
+				</view>
 				
 			<view class="dropdown-filter">
 				<picker @change="onProjectChange" :value="projectIndex" :range="projects">
@@ -68,6 +76,8 @@
 					<text class="badge normal" v-if="item.ftype == 1">濮斿</text>
 					<text class="badge normal" v-if="item.first == 1">棣栨鏉ユ枡</text>
 					<text class="card-title">妫�楠屽崟鍙�: {{item.releaseNo}}</text>
+					<text class="status arrived" v-if="item.isArrival == 1">宸插埌杈�</text>
+					<text class="status not-arrived" v-if="item.isArrival == 0">鏈埌杈�</text>
 					<text class="status pending" v-if="item.userName==null && item.activeTab==0">寰呭垎閰�</text>
 					<text class="status assigned" v-if="item.userName!=null && item.activeTab==0">宸插垎閰�</text>
 					<text class="status pass" v-if="item.fcheckResu=='鍚堟牸' && item.activeTab==1">鍚堟牸</text>
@@ -97,6 +107,10 @@
 							<text class="info-label">鏁伴噺</text>
 							<text class="info-content highlight">{{item.fcovertQty}}</text>
 						</view>
+						<view class="info-item">
+							<text class="info-label">鎶芥</text>
+							<text class="info-content highlight">{{item.maxCheckQyt}}</text>
+						</view>
 					</view>
 					<view class="info-row">
 						<view class="info-item">
@@ -117,9 +131,15 @@
 
 					<view class="meta-info" v-if="item.activeTab==0">
 						<text class="meta-item"><uni-icons type="calendar" size="14" color="#95a5a6"></uni-icons>
-							{{item.createDate}}</text>
+							鍒涘缓锛歿{item.createDate}}</text>
+							
 						<text class="meta-item"><uni-icons type="person" size="14" color="#95a5a6"></uni-icons>
 							{{item.userName}}</text>
+					</view>
+					<view class="meta-info" v-if="item.activeTab==0 && item.arrivalDate!=null">
+						<text class="meta-item"><uni-icons type="calendar" size="14" color="#95a5a6"></uni-icons>
+							鍒拌揪锛歿{item.arrivalDate}}</text>
+						
 					</view>
 					<!-- 鏌ョ湅鏃舵樉绀烘楠屽畬鎴愮殑鏁版嵁 -->
 					<view class="meta-info" v-if="item.activeTab==1">
@@ -161,8 +181,7 @@
 				searchValue: '',
 				startDate:new Date().toISOString().slice(0, 10),
 				endDate:new Date().toISOString().slice(0, 10),
-				
-
+				arrivalFilter: -1,
 			}
 		},
 		onLoad() {
@@ -223,7 +242,8 @@
 						userIndex: this.projectIndex,
 						startDate:this.startDate,
 						endDate:this.endDate,
-						state:this.state[this.stateIndex]
+						state:this.state[this.stateIndex],
+						arrivalFilter: this.arrivalFilter
 					}
 				}).then(res => {
 					if (this.pageIndex === 1) {
@@ -306,6 +326,22 @@
 						url: 'Add?id=' + item.id + '&lotNo=' + item.lotNo + '&releaseNo=' + item.releaseNo +
 							'&current=A'
 					})
+					// uni.showModal({
+					// 					title: '寮�濮嬫楠�',
+					// 					content: '寮�濮嬫楠屽皢璁板綍褰撳墠鏃堕棿涓哄紑濮嬫楠屾椂闂达紝纭畾寮�濮嬶紵',
+					// 					success: function(res) {
+					// 					if (res.confirm) {
+					// 						uni.navigateTo({
+					// 							url: 'Add?id=' + item.id + '&lotNo=' + item.lotNo + '&releaseNo=' + item.releaseNo +
+					// 								'&current=A'
+					// 						})
+					// 					} else {
+											 
+					// 					}
+					// 				}
+					// 			})
+
+					
 				}
 
 			},
@@ -360,6 +396,12 @@
 				}
 				await this.init(); // 鑷畾涔夌殑鍒锋柊鍑芥暟
 
+			},
+			switchArrivalFilter(filter) {
+				this.arrivalFilter = filter;
+				this.pageIndex = 1;
+				this.inspectionList = [];
+				this.init();
 			}
 		}
 	}
@@ -529,6 +571,7 @@
 		padding: 4px 8px;
 		border-radius: 4px;
 		font-weight: 500;
+		margin-left: 8px;
 	}
 
 	.status.pending {
@@ -541,6 +584,16 @@
 		color: white;
 	}
 
+	.status.arrived {
+		background-color: #00cd00;
+		color: white;
+	}
+
+	.status.not-arrived {
+		background-color: #95a5a6;
+		color: white;
+	}
+
 	.status.pass {
 		background-color: #00cd00;
 		color: white;

--
Gitblit v1.9.3