From 6d23a5774661182f388773d78dd421e20b782560 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 25 Apr 2025 11:32:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=85=89=E8=8A=AF=E7=8E=BB?=
 =?UTF-8?q?=E7=BA=A4=E6=A3=80=E9=AA=8C=E6=97=B6=E5=90=88=E6=A0=BCB?=
 =?UTF-8?q?=E7=B1=BB=E5=8D=95=E6=8B=8E=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_gx/mlogb_check.vue | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm_gx/mlogb_check.vue b/src/views/wpm_gx/mlogb_check.vue
index 70b605ac..af7151fc 100644
--- a/src/views/wpm_gx/mlogb_check.vue
+++ b/src/views/wpm_gx/mlogb_check.vue
@@ -142,7 +142,7 @@
 						<el-col :md="12" :sm="24">
 							<el-form-item :label="mgroupMtype==10?'合格数':'入库数'">
 								<el-input-number
-									v-model="form.count_ok"
+									v-model="form.count_ok_full"
 									:min="0"
 									:disabled="true"
 									class="width-100"
@@ -150,6 +150,17 @@
 								/>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="合格B类数量">
+								<el-input-number
+									v-model="count_ok_b"
+									:min="0"
+									class="width-100"
+									:disabled="true"
+									controls-position="right"
+								/>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="不合格数量">
 								<el-input-number
@@ -164,7 +175,7 @@
 					</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 v-if="mgroupName=='黑化'||mgroupName=='退火'">不良统计（最大不合格数：<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">
 							<el-form-item :label="item.defect_name">
 								<el-input-number
@@ -292,11 +303,13 @@ export default {
 				batch: null,
 				count_real: 0,
 				count_ok: 0,
+				count_ok_full:0,
 				count_notok: 0,
 				mlogbdefect:[],
 				mlogbindefect:[],
 				test_user_name:""
 			},
+			count_ok_b:0,
 			//验证规则
 			rules: {
 				batch: [
@@ -399,6 +412,7 @@ export default {
 			that.form.count_real =Number(data.count_real);
 			that.form.count_ok= Number(data.count_ok);
 			that.form.count_notok= Number(data.count_notok);
+			that.count_ok_b = that.form.count_ok- Number(data.count_ok_full);
 			//外协
 			if(that.mgroupMtype==20){
 				if(data.count_json_wx.ok_num&&data.count_json_wx.ok_num!==null){
@@ -433,12 +447,16 @@ export default {
 		countChange() {
 			let that = this;
 			that.form.count_notok = 0;
+			that.count_ok_b = 0;
 			that.qct_defects.forEach(item => {
 				if(item.defect_okcate==30){
 			    	that.form.count_notok += that.defectform[item.defect_name];
+				}else if(item.defect_okcate==20){
+					that.count_ok_b += that.defectform[item.defect_name];
 				}
 			})
 			that.form.count_ok = that.form.count_real - that.form.count_notok;
+			that.form.count_ok_full = that.form.count_real - that.form.count_notok-that.count_ok_b;
 		},
 		notokChanges(){
 			let that = this;