From 733b43786b6739fbbea447427741774f4f97b72c Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Tue, 30 Jul 2024 14:10:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mio=20=E5=A2=9E=E5=8A=A0=E5=B7=A5?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/good_mio.vue     |  3 +++
 src/views/inm/halfgood_mio.vue |  3 +++
 src/views/inm/helpso_mio.vue   |  3 +++
 src/views/inm/mainso_mio.vue   |  3 +++
 src/views/inm/mio_form.vue     | 25 +++++++++++++++++++++++++
 src/views/inm/mioitem.vue      |  2 +-
 6 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/views/inm/good_mio.vue b/src/views/inm/good_mio.vue
index 0035ee0b..b6add9b7 100644
--- a/src/views/inm/good_mio.vue
+++ b/src/views/inm/good_mio.vue
@@ -84,6 +84,9 @@
 				<el-table-column label="出/入库日期" prop="inout_date">
 				</el-table-column>
 				<el-table-column label="执行车间" prop="belong_dept_name">
+					<template #default="scope">
+						{{ scope.row.belong_dept_name }} - {{ scope.row.mgroup_name }}
+					</template>
 				</el-table-column>
 				<el-table-column label="创建人" prop="create_by_name">
 				</el-table-column>
diff --git a/src/views/inm/halfgood_mio.vue b/src/views/inm/halfgood_mio.vue
index 15146cdf..6ca9a0ac 100644
--- a/src/views/inm/halfgood_mio.vue
+++ b/src/views/inm/halfgood_mio.vue
@@ -84,6 +84,9 @@
 				<el-table-column label="出/入库日期" prop="inout_date">
 				</el-table-column>
 				<el-table-column label="执行车间" prop="belong_dept_name">
+					<template #default="scope">
+						{{ scope.row.belong_dept_name }} - {{ scope.row.mgroup_name }}
+					</template>
 				</el-table-column>
 				<el-table-column label="创建人" prop="create_by_name">
 				</el-table-column>
diff --git a/src/views/inm/helpso_mio.vue b/src/views/inm/helpso_mio.vue
index 82689009..1ca6aaa5 100644
--- a/src/views/inm/helpso_mio.vue
+++ b/src/views/inm/helpso_mio.vue
@@ -84,6 +84,9 @@
 				<el-table-column label="出/入库日期" prop="inout_date">
 				</el-table-column>
 				<el-table-column label="执行车间" prop="belong_dept_name">
+					<template #default="scope">
+						{{ scope.row.belong_dept_name }} - {{ scope.row.mgroup_name }}
+					</template>
 				</el-table-column>
 				<el-table-column label="创建人" prop="create_by_name">
 				</el-table-column>
diff --git a/src/views/inm/mainso_mio.vue b/src/views/inm/mainso_mio.vue
index 9f830db3..19fa7ef8 100644
--- a/src/views/inm/mainso_mio.vue
+++ b/src/views/inm/mainso_mio.vue
@@ -84,6 +84,9 @@
 				<el-table-column label="出/入库日期" prop="inout_date">
 				</el-table-column>
 				<el-table-column label="执行车间" prop="belong_dept_name">
+					<template #default="scope">
+						{{ scope.row.belong_dept_name }} - {{ scope.row.mgroup_name }}
+					</template>
 				</el-table-column>
 				<el-table-column label="创建人" prop="create_by_name">
 				</el-table-column>
diff --git a/src/views/inm/mio_form.vue b/src/views/inm/mio_form.vue
index 7781bdfc..3159ce77 100644
--- a/src/views/inm/mio_form.vue
+++ b/src/views/inm/mio_form.vue
@@ -112,6 +112,24 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item
+				label="工段"
+				v-if="form.type == 'do_in' || form.type == 'do_out'"
+			>
+				<el-select
+					v-model="form.mgroup"
+					clearable
+					style="width: 100%"
+					placeholder="为空时代表领料/入库到车间"
+				>
+					<el-option
+						v-for="item in mgroupOptions"
+						:key="item.id"
+						:label="item.name"
+						:value="item.id"
+					></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item
 				label="车间执行人"
 				v-if="form.type == 'do_in' || form.type == 'do_out'"
@@ -187,6 +205,7 @@ export default {
 			options: [],
 			setFiltersVisible: false,
 			deptOptions: [],
+			mgroupOptions: [],
 			userOptions: [],
 			userOption: [],
 			orderOptions: [],
@@ -208,12 +227,18 @@ export default {
 			} else if (type == "do_in" || type == "do_out") {
 				this.getDeptOptions();
 				this.getDeptUser();
+				this.getmgroupOptions();
 			} else if (type == "other_in") {
 				this.getSupplierOptions();
 			} else if (type == "other_out") {
 				this.getCustomerOptions();
 			}
 		},
+		getmgroupOptions() {
+			this.$API.mtm.mgroup.list.req({page: 0}).then(res=>{
+				this.mgroupOptions = res;
+			})
+		},
 		getSupplierOptions() {
 			this.$API.pum.supplier.list.req({ page: 0 }).then((res) => {
 				this.supplierOptions = res;
diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index bee8528b..447b4791 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -21,7 +21,7 @@
 						}}</el-descriptions-item>
 						<el-descriptions-item label="部门/车间">{{
 							mioObj.belong_dept_name
-						}}</el-descriptions-item>
+						}}-{{ mioObj.mgroup_name }}</el-descriptions-item>
 						<el-descriptions-item label="执行人">{{
 							mioObj.do_user_name
 						}}</el-descriptions-item>