diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 0060493c..18d1a561 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -178,7 +178,7 @@
 							size="small"
 							@click="table_receive(scope.row)"
 							type="primary"
-							v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time == null"
+							v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time == null&&(scope.row.ticket == null||(scope.row.ticket_&&scope.row.ticket_.state_&&scope.row.ticket_.state_.type== 2))"
 						>接收</el-button>
 						<el-button
 							link
@@ -210,7 +210,7 @@
 							type="primary"
 							v-if="
 								(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
-								scope.row.submit_time == null&&scope.row.mtype == 10
+								scope.row.submit_time == null&&scope.row.mtype == 10&&(scope.row.ticket == null||(scope.row.ticket_&&scope.row.ticket_.state_&&scope.row.ticket_.state_.type== 1))
 							"
 							>编辑</el-button
 						>
@@ -218,7 +218,7 @@
 							title="确定删除吗？"
 							v-if="
 							(scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
-								scope.row.submit_time == null
+								scope.row.submit_time == null&&(scope.row.ticket == null||(scope.row.ticket_&&scope.row.ticket_.state_&&scope.row.ticket_.state_.type!== 0))
 							"
 							@confirm="table_del(scope.row, scope.$index)"
 						>
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index b443d227..b76b8913 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -192,9 +192,9 @@
 			</el-row>
 		</el-form>
 		<el-footer v-show="mode!=='show'">
-			<template  v-if="route_code=='tuihuo'&&type==10&&mtype==10">
+			<template  v-if="route_code=='tuihuo'&&type==10&&mtype==10&&mode=='add'">
 				<el-button
-					v-for="item in initForm.transitions"
+					v-for="item in transitions"
 					:key="item.id"
 					type="primary"
 					:loading="isSaveing"
@@ -260,6 +260,7 @@ export default {
 				recive_user: null,
 				recive_mgroup: null,
 				handoverb:[],
+				ticket:null
 			},
 			initForm:{},
 			selectObjIds:[],
@@ -267,6 +268,7 @@ export default {
 			paramsM:{},
 			selectObj:{},
 			selectObjs:[],
+			transitions:[],
 			rules: {
 				batch: [
 					{
@@ -383,10 +385,17 @@ export default {
 		//渲染工单提交按钮
 		getInit() {
 			let that = this;
-			that.$API.wf.workflow.initkey.req("	backfire").then((res) => {
-				that.initForm = res;
-				let transitions = res.transitions;
-			});
+			if(this.form.ticket!==null){
+				this.$API.wf.ticket.ticketTransitions.req(this.form.ticket).then((res) => {
+				    that.transitions = res;
+				})
+			}else{
+				that.$API.wf.workflow.initkey.req("	backfire").then((res) => {
+					that.initForm = res;
+					that.transitions = res.transitions;
+				});
+			}
+			
 		},
 		//获取工段列表
 		getMgroupOptions() {
@@ -544,11 +553,11 @@ export default {
 		//提交退火交接单信息,创建工单
 		submitTicketCreate(id) {
 			let that = this;
+			that.isSaveing = true;
 			that.form.oinfo_json = {};
 			that.form.oinfo_json.test_file = that.test_file;
 			that.$API.wpm.handover.create.req(that.form).then((res) => {
 				let ticket = {};
-				that.isSaveing = true;
 				ticket.title = '退火交接审批单';
 				ticket.workflow = that.initForm.workflow;
 				ticket.ticket_data = {t_id: res.id};
@@ -560,6 +569,8 @@ export default {
 				}).catch((e) => {
 					that.isSaveing = false;
 				});
+			}).catch((e) => {
+				that.isSaveing = false;
 			});
 		},
 		//提交