From 5b676f7c4b05f273559bb6e2e45e182520576360 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 29 Nov 2024 17:42:37 +0800
Subject: [PATCH] fix:coding#656

---
 src/views/wpm/mlog_dept10.vue | 27 ++++++++++++++++++++++++++-
 src/views/wpm/mlog_dept6.vue  | 31 +++++++++++++++++++++++++++++++
 src/views/wpm/mlog_dept7.vue  | 27 ++++++++++++++++++++++++++-
 3 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index eb34c02c..769ed5f0 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -424,7 +424,13 @@
 					<el-container>
 						<el-header>
 							<div class="left-panel">
-								<span style="font-size: 14px">交接记录</span>
+								<span style="font-size: 14px;margin-right: 10px;">交接记录</span>
+								<el-button
+									type="primary"
+									@click="addHandover"
+									v-auth="'handover.create'"
+								>新增
+								</el-button>
 							</div>
 							<div class="right-panel">
 								<el-input
@@ -644,6 +650,14 @@
 				<el-button @click="addMtaskInfoVisible = false">取消</el-button>
 			</el-footer>
 		</el-dialog>
+		<handover-dialog
+			v-if="dialogHandover"
+			ref="handoverDialog"
+			:mgroup="mgroup"
+			:dept="currentDept.id"
+			@success="handleHandoverSuccess"
+			@closed="dialogHandover = false">
+		</handover-dialog>
 		<el-dialog title="选择物料" v-model="materialsVisible" width="90%">
 			<materials
 				style="height: 500px"
@@ -656,6 +670,7 @@
 </template>
 
 <script>
+import handoverDialog from "./handover_form.vue";
 import saveDialog from "./worktask_form.vue";
 import showDrawer from "./mlog_drawer.vue";
 import materials from "./../mtm/materials.vue";
@@ -664,6 +679,7 @@ export default {
 		saveDialog,
 		showDrawer,
 		materials,
+		handoverDialog
 	},
 	data() {
 		return {
@@ -708,6 +724,7 @@ export default {
 			material_model: "",
 			queryMtaskState: false,
 			materialsVisible: false,
+			dialogHandover:false,
 		};
 	},
 	mounted() {
@@ -934,6 +951,14 @@ export default {
 					this.mlogHandleLoading = false;
 				});
 		},
+		//从生产日志生成交接记录
+		addHandover() {
+			this.dialogHandover = true;
+			this.$nextTick(() => {
+				this.$refs.handoverDialog.open('add');
+			})
+		},
+		handleHandoverSuccess(){},
 	},
 };
 </script>
diff --git a/src/views/wpm/mlog_dept6.vue b/src/views/wpm/mlog_dept6.vue
index 7ef78094..adb4fd13 100644
--- a/src/views/wpm/mlog_dept6.vue
+++ b/src/views/wpm/mlog_dept6.vue
@@ -158,6 +158,12 @@
 						<el-header>
 							<div class="left-panel">
 								<span style="font-size: 14px">交接记录</span>
+								<el-button
+									type="primary"
+									@click="addHandover"
+									v-auth="'handover.create'"
+								>新增
+								</el-button>
 							</div>
 							<div class="right-panel">
 								<el-input
@@ -347,15 +353,24 @@
 			@choseChange="choseChange"
 		></materials>
 	</el-dialog>
+	<handover-dialog
+			v-if="dialogHandover"
+			ref="handoverDialog"
+			:dept="currentDeptId"
+			@success="handleHandoverSuccess"
+			@closed="dialogHandover = false">
+		</handover-dialog>
 </template>
 
 <script>
+import handoverDialog from "./handover_form.vue";
 import showDrawer from "./mlog_dept6_detail.vue";
 import materials from "./../mtm/materials.vue";
 export default {
 	components: {
 		showDrawer,
 		materials,
+		handoverDialog
 	},
 	data() {
 		return {
@@ -405,17 +420,26 @@ export default {
 			queryMtask: {
 				state__in: "",
 			},
+			currentDeptId:'',
 			mtaskId: "",
 			dataWm: [],
 			dataWmOrigin: [],
 			materialType: "wm",
 			visibleDrawer: false,
+			dialogHandover:false,
 		};
 	},
 	mounted() {
 		let NowDate = new Date();
 		// this.queryMtask.start_date = NowDate.getFullYear() + '-' + (NowDate.getMonth() + 1) + '-' + NowDate.getDate();
 		this.apiObj = this.$API.pm.mtask.list;
+		this.$API.system.dept.list.req({ page: 0, name: "6车间" }).then((res) => {
+			if (res.length > 0) {
+				this.currentDeptId = res[0].id;
+			} else {
+				this.$message.error("未找到车间");
+			}
+		});
 	},
 	methods: {
 		tomio() {
@@ -505,6 +529,13 @@ export default {
 				})
 				.catch((err) => {});
 		},
+		//从生产日志生成交接记录
+		addHandover() {
+			this.dialogHandover = true;
+			this.$nextTick(() => {
+				this.$refs.handoverDialog.open('add');
+			})
+		},
 	},
 };
 </script>
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index 50ff3296..2c9bb9eb 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -394,7 +394,13 @@
 					<el-container>
 						<el-header>
 							<div class="left-panel">
-								<span style="font-size: 14px">交接记录</span>
+								<span style="font-size: 14px;margin-right: 10px">交接记录</span>
+								<el-button
+									type="primary"
+									@click="addHandover"
+									v-auth="'handover.create'"
+								>新增
+								</el-button>
 							</div>
 							<div class="right-panel">
 								<el-input
@@ -584,6 +590,14 @@
 			@closed="dialogSave = false"
 		>
 		</save-dialog>
+		<handover-dialog
+			v-if="dialogHandover"
+			ref="handoverDialog"
+			:mgroup="mgroup"
+			:dept="currentDept.id"
+			@success="handleHandoverSuccess"
+			@closed="dialogHandover = false">
+		</handover-dialog>
 		<showDrawer
 			ref="showDrawer"
 			v-if="visibleDrawer"
@@ -602,11 +616,13 @@
 	</el-container>
 </template>
 <script>
+import handoverDialog from "./handover_form.vue";
 import saveDialog from "./worktask_form.vue";
 import showDrawer from "./mlog_drawer.vue";
 import materials from "./../mtm/materials.vue";
 export default {
 	components: {
+		handoverDialog,
 		saveDialog,
 		showDrawer,
 		materials,
@@ -627,6 +643,7 @@ export default {
 				34: "已终止",
 				40: "已提交",
 			},
+			dialogHandover:false,
 			dialogSave: false,
 			visibleDrawer: false,
 			queryMtaskState: false,
@@ -819,6 +836,7 @@ export default {
 		handleSaveSuccess() {
 			this.getMlogs();
 		},
+		handleHandoverSuccess(){},
 		table_show(row) {
 			this.mlogId = row.id;
 			this.visibleDrawer = true;
@@ -840,6 +858,13 @@ export default {
 					this.mlogHandleLoading = false;
 				});
 		},
+		//从生产日志生成交接记录
+		addHandover() {
+			this.dialogHandover = true;
+			this.$nextTick(() => {
+				this.$refs.handoverDialog.open('add');
+			})
+		},
 	},
 };
 </script>