From 62b5acce3f41a79b2e14e52fafda06b0dd221b88 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 18 Apr 2025 09:29:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A4=96=E5=8D=8F=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogb_check.vue | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index af9417c5..1a80016e 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -121,7 +121,7 @@
 										:max="count_json_wx.notok_num!==null?count_json_wx.notok_num:0"
 										class="width-100"
 										controls-position="right"
-										@change="count_n_change"
+										@change="count_n_change('ok')"
 									/>
 								</el-form-item>
 							</el-col>
@@ -133,7 +133,7 @@
 										:max="count_json_wx.notok_num!==null?count_json_wx.notok_num:0"
 										class="width-100"
 										controls-position="right"
-										@change="count_n_change"
+										@change="count_n_change('not')"
 									/>
 								</el-form-item>
 							</el-col>
@@ -162,6 +162,7 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+					<!-- 不合格项（不良项）统计 -->
 					<el-row  v-if="qct_defects.length>0&&mgroupMtype==10">
 						<el-col>不良统计（最大不合格数：<span style="color:red">{{max_defect_rate}}</span>,超过0.5则整层不合格）</el-col>
 						<el-col :md="12" :sm="24" v-for="item in qct_defects" :key="item.id">
@@ -187,6 +188,7 @@
 							</el-form-item>
 						</el-col>
 					</el-row>
+					<!-- 黑化退火 -->
 					<el-divider v-if="mgroupName=='黑化'||mgroupName=='退火'"></el-divider>
 					<el-button 
 						v-if="mgroupName=='黑化'||mgroupName=='退火'" 
@@ -316,7 +318,7 @@ export default {
 				count_ok_s:null,
 				count_ok_not:null,
 				count_ok_rate:null,
-				count_canInm:false,
+				count_canInm:true,
 				count_n_ok:null,
 				count_n_not:null,
 			},
@@ -373,6 +375,11 @@ export default {
 			}
 			if(data.count_json_wx&&data.count_json_wx.ok_num){
 				this.count_json_wx = data.count_json_wx;
+				this.count_json_wx.count_canInm = true;
+				if(data.count_json_wx.ok_num!==null){
+					this.form.count_ok = data.count_json_wx.ok_num;
+					this.form.count_notok = data.count_json_wx.notok_num;
+				}
 			}else{
 				this.canWrite = true;
 				this.form.count_ok=null;
@@ -434,10 +441,16 @@ export default {
 				that.count_json_wx.count_ok_rate = (1-that.count_json_wx.count_ok_not/ that.count_json_wx.count_ok_s)*100
 			}
 		},
-		count_n_change(){
+		count_n_change(type){
 			let that = this;
-			that.form.count_ok =  that.count_json_wx.ok_num + that.count_json_wx.count_n_ok;
-			that.form.count_notok = that.count_json_wx.count_n_not;
+			if(type=='ok'){
+				that.form.count_ok =  that.count_json_wx.ok_num + that.count_json_wx.count_n_ok;
+				that.form.count_notok = that.count_json_wx.notok_num-that.count_json_wx.count_n_ok;
+			}else{
+				that.form.count_notok = that.count_json_wx.count_n_not;
+				ok_n = that.count_json_wx.notok_num-that.count_json_wx.count_n_not;
+				that.form.count_ok =  that.count_json_wx.ok_num + ok_n;
+			}
 		},
 		//添加层组
 		lineAdd(){