From ac0bfdcc4f5bd911e4c6010c811ca602839c00ea Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 17 十月 2025 10:15:52 +0800
Subject: [PATCH] 代码提交

---
 pages/QC/LLJ/Add.vue |   85 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/pages/QC/LLJ/Add.vue b/pages/QC/LLJ/Add.vue
index 2bd8db3..3c2e9e8 100644
--- a/pages/QC/LLJ/Add.vue
+++ b/pages/QC/LLJ/Add.vue
@@ -72,6 +72,10 @@
 	    <view class="info-label">寰�鏈熸楠屽饱鍘嗭細</view>
 	    <view class="info-value">{{formData.lvli}}</view>
 	  </view>
+	  <view class="info-block" v-if="formData.memoList!=null &&this.current" >
+	    <view class="info-label">澶囨敞锛�</view>
+	    <view class="info-value">{{formData.memoList}}</view>
+	  </view>
     </view>
     
     <!-- 鎿嶄綔鎸夐挳鍖� -->
@@ -79,6 +83,7 @@
 		<!-- <a class="sysLike"v-if="this.current" @click="toSysSubmitFrom(formData.releaseNo)">瀹為獙瀹ら�佹</a>
 		<a class="sysLike" @click="toYzxSubmitFrom(formData.releaseNo)">涓�鑷存�ф牳瀵�</a>
 		 -->
+	  <button class="secondary-btn" v-if="!this.current" @click="toYCCZFrom(formData.releaseNo)">寮傚父澶勭疆鍗�</button>
       <button class="secondary-btn" v-if="this.current" @click="toSysSubmitFrom(formData.releaseNo)">瀹為獙瀹ら�佹</button>
 	  <button class="secondary-btn" @click="toYzxSubmitFrom(formData.releaseNo)">涓�鑷存�ф牳瀵�</button>
 	  <button class="secondary-btn" v-if="this.current"  @click="getInspectionItems">鑾峰彇妫�楠岄」鐩�</button>
@@ -158,7 +163,8 @@
 		},
       tableData: [],
 	  remarksPopup: false,
-	  current:true
+	  current:true,
+	  type:""
     }
   },
   onLoad(options) {
@@ -170,6 +176,7 @@
   		this.formData.releaseNo = params["releaseNo"];
   		this.formData.lotNo = params["lotNo"];
   		this.msgId = params["msgId"];
+		this.type = params["type"];
   		
 		if(params["current"]==='A')
 		{
@@ -276,19 +283,66 @@
     		releaseNo: this.formData.releaseNo
     	}
     }).then(res => {
+	
      if (res.status==0) {
-		
-     	uni.showToast({
-     		title: res.message.toString(),
-     		icon: 'success',
-     		duration: 2000
-     	})  
-     	 // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
-     	        setTimeout(() => {
-     	            uni.navigateTo({
-     	            	url: 'List'
-     	            });
-     	        }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
+			if(res.message.toString()=='IQC鎻愪氦鎴愬姛锛佽鎻愪氦寮傚父澶勭疆鍗�'){
+				uni.showModal({
+				  title: "鎻愮ず",
+				  content: res.message.toString(),
+				  confirmText: "纭畾",
+				  cancelText: "鍙栨秷", // 濡傛灉瑕佽嚜瀹氫箟鍙栨秷鎸夐挳鏂囧瓧
+				  showCancel: true,   // 鍏佽鏄剧ず鍙栨秷鎸夐挳
+				  success: (res) => {
+					  debugger
+				    if (res.confirm) {
+				      uni.navigateTo({
+				      	url: 'IqcYcczFrom?releaseNo=' +  this.formData.releaseNo+'&userID='+this.$loginInfo.account+'&qty='+this.formData.fcovertQty
+				      });
+				    } else if (res.cancel) {
+				      // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
+				             setTimeout(() => {
+				      							if(this.type==="A"){
+				      								uni.navigateTo({
+				      									url: 'ScanCode'
+				      								});
+				      							}else{
+				      								uni.navigateTo({
+				      									url: 'List'
+				      								});
+				      							}
+				      							// uni.navigateTo({
+				      							// 	url: 'List'
+				      							// });
+				                
+				             }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
+				    }
+				  }
+				})
+
+			}else{
+				uni.showToast({
+					title: res.message.toString(),
+					icon: 'success',
+					duration: 2000
+				})  
+				 // 濡傛灉鏈夐〉闈㈣烦杞紝闇�瑕佺敤瀹氭椂鍣ㄥ欢杩�
+				        setTimeout(() => {
+							if(this.type==="A"){
+								uni.navigateTo({
+									url: 'ScanCode'
+								});
+							}else{
+								uni.navigateTo({
+									url: 'List'
+								});
+							}
+							// uni.navigateTo({
+							// 	url: 'List'
+							// });
+				           
+				        }, 2000); // 淇濇寔涓� duration 鐩稿悓鐨勬椂闀�
+			}
+     	
      	
      } else {
      	uni.showModal({
@@ -376,6 +430,11 @@
 			url: 'SysSubmitFrom?releaseNo=' + releaseNo+'&userID='+this.$loginInfo.account
 		});
 	},
+	toYCCZFrom(releaseNo){
+		uni.navigateTo({
+			url: 'IqcYcczFrom?releaseNo=' + releaseNo+'&userID='+this.$loginInfo.account+'&qty='+this.formData.fcovertQty
+		});
+	},
 	toYzxSubmitFrom(releaseNo){
 		uni.navigateTo({
 			url: 'yzxFrom?id=' +this.formData.id+'&current='+this.current

--
Gitblit v1.9.3