From 557c3ae1696a3a42247778a53a3805591ac11b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sun, 5 Dec 2021 10:03:36 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/qbzxdjhgk/component/rename.vue          | 1 +
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 725f7bce6..027d2d449 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -346,6 +346,7 @@ export default {
       }else if(this.selectList.length < 1){
         this.$message.warning('请至少选择一条数据进行带入')
       }else{
+        this.qbfsForm.esId = this.selectList[0].id
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafter = this.selectList[0].drafter
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index d4a9a3e8a..b3503075a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -381,7 +381,7 @@ export default {
     toggleComName(name) {
       this.comName = name;
       if(this.comName === 'merge'){
-        this.$refs["childForm"].qbfsForm = '1'
+        this.$refs["childForm"].qbfsForm.type = '1'
       }else if(this.comName === 'delay'){
         this.$refs["childForm"].qbfsForm.type = '2'
       }else if(this.comName === 'cancel'){
@@ -391,7 +391,6 @@ export default {
       }else if(this.comName === 'establish'){
         this.$refs["childForm"].qbfsForm.type = '5'
       }
-
     },
     //流程保存
     handleSave() {