Merge remote-tracking branch 'origin/develop' into develop

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: {

src/pages/processCenter/pages/creatProcess/bzrk/step3.vue

@@ -1186,10 +1186,10 @@ export default {
     },
     handleSubmit() {
       this.isSubmit = true
+      this.form.submitType = this.submitType
       this.form.commentText = this.commentText
       this.form.approvalOpinion = this.approvalOpinion
       const json = JSON.stringify(this.form);
-      json.submitType = this.submitType
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId : this.userId,

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -875,10 +875,11 @@
                     :lazy=true
                     :multiple=true
                     :check-strictly=true
-                    :show-checkBox=true
                     :modalShowFlag="modalShowFlag4"
                     :drawerTitle="drawerTitle"
                     :url="url"
+                    :type="'TRUCK'"
+                    :show-checkBox="showCheckBox"
                     :urlChild="urlChild"
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                     :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
@@ -895,6 +896,7 @@
                     :drawerTitle="drawerTitle"
                     :url="url"
                     :type="'CAR'"
+                    :show-checkBox="showCheckBox"
                     :urlChild="urlChild"
                     :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
                     :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
@@ -1596,6 +1598,7 @@ export default {
       commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
+      showCheckBox: true, // 树形控件是否展示多选框
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
@@ -1988,11 +1991,19 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
       this.key3++
     },
-
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+      this.key4++
+    },
     choiceTree(type, title, id) {
       this.drawerTitle = title
       this.getListTree(this.form)
@@ -2801,10 +2812,10 @@ export default {
               if (res.ok) {
                 this.fileInfoHandle();
                 this.isSubmit = true
+                this.form.submitType = this.submitType
                 this.form.commentText = this.commentText
                 this.form.approvalOpinion = this.approvalOpinion
                 const json = JSON.stringify(this.form);
-                json.submitType = this.submitType
                 this.$http.post('lawss/activiti/completeTask', {
                   taskIds: this.taskIds,
                   userId: this.userId,
@@ -2829,10 +2840,10 @@ export default {
           } else {
             this.fileInfoHandle();
             this.isSubmit = true
+            this.form.submitType = this.submitType
             this.form.commentText = this.commentText
             this.form.approvalOpinion = this.approvalOpinion
             const json = JSON.stringify(this.form);
-            json.submitType = this.submitType
             this.$http.post('lawss/activiti/completeTask', {
               taskIds: this.taskIds,
               userId: this.userId,

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 => {
       });
     },

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

src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue

@@ -531,6 +531,7 @@ export default {
         this.$http.postData('importWkExcel/importData', _formData,{
           _this: this
         }, res => {
+          console.log(res);
           if(res.ok){
             if(res.data.length){
               this.qblx_pageData.qblxData = res.data
@@ -539,7 +540,7 @@ export default {
               this.$message.warning('请勿上传为空的文件')
             }
           }else{
-            this.$confirm(res.message, "提示", {
+            this.$confirm(res.data, "提示", {
               confirmButtonText: "确认",
               confirmButtonClass: "common-button-primary",
               cancelButtonText: "取消",

src/pages/processCenter/pages/processDetail/index.vue

@@ -38,11 +38,11 @@
       <!--  @click="handlingTasks"-->
       <!--&gt;办理任务</el-button>-->
       <!--临时屏蔽 end-->
-      <el-button
-          class="common-button-default"
-          round
-          @click="urgeRow"
-      >催办</el-button>
+<!--      <el-button-->
+<!--          class="common-button-default"-->
+<!--          round-->
+<!--          @click="urgeRow"-->
+<!--      >催办</el-button>-->
     </div>
     <div class="flow-list">
       <el-table

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:{