From a592652f3b2f820a8a783eefe4f8a74d5665aef0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 30 三月 2026 17:19:10 +0800
Subject: [PATCH] 取样单调整 生产领料检验单调整

---
 manifest.json                                                                |    4 ++--
 pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue |   16 ++++++++++------
 pages/shengchanlingliao/PPickingCheckBill.vue                                |    2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6f90726..0b9116a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "3.009",
-    "versionCode" : 309,
+    "versionName" : "3.011",
+    "versionCode" : 311,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
index 125c2a5..2848eb5 100644
--- a/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
+++ b/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -191,7 +191,7 @@
 					HProcID: 0,
 					HQty: '',
 					HSampleDamageQty: 0,
-					TestType: 'first',
+					TestType: '棣栨',
 					HBadNote: '',
 					HDeptName: getUserInfo().HDeptName,
 					HDeptID: getUserInfo().HDeptID,
@@ -615,11 +615,11 @@
 						if (code == 1) {
 							this.HBarCode = ''
 							let data1 = data.h_v_Sc_ProcessExchangeBillList
-							this.hform = Object.assign(this.hform, {
+							Object.assign(this.hform, {
 								"HMaterID": data1[0].HMaterID, //浜у搧ID
 								"HMaterCode": data1[0].浜у搧浠g爜, //浜у搧浠g爜
 								"HMaterName": data1[0].浜у搧, //浜у搧鍚嶇О
-								"HMaterSpec": data1[0].瑙勬牸鍨嬪彿, //浜у搧瑙勬牸
+								"HMaterSpec": data1[0].瑙勬牸鍨嬪彿.replace(/["]/g, "'"), //浜у搧瑙勬牸
 								"HUnitID": data1[0].HUnitID, //璁¢噺鍗曚綅id
 								"HUnitName": data1[0].鍗曚綅, //璁¢噺鍗曚綅
 								"HMainSourceBillNo": data1[0].鍗曟嵁鍙�, //婧愬崟鍗曞彿
@@ -633,8 +633,9 @@
 								"HICMOBillNo": data1[0].浠诲姟鍗曞彿, //鐢熶骇璁㈠崟
 								"HDeptID": data1[0].HWorkShopID, //杞﹂棿ID
 								"HDeptName": data1[0].鐢熶骇杞﹂棿, //杞﹂棿
-
+                                "HSampleDamageQty": data1[0]["HSampleDamageQty"] || 0
 							})
+                            
 							if (data1 && data1.length === 1) {
 								// 鑾峰彇宸ュ簭ID
 								let procId = data1[0].HProcID
@@ -664,19 +665,22 @@
 				})
 			},
 			submit() {
+                console.log('this.hform: ',this.hform);
 				if (this.hform.HProcID == 0) {
 					return uni.showToast({
 						icon: 'none',
 						title: this.$t('QC_TakeSampleCheckBill.noProcess') == 'QC_TakeSampleCheckBill.noProcess' ? '宸ュ簭娌℃湁閫夋嫨' : this.$t('QC_TakeSampleCheckBill.noProcess')
 					})
 				}
-				if (this.hform.HQty == '') {
+				if (this.hform.HQty === '') {
 					return uni.showToast({
 						icon: 'none',
 						title: this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty') == 'QC_TakeSampleCheckBill.sampleQtyEmpty' ? '鍙栨牱鏁伴噺涓嶈兘涓虹┖' : this.$t('QC_TakeSampleCheckBill.sampleQtyEmpty')
 					})
 				}
-				if (this.hform.HSampleDamageQty == '') {
+                console.log('this.hform.HSampleDamageQty: ',this.hform.HSampleDamageQty);
+                console.log('this.hform.HSampleDamageQty: ',this.hform.HSampleDamageQty == '');
+				if (this.hform.HSampleDamageQty === "") {
 					return uni.showToast({
 						icon: 'none',
 						title: this.$t('QC_TakeSampleCheckBill.damageQtyEmpty') == 'QC_TakeSampleCheckBill.damageQtyEmpty' ? '鐮村潖鎬у疄楠屾暟閲忎笉鑳戒负绌�' : this.$t('QC_TakeSampleCheckBill.damageQtyEmpty')
diff --git a/pages/shengchanlingliao/PPickingCheckBill.vue b/pages/shengchanlingliao/PPickingCheckBill.vue
index 8933b95..247ebf3 100644
--- a/pages/shengchanlingliao/PPickingCheckBill.vue
+++ b/pages/shengchanlingliao/PPickingCheckBill.vue
@@ -93,7 +93,7 @@
                 </label>
             </view>
             <view v-if="tabs == 2">
-                <view class="list" v-for="(item,index) in Materlist" :key="index" @tap.stop="delMater(item)">
+                <view class="list" v-for="(item,index) in Materlist" :key="index" @tap="delMater(item)" @click="delMater(item)">
                     <uni-card :title="item.鐗╂枡鍚嶇О" :extra="'鏁伴噺:'+item.鏁伴噺" style="margin: 10px;">
                         <view class="card-detail">
                             <view class="detail">

--
Gitblit v1.9.1