diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 616d7e8b..1ea24832 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -7,29 +7,25 @@
 					icon="el-icon-plus"
 					@click="table_add(10)"
 					v-auth="'handover.create'"
-					>新增</el-button
-				>
+				>新增</el-button>
 				<el-button
 					type="primary"
 					icon="el-icon-plus"
 					@click="table_add(20)"
 					v-auth="'handover.create'"
 					v-if="mgroupName!=='切片'"
-					>返工</el-button
-				>
+				>返工</el-button>
 				<el-button
 					type="primary"
 					@click="printSetting"
-					>打印机</el-button
-				>
-				<el-button
-					type="primary"
-					icon="el-icon-plus"
-					@click="table_add(30)"
-					v-auth="'handover.create'"
-					v-if="mgroupName=='一次超洗'||mgroupName=='二次超洗'"
-					>检验</el-button
-				>
+				>打印机</el-button>
+				<el-input 
+					ref="codeInput"
+					v-model="codeText"
+					clearable
+					placeholder="正常交接"
+					@keyup.enter="codeTextChange(10)"
+				></el-input>
 			</div>
 			<div class="right-panel">
 				<el-select
@@ -84,8 +80,8 @@
 										<el-descriptions-item label="数量">
 											{{item.count}}
 										</el-descriptions-item>
-										<el-descriptions-item label="不合格标记" v-if="item.notok_sign_name!==null">
-											{{item.notok_sign_name}}
+										<el-descriptions-item label="不合格标记" v-if="item.defect_name!==null&&item.defect_name!==undefind">
+											{{item.defect_name}}
 										</el-descriptions-item>
 									</el-descriptions>
 								</template>
@@ -104,13 +100,13 @@
 				</el-table-column>
 				<el-table-column label="数量" prop="count" width="80"></el-table-column>
 				<el-table-column label="交接类型" prop="type" width="100">
-					<template #default="scope" v-if="mgroupName=='size'||mgroupName=='facade'">
-						<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
-						<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
-					</template>
-					<template #default="scope" v-else>
-						<el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
-						<el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
+					<template #default="scope">
+						<el-text v-if="scope.row.mtype==20" type="warning">拆批</el-text>
+						<el-text v-else-if="scope.row.mtype==30" type="warning">合批</el-text>
+						<template v-else>
+							<el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
+							<el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
+						</template>
 					</template>
 				</el-table-column>
 				<el-table-column label="交接类别" prop="type" width="80">
@@ -211,6 +207,8 @@
 		v-if="dialog.save"
 		ref="saveDialog"
 		:type="type"
+		:process = "processId"
+		:processtype = "processtype"
 		:mgroupName="mgroupName"
 		:mgroupId="mgroupId"
 		@success="handleSaveSuccess"
@@ -273,8 +271,10 @@ export default {
 			deptId:'',
 			mtask: "",
 			mlogId: "",
+			codeText:"",
 			mgroupId: "",
 			processId: "",
+			processtype:"",
 			processCate: "",
 			printer_name: "",
 			printVisible:false,
@@ -320,6 +320,7 @@ export default {
 					that.mgroupId = res[0].id;
 					that.processId = res[0].process;
 					that.processCate = res[0].process_cate;
+					that.processtype =  res[0].process_type;
 					that.params.mgroup = that.mgroupId;
 					that.apiObj = that.$API.wpm.handover.list;
 					that.$refs.table.refresh();
@@ -334,7 +335,23 @@ export default {
 			this.dialog.save = true;
 			this.type = type;
 			this.$nextTick(() => {
-				this.$refs.saveDialog.open("add");
+				this.$refs.saveDialog.open("add",'',10);
+			});
+		},
+		codeTextChange(type){
+			let that = this;
+			this.dialog.save = true;
+			this.type = type;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add",that.codeText,10);
+			});
+		},
+		codeTextChange2(type){
+			let that = this;
+			this.dialog.save = true;
+			this.type = type;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add",that.codeText);
 			});
 		},
 		//编辑