From 557f02072fa311eefe3123aa44afebac22adc465 Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期五, 24 四月 2026 17:24:43 +0800
Subject: [PATCH] 4-24

---
 项目代码/PDA/pages/Inbound/InboundBoxing_New.vue |   70 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 12 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundBoxing_New.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundBoxing_New.vue"
index 942d55d..aefbfbb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundBoxing_New.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundBoxing_New.vue"
@@ -55,9 +55,9 @@
 				  </u-td>
 				</u-tr>
 				<u-tr>
-					<u-td width="30%">鍘傚</u-td>
+					<u-td width="30%">杞存壙鍝佺墝</u-td>
 					<u-td>
-						<u-input v-model="madeUnit" :border="true" :disabled="true"  placeholder="鑷姩鑾峰彇鍘傚" />
+						<u-input v-model="madeUnit" :border="true" :disabled="true"  placeholder="鑷姩鑾峰彇杞存壙鍝佺墝" />
 					</u-td>
 				</u-tr>
 				
@@ -74,15 +74,29 @@
 					
 				</u-tr>
 				<u-tr>
-					<u-td width="30%">杞存壙鍗曞彿</u-td>
+					<u-td width="30%">杞存壙鎵规鍙�</u-td>
 					<u-td>
-						<u-input v-model="LotNumber" :border="true"  placeholder="杞存壙鍗曞彿" />
+						<u-input v-model="LotNumber" :border="true"  placeholder="杞存壙鎵规鍙�" />
 					</u-td>
 				</u-tr>
 				<u-tr>
-					<u-td width="30%">鐢熶骇鏃ユ湡</u-td>
+					<u-td width="30%">杞存壙閲嶉噺</u-td>
+					<u-td>
+						<u-input v-model="Standard_value" :border="true"  placeholder="杞存壙閲嶉噺" />
+					</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td width="30%">鐢熶骇/妫�淇� 鏃ユ湡</u-td>
 					<u-td>
 						<u-input v-model="ProductDate" :border="true" :focus="prdateFocus" placeholder="鐢熶骇鏃ユ湡" />
+					</u-td>
+				</u-tr>
+				<u-tr>
+					<u-td width="30%">浜у湴</u-td>
+					<u-td>
+						<xfl-select :key="PlaceoforiginKey" :list="PlaceoforiginArray" :initValue="PlaceoforiginValue" :clearable="false" @change="PlaceoforiginChange"
+							ref="StateSelect">
+						</xfl-select>
 					</u-td>
 				</u-tr>
 			</u-table>
@@ -107,6 +121,9 @@
 			return {
 				stateKey: 0, // 鏂板锛氭帶鍒剁粍浠堕噸寤� 銆愯酱鎵跨被鍒��
 				stateInitValue: '璇烽�夋嫨', // 鍒濆鍊硷紝鍚庣画鍔ㄦ�佷慨鏀广�愯酱鎵跨被鍒��
+				
+				PlaceoforiginKey: 0, // 鏂板锛氭帶鍒剁粍浠堕噸寤� 銆愪骇鍦般��
+				PlaceoforiginValue: '璇烽�夋嫨', // 鍒濆鍊硷紝鍚庣画鍔ㄦ�佷慨鏀广�愪骇鍦般��
 				
 				bearingSelectKey: 0, // 淇濈暀key浣滀负鍙屼繚闄� 銆愯酱鎵垮瀷鍙枫��
 				stateInitValueBearingModel:'璇烽�夋嫨', //銆愯酱鎵垮瀷鍙枫��
@@ -144,7 +161,16 @@
 					},{
 						label: 'R1',
 						value: '妫�淇�'
-					}]
+					}],
+				PlaceoforiginArray: [{
+						label: '鍥戒骇',
+						value: '鍥戒骇'
+					},{
+						label: '杩涘彛',
+						value: '杩涘彛'
+					}],
+				Standard_value:'', // 绉伴噸鏍囧噯鍊�
+				Placeoforigin:'', // 浜у湴(鍥戒骇/杩涘彛)
 			} 
 		},
 		methods: {
@@ -153,6 +179,7 @@
 				// 1. 鎷垮埌鍘熷鐨勭被JSON瀛楃涓诧紙濡傦細{'杞存壙鏉$爜':'1','杞﹀瀷':'2',...}锛�
 				if(_this.value_qrcode.length > 60){
 					const rawStr = _this.value_qrcode;
+					console.log(_this.value_qrcode.length)
 					// 2. 淇鏍煎紡锛堝崟寮曞彿鈫掑弻寮曞彿 + 鍒犲熬閫楀彿锛�
 					const fixedStr = rawStr.replace(/'/g, '"').replace(/,\s*}/, '}');
 					console.log(fixedStr)
@@ -163,11 +190,14 @@
 					console.log(temp_dict['杞存壙鏉$爜']); // 杈撳嚭锛�1锛堜笉鍐嶆槸undefined锛�
 					
 					_this.value_qrcode = temp_dict['杞存壙鏉$爜']; 
-					_this.madeUnit = temp_dict["鍘傚"]
-					_this.LotNumber = temp_dict["杞存壙鍗曞彿"]
+					_this.madeUnit = temp_dict["杞存壙鍝佺墝"]
+					_this.LotNumber = temp_dict["杞存壙鎵规鍙�"]
+					_this.Standard_value = temp_dict["杞存壙閲嶉噺"]
+					_this.ProductDate = temp_dict["鏃ユ湡"] 
 					_this.Bearing_Category(temp_dict["杞存壙绫诲埆"])
 					_this.BearingModel(temp_dict["杞存壙鍨嬪彿"])
 					_this.Carmodel(temp_dict["杞﹀瀷"])
+					_this.PlaceoforiginMethod(temp_dict["浜у湴"])
 				}
 			},
 			Bearing_Category (type_name){ 
@@ -189,6 +219,11 @@
 				_this.bearingSelectKey += 1;
 				_this.stateInitValueBearingModel = type_name;
 				_this.materielType = type_name;
+			},
+			PlaceoforiginMethod(type_name){ // 浜у湴
+				_this.PlaceoforiginKey += 1;
+				_this.PlaceoforiginValue = type_name;
+				_this.Placeoforigin = type_name;
 			},
 			UserChange(value) {
 			
@@ -270,7 +305,7 @@
 			BearingModelss(value){
 				console.log("閫夋嫨鐨勮酱鎵垮瀷鍙锋槸",value.orignItem)
 				// 杩欓噷璧嬪�煎巶瀹�
-				_this.templists.forEach(x => { // 鍏抽敭锛歠orEach 灏忓啓e
+				_this.templists.forEach(x => { // 鍏抽敭锛歠orEach 灏忓啓
 					if(value.orignItem == x.materiel_zc_id_list){
 						_this.madeUnit = x.materiel_zc_name_list
 						_this.materielType = value.orignItem
@@ -279,6 +314,9 @@
 			},
 			StateChange(value) { // 閫夋嫨杞存壙绫诲埆
 				_this.NewOrOld = value.orignItem.label;
+			},
+			PlaceoforiginChange(value) { // 閫夋嫨浜у湴(鍥戒骇/杩涘彛)
+				_this.Placeoforigin = value.orignItem.label;
 			},
 			setTimer() {
 				if (this.timer == null) {
@@ -311,7 +349,9 @@
 						materielType: _this.materielType,
 						NewOrOld: _this.NewOrOld,
 						LotNumber: _this.LotNumber,
-						ProductDate: _this.ProductDate
+						ProductDate: _this.ProductDate,
+						Standard_value: _this.Standard_value,
+						Placeoforigin: _this.Placeoforigin,
 					},
 				};
 				console.log("鏈�鍚庢彁浜ょ殑缁勭洏淇℃伅",data)
@@ -328,6 +368,9 @@
 					});
 					return;
 				}
+				if(_this.Standard_value == '' || _this.Standard_value == 0 || _this.Standard_value == "0"){
+					_this.Standard_value = '0'
+				}
 				if (_this.value_rfid.length > 6) {
 					uni.showToast({
 						title: "鎵樼洏闀垮害涓嶈兘澶т簬6浣嶆暟銆�",
@@ -336,7 +379,7 @@
 					});
 					return;
 				}
-				_this.LotNumber = '111111';
+				//_this.LotNumber = '111111';
 				uni.showModal({
 					title: '鎻愮ず',
 					content: '鏄惁纭缁勭洏?',
@@ -351,7 +394,9 @@
 									materielType: _this.materielType,
 									NewOrOld: _this.NewOrOld,
 									LotNumber: _this.LotNumber,
-									ProductDate: _this.ProductDate
+									ProductDate: _this.ProductDate,
+									Standard_value: _this.Standard_value,
+									Placeoforigin: _this.Placeoforigin,
 								},
 							};
 							console.log("鏈�鍚庢彁浜ょ殑缁勭洏淇℃伅",data)
@@ -365,6 +410,7 @@
 									});
 									_this.value_rfid = "";
 									_this.value_qrcode = "";
+									_this.Standard_value = "";
 									_this.initInfo();
 									_this.rfidFocus = true;
 									

--
Gitblit v1.9.3