From a3f2e2c0b771daad6b1171d81baa177b991c34fc Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 26 Feb 2025 10:29:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A3=80=E9=AA=8C=E6=97=B6?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=94=B9=E6=88=90=E9=9D=9E=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=EF=BC=9B=E6=90=9C=E7=B4=A2=E6=A1=86=E5=B7=A6=E7=A7=BB=EF=BC=9B?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=97=B6=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=BC=BA=E9=99=B7=E9=A1=B9=E4=B8=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlogbw_check.vue | 34 ++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index fa1ec1ec..6a06696c 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -25,9 +25,9 @@
 				</div>
 			</el-header>
 			<el-main id="mlogbwMain">
-				<el-button type="primary" v-if="!isSubmit&&process_type=='20'" @click="check_start" style="position: absolute;top: 20px;left: 150px;">检验</el-button>
+				<el-button type="primary" v-if="!isSubmit&&process_type=='20'&&mode=='outs'" @click="check_start" style="position: absolute;top: 20px;left: 150px;">检验</el-button>
 				<el-button type="primary" v-if="multipleSet" @click="check_set" style="position: absolute;top: 20px;left: 210px;">批量操作</el-button>
-				<el-input v-if="multipleSet" v-model="wprInputText"  @change="wprinputChange" style="width:200px;position: absolute;top: 20px;right: 50px;">批量操作</el-input>
+				<el-input v-if="multipleSet" v-model="wprInputText"  @change="wprinputChange" style="width:200px;position: absolute;top: 20px;left: 308px;">批量操作</el-input>
 				<sc-form-table
 					hideDelete
 					id="mlogbwlist"
@@ -61,7 +61,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="note" :label="item.testitem_name" v-for="item in qct_testitems" :key="item.id" width="150px">
-						<template #default="scope">
+						<template #default="scope"> 
 							<el-input-number
 								v-if="item.testitem_field_type=='input-number'"
 								v-model="scope.row[item.testitem_name]"
@@ -205,7 +205,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :md="12" :sm="12" :xs="24">
-								<el-form-item label="设备" prop="equipment">
+								<el-form-item label="设备">
 									<el-select
 										v-model="form.equipment"
 										placeholder="设备"
@@ -429,6 +429,7 @@ export default {
 			},
 			defectlists:[],
 			testitemlists:[],
+			qct_defects_origin:[],
 			selectWpr:[],
 			tableHeight:500,
 			apiObjPrint:this.$API.cm.labelmat.fromWm,
@@ -455,8 +456,9 @@ export default {
 			}
 			that.$API.mtm.mgroup.item.req(that.mgroup).then((res) => {
 				that.process_type=res.process_type;
-				// console.log('res',res);
-				that.getdefects();
+				if(that.mode == 'outs'){//输入
+					that.getdefects();
+				}
 			})
 			this.visible = true;
 			setTimeout(() => {
@@ -480,6 +482,7 @@ export default {
 						obj.canEdit = that.process_type=='20'?false:true;
 						that.qct_defects.push(obj);
 					})
+					that.qct_defects_origin = that.qct_defects;
 					that.qct_testitems = [];
 					res.qct_testitems.forEach((item2) => {
 						let obj2 = Object.assign({}, item2);
@@ -499,6 +502,7 @@ export default {
 						}
 						that.qct_testitems.push(obj2);
 					})
+					that.qct_testitems_origin = that.qct_testitems;
 					that.getList();
 				})
 			}else{
@@ -515,7 +519,6 @@ export default {
 			let that = this;
 			that.options.forEach((item) => {
 				if(item.id == row.wpr){
-					// console.log('item',item);
 					let index = that.mlogbwlist.indexOf(row);
 					that.mlogbwlist[index].number = item.number;
 				}
@@ -566,9 +569,20 @@ export default {
 			obj.mlogb = row.mlogb;
 			obj.wpr = row.wpr;
 			obj.note = row.note;
+			that.qct_defects_origin.forEach(item => {
+				if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
+					let str = item.rule_expression.replace(/`/g, '');
+					str = str.replace(/\${(.*?)}/g, 'row.\$1')
+					let judge = eval(str);
+					row[item.defect_name] = judge;
+				}else{
+					row[item.defect_name] = false;
+				}
+			});
 			//qct不为空，有检验表
 			if(that.qct!==null&&that.qct!==''){
 				//检验表已经填过
+				console.log('row',row);
 				if(row.ftest!==null&&row.ftest!==undefined&&row.ftest!==''){
 					console.log('已填过');
 					obj.ftest =row.ftest;
@@ -578,7 +592,6 @@ export default {
 					row.ftest.ftestitems.forEach((item1) => {
 						item1.test_val_json = row[item1.testitem_name];
 					})
-					// console.log('obj',obj);
 				}else{//检验表未填过
 					console.log('未填过');
 					obj.ftest = {};
@@ -587,7 +600,7 @@ export default {
 					obj.ftest.qct = that.qct;
 					obj.ftest.test_date = that.handle_date!=null?that.handle_date:that.currentDate;
 					obj.ftest.test_user = that.handle_user;
-					that.qct_defects.forEach((item) => {
+					that.qct_defects_origin.forEach((item) => {
 						let itemObj = {};
 						itemObj.defect = item.defect;
 						itemObj.test_user = that.handle_user;
@@ -604,6 +617,7 @@ export default {
 					})
 				}	
 			}
+			console.log('obj',obj);
             if(row.id!==''&&row.id!==undefined&&row.id!==null){
 				obj.id = row.id;
 				that.$API.wpm.mlogbw.update.req(row.id,obj).then((res) => {
@@ -677,7 +691,7 @@ export default {
 		defectCountSun(row){
 			let that = this;
 			let index = that.mlogbwlist.indexOf(row);
-			that.qct_defects.forEach(item => {
+			that.qct_defects_origin.forEach(item => {
 				// console.log('item.rule_expression',item.rule_expression);
 				if(item.rule_expression!==''&&item.rule_expression!==undefined&&item.rule_expression!==null){
 					let str = item.rule_expression.replace(/`/g, '');