From 65def89a0bd8548db777d0c2c4b7f8b67519a8d5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 21 八月 2025 12:53:10 +0800
Subject: [PATCH] 1

---
 pages/pakin/review.vue |   57 +++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/pages/pakin/review.vue b/pages/pakin/review.vue
index 24e829f..a1cfa03 100644
--- a/pages/pakin/review.vue
+++ b/pages/pakin/review.vue
@@ -25,7 +25,7 @@
 			<text>璁㈠崟鏄庣粏</text>
 		</view>
 		<!-- 鍖呰缁勫彿锛歿{item.packageGroupNo}} -->
-		<view class="order-item" v-for="item in orderList">
+		<view class="order-item" v-for="item in orderList" v-show="item.show">
 			<view class="list-left">
 				<!-- <view class="list-left-item">
 					<view class="desc">鐗╂枡缂栫爜锛�</view>
@@ -69,9 +69,13 @@
 		<view style="height: 60px;"></view>
 		<view class="orderDetl-none" v-if="orderList.length == 0">鏆傛棤鏄庣粏</view>
 
+
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
 			<button size="mini" @click="reset('warn')">閲嶇疆</button>
+			<div>{{check}}</div>
+			<div>/</div>
+			<div>{{total}}</div>
 			<button size="mini" type="primary" @click="combConfirm('warn')">鍗曟嵁鏍稿</button>
 		</view>
 		<view>
@@ -106,15 +110,17 @@
 				orderNoList: [],
 				orderNo: '',
 				orderList: [],
-				checkUser:[],
+				checkUser: [],
 				matnr: '',
 				matFocus: true,
 				msgType: 'success',
 				messageText: '',
 				title: '',
 				content: '',
-				threeCode:'',
-				memo:'',
+				threeCode: '',
+				memo: '',
+				check: 0,
+				total: 0,
 			}
 		},
 		onShow() {
@@ -132,7 +138,7 @@
 				// 	return
 				// }
 				uni.request({
-					url: `${_this.baseUrl}/mobile/getReviewList?orderNo=`+_this.orderNo,
+					url: `${_this.baseUrl}/mobile/getReviewList?orderNo=` + _this.orderNo,
 					header: {
 						'token': uni.getStorageSync('token')
 					},
@@ -174,8 +180,14 @@
 						res = res.data
 						if (res.code === 200) {
 							_this.orderList.length = 0
-							console.log(_this.orderList);
+							_this.check = 0
 							_this.orderList = res.data
+							_this.total = res.data.length
+							for (let key of res.data) {
+								if (key.inspect == 1) {
+									_this.check = _this.check + 1
+								}
+							}
 						} else if (res.code === 403) {
 							uni.showToast({
 								title: res.msg,
@@ -209,7 +221,6 @@
 						res = res.data
 						if (res.code === 200) {
 							_this.checkUser.length = 0
-							console.log( res.data);
 							_this.checkUser = res.data
 						} else if (res.code === 403) {
 							uni.showToast({
@@ -292,14 +303,16 @@
 			},
 			secAnalysis(data) {
 				let flag = false;
+				let sortOrderList = [];
 				for (let k of this.orderList) {
-					console.info(data.batch == k.batch)	
-					console.info(data.specs == k.specs)	
-					console.info(data.anfme == k.anfme)	
-					console.info(data.anfme )	
-					console.info(k.anfme)	
+					console.info(data.batch == k.batch)
+					console.info(data.specs == k.specs)
+					console.info(data.anfme == k.anfme)
+					console.info(data.anfme)
+					console.info(k.anfme)
 					if (data.batch == k.batch && data.specs == k.specs && data.anfme == k.anfme) {
 						flag = true
+						sortOrderList.unshift(k)
 						if (k.inspect == 1) {
 							uni.showToast({
 								title: '褰撳墠鏉$爜宸茬‘璁�',
@@ -314,16 +327,20 @@
 								duration: 2000
 							})
 							k.inspect = 1
+							this.check = this.check + 1
 						}
+					} else {
+						sortOrderList.push(k)
 					}
 				}
+				this.orderList = sortOrderList;
 				if (!flag) {
 					this.msgType = 'warn'
 					this.title = '璀﹀憡'
-					this.content = "绠卞彿锛�" + data.batch + "\n"
-					+ "瑙勬牸锛�"+ data.specs + "\n"
-					+ "鍑�閲嶏細"+ data.anfme + "\n"
-					+ '涓嶅瓨鍦紝璇锋鏌�!'
+					this.content = "绠卞彿锛�" + data.batch + "\n" +
+						"瑙勬牸锛�" + data.specs + "\n" +
+						"鍑�閲嶏細" + data.anfme + "\n" +
+						'涓嶅瓨鍦紝璇锋鏌�!'
 					this.$refs.combConfirm2.open()
 				}
 				this.focuss()
@@ -352,7 +369,7 @@
 			},
 			comb() {
 				let _this = this
-				
+
 				// if (!_this.memo) {
 				// 	this.messageText = "璇烽�夋嫨澶嶆牳澶囨敞"
 				// 	this.messageToggle('error')
@@ -362,10 +379,10 @@
 					this.messageText = "璇烽�夋嫨澶嶆牳浜�"
 					this.messageToggle('error')
 					return;
-				}	
+				}
 				for (let k of this.orderList) {
-					k.memo =this.memo
-					k.threeCode =this.threeCode
+					k.memo = this.memo
+					k.threeCode = this.threeCode
 				}
 				uni.request({
 					url: `${_this.baseUrl}/mobile/reviewCheck`,

--
Gitblit v1.9.1