From ff3aa11c27ab27600f9b9a2f5ec463a6db8ff5a6 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 25 Jun 2025 15:23:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=8E=BB=E7=BA=A4=E5=88=86=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/inmIn.vue  | 30 +++++++++++++++++++++++++++---
 src/views/wpm_bx/inmOut.vue | 28 ++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/views/wpm_bx/inmIn.vue b/src/views/wpm_bx/inmIn.vue
index cb1baca6..9b2758f6 100644
--- a/src/views/wpm_bx/inmIn.vue
+++ b/src/views/wpm_bx/inmIn.vue
@@ -81,7 +81,11 @@
 					label="批次号"
 					prop="batch"
 					min-width="120"
-				></el-table-column>
+				>
+					<!-- <template #default="scope">
+						<el-link @click="rowClick(scope.row)" type="primary">{{scope.row.batch}}</el-link>
+					</template> -->
+				</el-table-column>
 				<el-table-column
 					label="部门/工段"
 					prop="belong_dept_name"
@@ -180,11 +184,21 @@
 			ref="inmRecordDialog"
 			:cate = "cate_type"
 			:process = "process"
-			:mgroupId = "params.mgroupx"
+			:mgroupId = "mgroupId"
 			:deptId = " params.belong_dept"
 			@success="handleinmSuccess"
 		>
 		</save-dialog>
+		<handover-dialog
+			v-if="dialog.handover"
+			ref="handoverDialog"
+			:type="type"
+			:mgroupName="mgroupName"
+			:mgroupId="mgroupId"
+			@success="handleScrapSuccess"
+			@closed="dialog.handover = false"
+		>
+		</handover-dialog>
 		<el-drawer v-model="wprVisibleDrawer" :size="'70%'">
 			<template #header>
 				<h4>关联产品</h4>
@@ -246,6 +260,7 @@ import checkDialog from "./check_form.vue";
 import showDrawer from "./check_drawer.vue";
 import scrapDialog from "./handover_form.vue";
 import saveDialog from "./inm_record.vue";
+import handoverDialog from "./handover_form2.vue";
 export default {
 	props: {
 		deptId: {
@@ -274,7 +289,8 @@ export default {
 		materials,
 		checkDialog,
 		showDrawer,
-		scrapDialog
+		scrapDialog,
+		handoverDialog
 	},
 	name: "wmaterial",
 	data() {
@@ -458,6 +474,14 @@ export default {
 			this.dialog.save = false;
 			this.$refs.table.refresh();
 		},
+		//分批mtype:20
+		rowClick(row){
+			this.dialog.handover = true;
+			this.type = 10;
+			this.$nextTick(() => {
+				this.$refs.handoverDialog.open("add",row,20);
+			});
+		},
 		//打印物料标签
 		printMaterial(row,type){
 			let that = this;
diff --git a/src/views/wpm_bx/inmOut.vue b/src/views/wpm_bx/inmOut.vue
index d1b70a58..81bce226 100644
--- a/src/views/wpm_bx/inmOut.vue
+++ b/src/views/wpm_bx/inmOut.vue
@@ -82,7 +82,11 @@
 					label="批次号"
 					prop="batch"
 					min-width="120"
-				></el-table-column>
+				>
+					<!-- <template #default="scope">
+						<el-link @click="rowClick(scope.row)" type="primary">{{scope.row.batch}}</el-link>
+					</template> -->
+				</el-table-column>
 				<el-table-column
 					label="部门/工段"
 					prop="belong_dept_name"
@@ -186,6 +190,16 @@
 			@success="handleinmSuccess"
 		>
 		</save-dialog>
+		<handover-dialog
+			v-if="dialog.handover"
+			ref="handoverDialog"
+			:type="type"
+			:mgroupName="mgroupName"
+			:mgroupId="mgroupId"
+			@success="handleScrapSuccess"
+			@closed="dialog.handover = false"
+		>
+		</handover-dialog>
 		<el-drawer v-model="wprVisibleDrawer" :size="'70%'">
 			<template #header>
 				<h4>关联产品</h4>
@@ -247,6 +261,7 @@ import checkDialog from "./check_form.vue";
 import showDrawer from "./check_drawer.vue";
 import scrapDialog from "./handover_form.vue";
 import saveDialog from "./inm_record.vue";
+import handoverDialog from "./handover_form2.vue";
 export default {
 	props: {
 		deptId: {
@@ -275,7 +290,8 @@ export default {
 		materials,
 		checkDialog,
 		showDrawer,
-		scrapDialog
+		scrapDialog,
+		handoverDialog
 	},
 	name: "wmaterial",
 	data() {
@@ -454,6 +470,14 @@ export default {
 			    that.wprList = res;
 			})
 		},
+		//分批mtype:20
+		rowClick(row){
+			this.dialog.handover = true;
+			this.type = 10;
+			this.$nextTick(() => {
+				this.$refs.handoverDialog.open("add",row,20);
+			});
+		},
 		//本地更新数据
 		handleSaveSuccess(data, mode) {
 			this.dialog.save = false;