From 93d207b7d473ecccac2b7884c5f9ae5a5ce607da Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 20 Dec 2024 16:51:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:testitem=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/route_show.vue   |  7 ++-
 src/views/qm/qctDetail.vue     |  1 +
 src/views/qm/testItem_form.vue | 83 ++++++++++++++++++++++++----------
 3 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/src/views/mtm/route_show.vue b/src/views/mtm/route_show.vue
index 7a372c70..e8fbdc28 100644
--- a/src/views/mtm/route_show.vue
+++ b/src/views/mtm/route_show.vue
@@ -38,9 +38,14 @@
 						</el-table-column>
 						<el-table-column label="出材率" prop="out_rate">
 						</el-table-column>
+						<el-table-column label="切分融合数量" prop="div_number">
+						</el-table-column>
 						<el-table-column label="工时" prop="hour_work">
 						</el-table-column>
-						<el-table-column label="批次校验" prop="batch_bind">
+						<el-table-column label="批次校验">
+							<template #default="scope">
+								<el-tag v-if="scope.row.batch_bind" type="success">是</el-tag>
+							</template>
 						</el-table-column>
 					</scTable>
 				</el-card>
diff --git a/src/views/qm/qctDetail.vue b/src/views/qm/qctDetail.vue
index bd80c1a5..fc5dddcc 100644
--- a/src/views/qm/qctDetail.vue
+++ b/src/views/qm/qctDetail.vue
@@ -40,6 +40,7 @@
                                     style="width:100%"
                                 >
                                     <el-table-column label="名称" prop="name"></el-table-column>
+                                    <el-table-column label="工序" prop="process_name"></el-table-column>
                                     <el-table-column label="规格" prop="specification"></el-table-column>
                                 </xtSelect>
                             </template>
diff --git a/src/views/qm/testItem_form.vue b/src/views/qm/testItem_form.vue
index 0ce3b9ce..0b0dfefe 100644
--- a/src/views/qm/testItem_form.vue
+++ b/src/views/qm/testItem_form.vue
@@ -25,6 +25,14 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="编号">
+								<el-input
+									v-model="form.number"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="字段类型">
 								<el-select
@@ -43,16 +51,20 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-					</el-row>
-					<el-row>
 						<el-col :md="12" :sm="24">
-							<el-form-item label="编号">
-								<el-input
-									v-model="form.number"
-									clearable
-								></el-input>
+							<el-form-item label="关联检测项">
+								<xtSelect
+                                    :apiObj="apiObj"
+                                    v-model="form.affects"
+                                    style="width:100%"
+									:multiple="true"
+                                >
+								<el-table-column label="名称" prop="name"></el-table-column>
+								<el-table-column label="描述" prop="description"></el-table-column>
+                                </xtSelect>
 							</el-form-item>
 						</el-col>
+						
 						<el-col :md="12" :sm="24">
 							<el-form-item label="描述">
 								<el-input
@@ -61,17 +73,6 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="检验类型">
-								<el-checkbox-group v-model="form.tags">
-									<el-checkbox 
-										v-for="item in  tagsOptions"
-										:key="item.value"
-										:label="item.name"
-										:value="item.value"/>
-								</el-checkbox-group>
-							</el-form-item>
-						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="排序">
 								<el-input-number
@@ -80,6 +81,32 @@
 								></el-input-number>
 							</el-form-item>
 						</el-col>
+						<el-col>
+							<el-form-item label="检验类型">
+								<el-checkbox-group v-model="form.tags">
+									<el-checkbox 
+										v-for="item in  tagsOptions"
+										:key="item.value"
+										:label="item.name"
+										:value="item.value"/>
+								</el-checkbox-group>
+							</el-form-item>
+						</el-col>
+						
+						<el-col :md="12" :sm="24">
+							<el-form-item label="是否只读">
+								<el-switch v-model="form.readonly"></el-switch>
+							</el-form-item>
+						</el-col>
+						<el-col v-if="form.readonly">
+							<el-form-item label="计算公式">
+								<el-input
+									v-model="form.formula"
+									clearable
+								></el-input>
+							</el-form-item>
+						</el-col>
+						
 						<el-col :span="24" v-if="mcateTagsOptions.length>0">
 							<el-form-item label="物料系列标签">
 								<el-checkbox-group v-model="form.mcate_tags">
@@ -95,7 +122,7 @@
 					<el-row v-if="form.field_type == 'select-text'||form.field_type == 'selects-text'">
 						<el-col :span="24">
 							<el-form-item label="选项">
-								<el-button icon="el-icon-circle-plus" text @click="addComponent('choices')">
+								<el-button icon="el-icon-circle-plus" text @click="addComponent">
 									添加
 								</el-button>
 							</el-form-item>
@@ -114,7 +141,7 @@
 							</el-col>
 							<el-col :md="1" :sm="2">
 								<div style="text-align: center">
-									<el-button type="danger" icon="el-icon-remove" text @click="delComponent($index,'choices')"></el-button>
+									<el-button type="danger" icon="el-icon-remove" text @click="delComponent($index)"></el-button>
 								</div>
 							</el-col>
 						</template>
@@ -137,6 +164,9 @@ const defaultForm = {
 	description: "",
 	sort: 1,
 	tags: [],
+	formula:"",
+	readonly:false,
+	affects:[],
 	mcate_tags: [],
 	choices: [""],
 };
@@ -144,6 +174,7 @@ export default {
 	emits: ["success", "closed"],
 	data() {
 		return {
+			apiObj: this.$API.qm.testitem.list,
 			loading: false,
 			mode: "add",
 			titleMap: {
@@ -152,7 +183,7 @@ export default {
 				show: "查看",
 			},
 			//表单数据
-			form: {},
+			form: Object.assign(defaultForm),
 			//验证规则
 			rules: {
 				name: [
@@ -192,16 +223,18 @@ export default {
 				}
 			});
 		},
-		addComponent(type) {
-			this.form[type].push("");
+		addComponent() {
+			this.form.choices.push("");
 		},
-		delComponent(index,type) {
-			this.form[type].splice(index, 1);
+		delComponent(index) {
+			this.form.choices.splice(index, 1);
 		},
 		//显示
 		open(mode = "add") {
 			this.mode = mode;
 			this.visible = true;
+			this.form = {};
+			Object.assign(this.form, defaultForm);
 			return this;
 		},
 		//表单注入数据