From 299258925cf54b19b9f920c8ad95d96d347806a3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 17 Dec 2024 17:32:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20process=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/process.vue      | 11 +++++++++++
 src/views/mtm/process_form.vue | 22 +++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index 53e1658d..c6e079c1 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -51,6 +51,12 @@
 				>
 					<template #default="scope">{{ types[scope.row.type] }}</template>
 				</el-table-column>
+				<el-table-column
+					label="生产类型"
+					prop="mtype"
+				>
+					<template #default="scope">{{ mtypes[scope.row.mtype] }}</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">
@@ -152,6 +158,11 @@ export default {
 				10:'生产工序',
 				20:'检验工序',
 			},
+			mtypes:{
+				10:'常规',
+				20:'切分',
+				30:'结合'
+			},
 			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 27e8e6b8..37fc0d95 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -36,6 +36,20 @@
 							></el-option>
 						</el-select>
 					</el-form-item>
+					<el-form-item label="生产类型">
+						<el-select
+							v-model="form.mtype"
+							placeholder="生产类型"
+							style="width: 100%"
+						>
+							<el-option
+								v-for="item in mtypeOptions"
+								: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"
@@ -105,7 +119,8 @@
 const defaultForm = {
 	name: "",
 	cate: "",
-	type:'PRO_PROD',
+	type: 10,
+	mtype:10,
 	belong_dept: "",
 	into_wm_mgroup: true,
 	store_notok: true,
@@ -133,6 +148,11 @@ export default {
 				{name:'生产工序',value:10},
 				{name:'检验工序',value:20},
 			],
+			mtypeOptions:[
+				{name:'常规',value:10},
+				{name:'切分',value:20},
+				{name:'结合',value:30},
+			],
 			visible: false,
 			isSaveing: false,
 			deptOptions: [],