diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 48daaee9f..491634fc6 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -1674,7 +1674,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '企标制修订计划整改') {
+          }else if(row.taskInfo === '重新起草') {
             this.$router.push({
               name: 'qbzxdjhgkStep1',
               query: {
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
index eb413388b..f41b18984 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
@@ -786,7 +786,7 @@ export default {
         _this: this
       }, res => {
         this.workData = res.data.records;
-        this.total = res.data.total;
+        this.totalNo = res.data.total;
       }, e => {
       });
     },
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index ed5506ad4..372939517 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -275,6 +275,7 @@ export default {
   },
   data() {
     return {
+      submitFlag: '',
       toggleType: '5',
       comFlag: 1,
       active: "1",
@@ -338,7 +339,8 @@ export default {
     if(this.taskId){
       this.approvalFlag = true
       this.processTable()
-      this.getData();
+      //被驳回时调用
+      this.getHistoryData()
    }
   },
   methods: {
@@ -355,16 +357,6 @@ export default {
       }, e => {
       })
     },
-    getDatas(){
-      queryTaskFirst({
-        bpnId: this.$route.query.bpnId
-      }).then(res => {
-        let mes = JSON.parse(res.mes)
-        this.roleForm = mes.roleForm
-        this.qbfsForm = mes.qbfsForm
-        this.commentText = mes.commentText
-      });
-    },
     getData() {
       this.formLoading = true
       this.showFlag = false
@@ -375,11 +367,29 @@ export default {
         this.getFormFieldList(mes);
       });
     },
+    getHistoryData() {
+      this.submitFlag = '重新起草'
+      this.showFlag = false
+      this.formLoading = true
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.$route.query.taskIds,
+          pId: this.$route.query.prcId,
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
     /**
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
-      let type = item.qbfsForm.type
+      console.log(item);
+      let type = item.type || item.qbfsForm.type
       this.$nextTick(() => {
         switch (type){
           case '1':
@@ -398,18 +408,18 @@ export default {
             this.comName = "establish"
             break
         }
-        this.qbfsForm = item.qbfsForm;
+        this.qbfsForm = item.qbfsForm || item;
         this.formLoading = false;
-        this.roleForm.dockUser = item.roleForm.dockUser;
-        this.roleForm.dockUserName = item.roleForm.dockUserName;
-        this.roleForm.countersigner = item.roleForm.countersigner;
-        this.roleForm.countersignerName = item.roleForm.countersignerName;
-        this.roleForm.approver = item.roleForm.approver;
-        this.roleForm.approverName = item.roleForm.approverName;
-        this.roleForm.engineer = item.roleForm.engineer;
-        this.roleForm.engineerName = item.roleForm.engineerName;
-        this.roleForm.examine = item.roleForm.examine;
-        this.roleForm.examineName = item.roleForm.examineName;
+        this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
+        this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
+        this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
+        this.roleForm.countersignerName = item.countersignerName || item.roleForm.countersignerName;
+        this.roleForm.approver = item.approver ||item.roleForm.approver;
+        this.roleForm.approverName = item.approverName || item.roleForm.approverName;
+        this.roleForm.engineer = item.engineer || item.roleForm.engineer;
+        this.roleForm.engineerName = item.engineerName || item.roleForm.engineerName;
+        this.roleForm.examine = item.examine || item.roleForm.examine;
+        this.roleForm.examineName = item.examineName || item.roleForm.examineName;
       });
     },
     handleTabs(name) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 25581178b..b79b864d6 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -2184,7 +2184,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '企标制修订计划整改') {
+          }else if(row.taskInfo === '重新起草') {
             this.$router.push({
               name: 'qbzxdjhgkStep1',
               query:{