From 34838c76b36c803c7618ed55d1a8b153734d097b Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 7 Aug 2024 15:58:29 +0800
Subject: [PATCH] fix:testitem

---
 src/views/enm_base/testItem.vue      | 46 ++++++++++++++++++++--------
 src/views/enm_base/testItem_form.vue | 13 ++++++--
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/views/enm_base/testItem.vue b/src/views/enm_base/testItem.vue
index 2a8a1358..90951850 100644
--- a/src/views/enm_base/testItem.vue
+++ b/src/views/enm_base/testItem.vue
@@ -35,13 +35,31 @@
 					prop="name"
 					min-width="100"
 				></el-table-column>
-				<el-table-column label="标签" prop="tags">
+				<el-table-column
+					label="字段类型"
+					prop="field_type"
+					min-width="100"
+				>
 					<template #default="scope">
-						<span v-for="item in scope.row.tags" :key="item"
-							>{{ item }}、</span
-						>
+						<span>{{ type_[scope.row.field_type] }}</span>
 					</template>
 				</el-table-column>
+				<el-table-column label="检验类型">
+					<template #default="scope">
+						<span v-for="item in scope.row.tags" :key="item"
+							>{{ tags_[item] }}、</span>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="物料系列标签"
+					prop="mcate_tags"
+					min-width="100"
+				></el-table-column>
+				<el-table-column
+					label="编号"
+					prop="number"
+					min-width="100"
+				></el-table-column>
 				<el-table-column
 					label="描述"
 					prop="description"
@@ -113,15 +131,17 @@ export default {
 				save: false,
 			},
 			query: {},
-			types_: {
-				0: "电/水/气",
-				10: "成品",
-				20: "半成品",
-				30: "主要原料",
-				40: "辅助材料",
-				50: "加工工具",
-				60: "辅助工装",
-				70: "办公用品",
+			type_: {
+				"input-int":"整数",
+				"input-number":"小数",
+				"input-text":"文本",
+				"select":"单选",
+				"selects":"多选"
+			},
+			tags_:{
+				"first":"首件检验",
+				"prod":"成品检验",
+				"performance":"性能检验"
 			},
 		};
 	},
diff --git a/src/views/enm_base/testItem_form.vue b/src/views/enm_base/testItem_form.vue
index 102dbe5f..88e56d8f 100644
--- a/src/views/enm_base/testItem_form.vue
+++ b/src/views/enm_base/testItem_form.vue
@@ -111,6 +111,14 @@
 						</template>
 					</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>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item label="描述">
 								<el-input
@@ -171,8 +179,9 @@ export default {
 			visible: false,
 			isSaveing: false,
 			options: [
-				{value:"input-number",name:"数字"},
-				{value:"input-text",name:"文字"},
+				{value:"input-int",name:"整数"},
+				{value:"input-number",name:"小数"},
+				{value:"input-text",name:"文本"},
 				{value:"select",name:"单选"},
 				{value:"selects",name:"多选"},
 			],