From cb4ee17305292f8b3260235668c143466e174e00 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 08:46:06 +0800
Subject: [PATCH] 12

---
 pages/home/home.vue      |    7 +++++++
 pages/pakin/boxPakin.vue |   48 +++++++++++++++++++++++++++++++++++++++++++++---
 pages/pakin/delCheck.vue |    4 ++--
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index b1f7923..74a02e2 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -53,6 +53,13 @@
 						cuIcon: 'pullup',
 						url: '/pakin/boxPakin'
 					},
+					{
+						title: '鍗曟嵁澶嶆牳',
+						name: 'review',
+						color: 'blue',
+						cuIcon: 'pullup',
+						url: '/pakin/boxPakin'
+					},
 					// {
 					// 	title: '鍑哄簱',
 					// 	name: 'PutDown',
diff --git a/pages/pakin/boxPakin.vue b/pages/pakin/boxPakin.vue
index 01ea126..8ccbfbf 100644
--- a/pages/pakin/boxPakin.vue
+++ b/pages/pakin/boxPakin.vue
@@ -57,6 +57,29 @@
 			  </view>
 			</view>
 			<view class="text-box">
+			  <view class="text-title">鏈ㄧ鏂版棫:</view>
+			  <view class="attr-row">
+				<picker 
+				  :range="oldOptions" 
+				  :value="selectedOldIndex" 
+				  @change="onPropChangeOld" 
+				  class="half-box"
+				>
+				  <view class="picker-box">
+					<text>{{ matData.old || '璇烽�夋嫨鏂版棫' }}</text>
+				  </view>
+				</picker>
+			
+				<input 
+				  type="text" 
+				  v-model="matData.old" 
+				  placeholder="鎵嬪姩杈撳叆鏂版棫" 
+				  class="half-box"
+				/>
+			
+			  </view>
+			</view>
+			<view class="text-box">
 				<view class="text-title"><text>鏁伴噺</text></view>
 				<view class="text-title">
 					<view>
@@ -99,6 +122,7 @@
 			return {
 				batchOptions: [], // 瀵瑰簲 tagId=7 灏哄
 				memoOptions: [],  // 瀵瑰簲 tagId=8 澶囨敞
+				oldOptions: [], 
 				matData: {
 				  batch: '',
 				  memo: '',
@@ -106,6 +130,7 @@
 				},
 				selectedBatchIndex: 0,
 				selectedMemoIndex: 0,
+				selectedOldIndex: 0,
 				baseUrl: '',
 				token: '',
 				barcode: '',
@@ -153,6 +178,10 @@
 			    this.selectedMemoIndex = e.detail.value;
 			    this.matData.memo = this.memoOptions[e.detail.value];
 			  },
+			  onPropChangeOld(e) {
+			    this.selectedOldIndex = e.detail.value;
+			    this.matData.old = this.oldOptions[e.detail.value];
+			  },
 			getMemoOptions() {
 			  const that = this;
 			  uni.request({
@@ -169,6 +198,8 @@
 						that.batchOptions = item.memos;
 					  } else if (item.tagId === '8') {
 						that.memoOptions = item.memos;
+					  }else if (item.tagId === '9') {
+						that.oldOptions = item.memos;
 					  }
 					});
 				  } else {
@@ -567,13 +598,23 @@
 					this.messageToggle('error')
 					return;
 				}
-				if (that.matData.batch.length === 0) {
+				if (!that.matData.batch) {
 					this.messageText = "璇烽�夋嫨鏈ㄧ灏哄"
 					this.messageToggle('error')
 					return;
 				}
-				if (that.matData.memo.length === 0) {
+				if (!that.matData.memo) {
 					this.messageText = "璇烽�夋嫨鏈ㄧ澶囨敞"
+					this.messageToggle('error')
+					return;
+				}	
+				if (!that.matData.anfme || that.matData.anfme <= 0) {
+					this.messageText = "鏁伴噺蹇呭~"
+					this.messageToggle('error')
+					return;
+				}	
+				if (!that.matData.old) {
+					this.messageText = "鏈ㄧ鏂版棫蹇呭~"
 					this.messageToggle('error')
 					return;
 				}	
@@ -584,7 +625,8 @@
 						barcode: that.barcode,
 						batch: that.matData.batch,
 						memo: that.matData.memo,
-						anfme: that.matData.anfme
+						anfme: that.matData.anfme,
+						old: that.matData.old
 					}),
 					method: 'POST',
 					header: {
diff --git a/pages/pakin/delCheck.vue b/pages/pakin/delCheck.vue
index fbe6fc6..bacf357 100644
--- a/pages/pakin/delCheck.vue
+++ b/pages/pakin/delCheck.vue
@@ -154,7 +154,7 @@
 				        rolls: []
 				    };
 					
-					// console.log(lines);
+					 //console.log(lines);
 				    // 瑙f瀽鍩烘湰淇℃伅
 				    lines.forEach(line => {
 				        if (line.startsWith('鍖呰缁勫彿锛�')) t.packageGroupNo = line.split('锛�')[1].trim();
@@ -214,7 +214,7 @@
 				};
 				
 				const result = parseData(data);
-				// console.log(result);
+				/// console.log(result);
 				this.secAnalysis(result)
 				// if (this.dataList.length > 0) this.checkAdd(result)
 				// else this.dataList.push(result);

--
Gitblit v1.9.1