commit

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

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() {