From 413e5a8c1781e1844ecd959c88f1ce55de3e2005 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 10 Dec 2025 14:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=85=E4=B8=8B=EF=BC=9A=E5=BA=9F=E5=93=81?=
 =?UTF-8?q?=E5=BA=93=E6=9B=B4=E6=94=B9=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/inmScrap.vue | 56 ++++++++++++++++++++++----------------
 src/views/wpm_bx/index.vue |  2 ++
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/views/inm/inmScrap.vue b/src/views/inm/inmScrap.vue
index 3faff3aa..9e026aa3 100644
--- a/src/views/inm/inmScrap.vue
+++ b/src/views/inm/inmScrap.vue
@@ -2,7 +2,8 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">返工交接</el-button>
+				<el-button type="primary" v-auth="'handover.create'">清除</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="table_add(50)">改版</el-button>
 				<el-button type="primary" v-auth="'handover.create'" v-if="route_code=='scrap'" @click="table_bsofei(40,30)">合批报废</el-button>
 			</div>
 			<div class="right-panel">
@@ -26,13 +27,15 @@
 				row-key="id"
 				:params="params"
 				:query="query"
+				 @selection-change="selectionChange"
 			>
-			<el-table-column label="状态" prop="state" width="100" >
-				<template #default="scope">
-					<el-tag :type="wmState[scope.row.state]?.type">
-						{{wmState[scope.row.state]?.text}}
-						</el-tag>
-					</template>
+				<el-table-column type="selection" width="50" />
+				<el-table-column label="状态" prop="state" width="100" >
+					<template #default="scope">
+						<el-tag :type="wmState[scope.row.state]?.type">
+							{{wmState[scope.row.state]?.text}}
+							</el-tag>
+						</template>
 				</el-table-column>
 				<el-table-column
 					label="物料名称"
@@ -41,9 +44,7 @@
 				>
 					<template #default="scope">
 						{{ scope.row.material_name }}
-						<span v-if="scope.row.material_origin != null"
-							>（{{ scope.row.material_origin_name }}）</span
-						>
+						<span v-if="scope.row.material_origin != null">（{{ scope.row.material_origin_name }}）</span>
 					</template>
 				</el-table-column>
 				<el-table-column
@@ -91,6 +92,7 @@
 			:type="type"
 			:mgroupName="mgroupName"
 			:mgroupId="mgroupId"
+			:isFeiPinku="isFeiPinku"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		>
@@ -98,20 +100,27 @@
 	</el-container>
 </template>
 <script>
-import saveDialog from "../wpm_gx/handover_form.vue";
+
+import saveDialog from "../wpm_bx/handover_form.vue";
 import { wmState } from "@/utils/enum.js";
 export default {
 	components: {
 		saveDialog
 	},
+	props: {
+		isFeiPinku: {
+			type: Boolean,
+			default: false,
+		},
+	},
 	name: "wmaterial",
 	data() {
 		return {
 			wmState,
 			apiObj: null,
 			params: {
-				state : 10,
-				state_all: 1
+				state_all: 1,
+				mgroup:"",
 			},
 			dialog: {
 				save: false,
@@ -119,6 +128,7 @@ export default {
 			query:{
 				search:''
 			},
+			selectiones: [],
 			type:20,
 			mgroupName:'废品库',
 			mgroupId:'',
@@ -129,25 +139,25 @@ export default {
 		that.route_code = that.$route.path.split("/")[2];
 		if(that.route_code=='scrap'){
 			that.params.material__type = 30;
+		}else{
+			that.params.state = 50;
 		}
-		that.apiObj = that.$API.wpm.wmaterial.list;
-		that.$API.mtm.mgroup.list.req({ page: 0}).then((res) => {
-			that.mgroupOptions = res;
-			res.forEach(item=>{
-				if(item.name=="废品库"){
-					that.mgroupId = item.id;
-				}
-			})
+		that.$API.mtm.mgroup.list.req({ page: 0,name:'废品库'}).then((res) => {
+			that.mgroupId = that.params.mgroup = res[0].id;
+			that.apiObj = that.$API.wpm.wmaterial.list;
 		});
 	},
 	methods: {
-		
+		//表格选择后回调事件
+		selectionChange(selection) {
+			this.selectiones = selection;
+		},
 		//添加
 		table_add(type) {
 			this.dialog.save = true;
 			this.type = type;
 			this.$nextTick(() => {
-				this.$refs.saveDialog.open("add");
+				this.$refs.saveDialog.open("add",this.selectiones);
 			});
 		},
 		table_bsofei(type,mtype) {
diff --git a/src/views/wpm_bx/index.vue b/src/views/wpm_bx/index.vue
index ca1c55f9..f7248508 100644
--- a/src/views/wpm_bx/index.vue
+++ b/src/views/wpm_bx/index.vue
@@ -54,6 +54,7 @@
 				:mgroupName="mgroupName"
 				:mgroupId="mgroupId"
 				:deptId="mgroupDept"
+				:isFeiPinku="isFeiPinku"
 				:process = "mgroupProcess"
 				:processType = "mgroupProcessType"
 				:mgroup_code="mgroup_code"
@@ -65,6 +66,7 @@
 				:mgroupName="mgroupName"
 				:mgroupId="mgroupId"
 				:deptId="mgroupDept"
+				:isFeiPinku="isFeiPinku"
 				:process = "mgroupProcess"
 				:processType = "mgroupProcessType"
 				:mgroup_code="mgroup_code"