From 5980db9a50d0500f4809e761a61579b0390e5e54 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 19 Mar 2025 16:08:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E6=AE=B5=E7=B1=BB=E5=9E=8Bmtype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/mgroup.vue      | 12 +++++
 src/views/mtm/mgroup_form.vue | 97 ++++++++++++++++++++++-------------
 2 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/src/views/mtm/mgroup.vue b/src/views/mtm/mgroup.vue
index 89fa3c2e..68625176 100644
--- a/src/views/mtm/mgroup.vue
+++ b/src/views/mtm/mgroup.vue
@@ -50,6 +50,14 @@
 						>
 					</template>
 				</el-table-column>
+				<el-table-column
+					label="工段类型"
+					prop="mtype"
+				>
+					<template #default="scope">
+						<span>{{ mtype_[scope.row.mtype] }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="所属部门"
 					prop="belong_dept_name"
@@ -148,6 +156,10 @@ export default {
 				section: "工序",
 				other: "其他",
 			},
+			mtype_: {
+				10: "自产",
+				20: "外协",
+			},
 			baseCode :this.$TOOL.data.get('BASE_INFO').base.base_code,
 			menuType:this.$TOOL.data.get('BASE_INFO').base.base_menucate,
 		};
diff --git a/src/views/mtm/mgroup_form.vue b/src/views/mtm/mgroup_form.vue
index da25385b..845e5e45 100644
--- a/src/views/mtm/mgroup_form.vue
+++ b/src/views/mtm/mgroup_form.vue
@@ -1,46 +1,67 @@
 <template>
   <el-dialog :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
     <el-container v-loading="loading">
-      <el-main style="padding: 0 20px 20px 20px">
+      <el-main style="padding: 0 0 20px 0">
         <el-form ref="dialogForm" :model="form" :rules="rules" label-position="right" label-width="80px"
           style="padding: 0 10px;">
-          <el-form-item label="名称" prop="name">
-            <el-input v-model="form.name" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="标识" v-if="menuType=='dynamic'">
-            <el-input v-model="form.code" clearable></el-input>
-          </el-form-item>
-          <el-form-item label="工序" prop="process">
-            <el-select v-model="form.process" placeholder="工序" clearable style="width: 100%;">
-              <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select>
-          </el-form-item>
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="form.name" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="标识" v-if="menuType=='dynamic'">
+                <el-input v-model="form.code" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="工序" prop="process">
+                <el-select v-model="form.process" placeholder="工序" clearable class="width-100">
+                  <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="工段类型" prop="mtype">
+                <el-select v-model="form.mtype" placeholder="工段类型" class="width-100">
+                  <el-option v-for="item in typeOptions" :key="item.value" :label="item.name" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="所属部门">
+                <el-cascader
+                  v-model="form.belong_dept"
+                  :options="group"
+                  :props="groupsProps"
+                  clearable
+                  :show-all-levels="false"
+                  class="width-100"
+                  @change="deptChange"
+                >
+                </el-cascader>
+                <!-- <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%;">
+                  <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select> -->
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="排班规则">
+                <el-select v-model="form.shift_rule" class="width-100">
+                  <el-option v-for="item in shiftOptions" :key="item" :label="item" :value="item"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="排序">
+                <el-input-number v-model="form.sort" :min="1" class="width-100"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <!-- <el-form-item label="能源监测" prop="need_enm">
             <el-switch v-model="form.need_enm"></el-switch>
           </el-form-item> -->
-          <el-form-item label="所属部门">
-            <el-cascader
-              v-model="form.belong_dept"
-              :options="group"
-              :props="groupsProps"
-              clearable
-              :show-all-levels="false"
-              style="width: 100%"
-              @change="deptChange"
-            >
-            </el-cascader>
-            <!-- <el-select v-model="form.belong_dept" placeholder="所属部门" clearable style="width: 100%;">
-              <el-option v-for="item in group" :key="item.id" :label="item.name" :value="item.id"></el-option>
-            </el-select> -->
-          </el-form-item>
-          <el-form-item label="排班规则">
-            <el-select v-model="form.shift_rule" style="width: 100%">
-              <el-option v-for="item in shiftOptions" :key="item" :label="item" :value="item"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="排序">
-            <el-input-number v-model="form.sort" :min="1" />
-          </el-form-item>
         </el-form>
         <sc-form-table v-if="baseCode!=='bxerp'" ref="table" v-model="materialList" :addTemplate="addTemplate" placeholder="暂无数据">
           <el-table-column prop="type" label="输入物料" min-width="120" align="center">
@@ -85,6 +106,7 @@
 import {genTree} from "@/utils/verificate";
 const defaultForm = {
   name: "",
+  mtype:10,
   process: '',
   cate: 'photon',
   belong_dept: '',
@@ -103,6 +125,7 @@ export default {
       },
       //表单数据
       form: {
+        mtype:10,
         shift_rule: ''
       },
       //验证规则
@@ -120,6 +143,10 @@ export default {
       visible: false,
       isSaveing: false,
       shiftOptions: [],
+      typeOptions:[
+        {value:10,name:'自产'},
+        {value:20,name:'外协'},
+      ],
       options: [],
       group: [],
       routes: [],