From 21c1575ebb2c3cd01546f3f999fc9ab5e8cd4903 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 19 Jun 2024 11:23:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BD=A6=E9=97=B4=E6=89=A7=E8=A1=8C6?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog6_form.vue        | 12 +++++++++---
 src/views/wpm/mlog_dept6_detail.vue |  8 ++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm/mlog6_form.vue b/src/views/wpm/mlog6_form.vue
index 4f386cfa..9b6d656f 100644
--- a/src/views/wpm/mlog6_form.vue
+++ b/src/views/wpm/mlog6_form.vue
@@ -520,6 +520,7 @@ export default {
 		mgroup: { type: String, default: "" },
 		mtask: { type: String, default: "" },
 		handledate: { type: String, default: "" },
+		material_in: { type: String, default: "" },
 		material_out: { type: String, default: "" },
 		material_name: { type: String, default: "" },
 	},
@@ -619,15 +620,20 @@ export default {
 			});
 		},
 		getWMaterial() {
-			this.$API.wpm.wmaterial.list
-				.req({ belong_dept__name: "6车间", page: 0 })
+			let that = this;
+			that.$API.wpm.wmaterial.list
+				.req({
+					belong_dept__name: "6车间",
+					page: 0,
+					material__in: that.material__in,
+				})
 				.then((res) => {
 					if (res.length > 0) {
 						let arr = [];
 						res.forEach((item) => {
 							arr.push(item.batch);
 						});
-						this.wmaterialOptions = arr;
+						that.wmaterialOptions = arr;
 					}
 				});
 		},
diff --git a/src/views/wpm/mlog_dept6_detail.vue b/src/views/wpm/mlog_dept6_detail.vue
index 6c63ebec..d8d775b8 100644
--- a/src/views/wpm/mlog_dept6_detail.vue
+++ b/src/views/wpm/mlog_dept6_detail.vue
@@ -244,6 +244,7 @@
 			:mgroup="mgroup"
 			:handledate="handledate"
 			:material_out="material_out"
+			:material_in="material_in"
 			:material_name="material_name"
 			@success="handleSaveSuccess"
 			@closed="dialogSave = false"
@@ -291,6 +292,8 @@ export default {
 			},
 			mlogId: "",
 			handledate: "",
+			material_in: "",
+			material_out: "",
 			visible: false,
 			dialogSave: false,
 			visibleDrawer: false,
@@ -312,8 +315,9 @@ export default {
 				that.currentMtask = res;
 				this.mgroup = res.mgroup;
 				this.mtask = res.id;
-				this.material_out = res.material_out_.id;
-				this.material_name = res.material_out_.name;
+				this.material_in = res.material_in;
+				this.material_out = res.material_out;
+				this.material_name = res.material_out_name;
 				this.handledate = res.start_date;
 
 				this.params.mtask = this.mtaskId;