From 8d45bc1ced357a18cbc2d77a88a73ff3a17d4c61 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 25 Jul 2024 17:00:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=BB=E8=A6=81=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8E=9F=E6=96=99=E5=92=8C=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=EF=BC=8C=E4=B8=BB=E8=A6=81=E8=BE=93=E5=87=BA=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8D=8A=E6=88=90=E5=93=81=E5=92=8C=E6=88=90=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/process.vue      | 17 +++++++++--------
 src/views/mtm/process_form.vue |  6 +++---
 src/views/mtm/route_form.vue   | 22 ++++++++++++++++------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index efc19a0b..0767b3d4 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -2,6 +2,15 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
+				<el-button
+					type="primary"
+					icon="el-icon-plus"
+					@click="table_add"
+					v-auth="'material.create'"
+					>新增</el-button
+				>
+			</div>
+			<div class="right-panel">
 				<el-input
 					style="margin-right: 5px"
 					v-model="query.search"
@@ -14,14 +23,6 @@
 					@click="handleQuery"
 				></el-button>
 			</div>
-			<div class="right-panel">
-				<el-button
-					type="primary"
-					icon="el-icon-plus"
-					@click="table_add"
-					v-auth="'material.create'"
-				></el-button>
-			</div>
 		</el-header>
 		<el-main class="nopadding">
 			<scTable
diff --git a/src/views/mtm/process_form.vue b/src/views/mtm/process_form.vue
index 3dfd7d68..84d5773a 100644
--- a/src/views/mtm/process_form.vue
+++ b/src/views/mtm/process_form.vue
@@ -80,9 +80,9 @@ export default {
 			loading: false,
 			mode: "add",
 			titleMap: {
-				add: "新增产品",
-				edit: "编辑产品",
-				show: "查看产品",
+				add: "新增工序",
+				edit: "编辑工序",
+				show: "查看工序",
 			},
 			//表单数据
 			form: defaultForm,
diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue
index 36285f93..73492851 100644
--- a/src/views/mtm/route_form.vue
+++ b/src/views/mtm/route_form.vue
@@ -75,7 +75,7 @@
 									style="width: 100%"
 								>
 									<el-option
-										v-for="item in materials"
+										v-for="item in materialsIn"
 										:key="item.id"
 										:label="item.full_name"
 										:value="item.id"
@@ -106,7 +106,7 @@
 									style="width: 100%"
 								>
 									<el-option
-										v-for="item in materials"
+										v-for="item in materialsOut"
 										:key="item.id"
 										:label="item.full_name"
 										:value="item.id"
@@ -202,7 +202,8 @@ export default {
 			},
 			visible: false,
 			isSaveing: false,
-			materials: [],
+			materialsIn: [],
+			materialsOut: [],
 			mgroups: [],
 			options: [],
 			titleMap: { add: "新增", edit: "编辑" },
@@ -212,7 +213,8 @@ export default {
 	mounted() {
 		this.getMgroup();
 		this.getProcess();
-		this.getMaterials();
+		this.getMaterialIn();
+		this.getMaterialOut();
 		this.form.routepack = this.routepack;
 	},
 	methods: {
@@ -222,12 +224,20 @@ export default {
 				this.mgroups = res;
 			});
 		},
-		getMaterials() {
+		getMaterialIn() {
+			let that = this;
+			this.$API.mtm.material.list
+				.req({ page: 0, type__in: "20,30" })
+				.then((res) => {
+					this.materialsIn = res;
+				});
+		},
+		getMaterialOut() {
 			let that = this;
 			this.$API.mtm.material.list
 				.req({ page: 0, type__in: "10,20" })
 				.then((res) => {
-					this.materials = res;
+					this.materialsOut = res;
 				});
 		},
 		getProcess() {