From 45f5166d953bf9d6cff924c1a360e4ecb411b622 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Dec 2024 16:40:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=BA=8F=E6=B7=BB=E5=8A=A0type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/process.vue      | 27 ++++++++++++++-------------
 src/views/mtm/process_form.vue | 23 +++++++++++++++++++++--
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index d84405bd..742d5137 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -39,29 +39,26 @@
 				<el-table-column
 					label="名称"
 					prop="name"
-					min-width="100"
 				></el-table-column>
 				<!-- <el-table-column label="编号" prop="code" min-width="100"></el-table-column> -->
 				<el-table-column
 					label="大类"
 					prop="cate"
-					min-width="150"
 				></el-table-column>
-				<el-table-column label="批号追加设备" min-width="60" v-if="baseCode!=='bxerp'">
+				<el-table-column
+					label="类型"
+					prop="type"
+				>
+					<template #default="scope">{{ types[scope.row.type] }}</template>
+				</el-table-column>
+				<el-table-column label="批号追加设备" v-if="baseCode!=='bxerp'">
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.batch_append_equip">
 							是
 						</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column label="是否自检" min-width="60" v-if="baseCode =='bxerp'">
-					<template #default="scope">
-						<el-tag type="success" v-if="scope.row.into_wm_mgroup">
-							是
-						</el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="交接到工段" min-width="60">
+				<el-table-column label="交接到工段">
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.into_wm_mgroup">
 							是
@@ -71,7 +68,7 @@
 						</el-icon> -->
 					</template>
 				</el-table-column>
-				<el-table-column label="不合格品是否入库" min-width="60">
+				<el-table-column label="不合格品是否入库">
 					<template #default="scope">
 						<el-tag type="success" v-if="scope.row.store_notok">
 							是
@@ -81,7 +78,7 @@
 						</el-icon> -->
 					</template>
 				</el-table-column>
-				<el-table-column label="排序" prop="sort" min-width="60">
+				<el-table-column label="排序" prop="sort">
 				</el-table-column>
 				<el-table-column
 					label="操作"
@@ -151,6 +148,10 @@ export default {
 				50: "加工工具",
 				60: "辅助工装",
 			},
+			types:{
+				'PRO_PROD':'生产工序',
+				'PRO_TEST':'检验工序',
+			},
 			baseCode :this.$TOOL.data.get('BASE_INFO').base.base_code
 		};
 	},
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index af9a1aaa..3607be03 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -22,6 +22,20 @@
 					<el-form-item label="大类">
 						<el-input v-model="form.cate" clearable></el-input>
 					</el-form-item>
+					<el-form-item label="工序类型">
+						<el-select
+							v-model="form.type"
+							placeholder="工序类型"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in processOptions"
+								:key="item.value"
+								:label="item.name"
+								:value="item.value"
+							></el-option>
+						</el-select>
+					</el-form-item>
 					<el-form-item label="所属部门" v-if="baseCode!=='bxerp'">
 						<el-select
 							v-model="form.belong_dept"
@@ -45,13 +59,13 @@
 								></el-switch>
 							</el-form-item>
 						</el-col>
-						<el-col :span="12" v-if="baseCode=='bxerp'">
+						<!-- <el-col :span="12" v-if="baseCode=='bxerp'">
 							<el-form-item label="是否自检">
 								<el-switch
 									v-model="form.into_wm_mgroup"
 								></el-switch>
 							</el-form-item>
-						</el-col>
+						</el-col> -->
 						<el-col :span="12">
 							<el-form-item label="交接到工段">
 								<el-switch
@@ -91,6 +105,7 @@
 const defaultForm = {
 	name: "",
 	cate: "",
+	type:'PRO_PROD',
 	belong_dept: "",
 	into_wm_mgroup: true,
 	store_notok: true,
@@ -114,6 +129,10 @@ export default {
 					{ required: true, message: "请输入名称", trigger: "blur" },
 				],
 			},
+			processOptions:[
+				{name:'生产工序',value:'PRO_PROD'},
+				{name:'检验工序',value:'PRO_TEST'},
+			],
 			visible: false,
 			isSaveing: false,
 			deptOptions: [],