diff --git a/src/views/wpm_gx/inm.vue b/src/views/wpm_gx/inm.vue
index abede538..c897a149 100644
--- a/src/views/wpm_gx/inm.vue
+++ b/src/views/wpm_gx/inm.vue
@@ -2,8 +2,10 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" @click="tomio('do_out')" v-auth="'mio.do'">领料</el-button>
-				<el-button type="primary" @click="batchConcat()">合批</el-button>
+				<el-button type="primary" v-auth="'mio.do'" @click="tomio('do_out')">领料</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">返修</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button>
 			</div>
 			<div class="right-panel">
 				<el-select
@@ -102,10 +104,10 @@
 					label="操作"
 					fixed="right"
 					align="center"
-					width="120"
+					width="100"
 				>
 					<template #default="scope">
-						<el-button
+						<!-- <el-button
 							link size="small"
 							@click="table_Check(scope.row)"
 							v-auth="'ftestwork.create'"
@@ -119,7 +121,7 @@
 							@click="tableCheckList(scope.row)"
 							v-if="scope.row.defect_name == null"
 							>检验记录
-						</el-button>
+						</el-button> -->
 						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
 					</template>
 				</el-table-column>
@@ -133,7 +135,8 @@
 				@choseChange="choseChange"
 			></materials>
 		</el-dialog>
-		<check-dialog
+		<!-- 检验 -->
+		<!-- <check-dialog
 			v-if="dialog.save"
 			ref="saveDialog"
 			:mgroup="mgroupId"
@@ -142,7 +145,8 @@
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
 		>
-		</check-dialog>
+		</check-dialog> -->
+		<!-- 返修/报废 -->
 		<scrap-dialog
 			v-if="dialog.scrap"
 			ref="scrapDialog"
@@ -161,6 +165,7 @@
 			@closed="visibleDrawer = false"
 		>
 		</showDrawer>
+		<!-- 领料 -->
 		<save-dialog
 			v-if="dialog.inmRecord"
 			ref="inmRecordDialog"
@@ -279,7 +284,7 @@ export default {
 		that.params.tag="todo";
 		that.$TOOL.data.set('gx_deptID',that.deptId)
 		that.apiObj = that.$API.wpm.wmaterial.list;
-		this.getMgroupInfo();
+		// this.getMgroupInfo();
 	},
 	methods: {
 		getMgroupInfo(){
@@ -301,15 +306,10 @@ export default {
 				that.$refs.table.refresh();
 			});
 		},
-		add() {
-			this.dialog.save = true;
-			this.$nextTick(() => {
-				this.$refs.saveDialog.open("add");
-			});
-		},
 		selectionChange(selection) {
 			let that = this;
 			that.selection = selection;
+			//合批
 			if(selection.length>0){
 				let material = selection[0].material;
 				selection.forEach((item)=>{
@@ -320,6 +320,7 @@ export default {
 				})
 			}
 		},
+		//分批
 		rowClick(val){
 			this.dialog.handover = true;
 			this.type = 10;
@@ -327,15 +328,8 @@ export default {
 				this.$refs.handoverDialog.open("add",val,20);
 			});
 		},
+		//合批
 		batchConcat(){
-			// let that = this;
-			// let obj = {};
-			// obj.type = 10;
-			// obj.mtype = 30;
-			// obj.handle_date = obj.send_date = that.$TOOL.dateFormat2(new Date());
-			// obj.send_mgroup = obj.recive_mgroup = that.mgroupId;
-			// let userInfo = that.$TOOL.data.get("USER_INFO");
-			// obj.send_user = obj.recive_user= userInfo.id;
 			this.changebatch = true;
 			let handoverb = [];
 			if(this.selection.length>0){
@@ -363,6 +357,7 @@ export default {
 			this.$refs.table_wm.queryData(this.queryWm);
 			this.materialsVisible = false;
 		},
+		//领料
 		tomio(type) {
 			let that = this;
 			that.cate_type=type;
@@ -387,12 +382,23 @@ export default {
 				this.$refs.showDrawer.open();
 			});
 		},
-		//添加报废
+		//添加返修/报废
 		table_add(type) {
 			this.dialog.scrap = true;
 			this.type = type;
+			let handoverb = [];
+			if(this.selection.length>0){
+				this.selection.forEach(item=>{
+					let obj = {};
+					obj.wm = item.id;
+					obj.batch = item.batch;
+					obj.count_cando = item.count_cando;
+					obj.count = item.count_cando;
+					handoverb.push(obj)
+				})
+			}
 			this.$nextTick(() => {
-				this.$refs.scrapDialog.open("add");
+				this.$refs.scrapDialog.open("add",handoverb,10);
 			});
 		},
 		handleScrapSuccess(){
diff --git a/src/views/wpm_gx/inmOut.vue b/src/views/wpm_gx/inmOut.vue
index 204b59a7..3b3ce4e2 100644
--- a/src/views/wpm_gx/inmOut.vue
+++ b/src/views/wpm_gx/inmOut.vue
@@ -2,13 +2,10 @@
 	<el-container>
 		<el-header>
 			<div class="left-panel">
-				<el-button type="primary" @click="tomio('do_in')" v-auth="'mio.do'"
-					>入库</el-button>
-				<el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">
-					返修</el-button>
-				<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">
-					报废</el-button>
-				<el-button type="primary" @click="batchConcat()">合批</el-button>
+				<el-button type="primary" v-auth="'mio.do'" @click="tomio('do_in')">入库</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="table_add(20)">返修</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="table_add(40)">报废</el-button>
+				<el-button type="primary" v-auth="'handover.create'" @click="batchConcat()">合批</el-button>
 			</div>
 			<div class="right-panel">
 				<el-select
@@ -107,10 +104,10 @@
 					label="操作"
 					fixed="right"
 					align="center"
-					width="120"
+					width="100"
 				>
 					<template #default="scope">
-						<el-button
+						<!-- <el-button
 							link size="small"
 							@click="table_Check(scope.row)"
 							v-auth="'ftestwork.create'"
@@ -118,14 +115,13 @@
 							v-if="scope.row.defect_name == null"
 							>检验
 						</el-button>
-						<!-- v-if="mgroupName!=='size'&&mgroupName!=='facade'&&scope.row.defect_name == null" -->
 						<el-button
 							link size="small"
 							type="warning"
 							@click="tableCheckList(scope.row)"
 							v-if="scope.row.defect_name == null"
 							>检验记录
-						</el-button>
+						</el-button> -->
 						<el-button @click="printMaterial(scope.row)" type="text">物料标签</el-button>
 					</template>
 				</el-table-column>
@@ -344,7 +340,7 @@ export default {
 				})
 			}
 		},
-		//添加报废
+		//添加返修/报废
 		table_add(type) {
 			this.dialog.scrap = true;
 			this.type = type;
@@ -382,6 +378,7 @@ export default {
 				this.$refs.scrapDialog.open("add",handoverb,30);
 			});
 		},
+		//报废后刷新页面
 		handleScrapSuccess(){
 			this.dialog.scrap = false;
 			this.$refs.table.refresh();