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

src/main.js

@@ -204,11 +204,7 @@ router.beforeEach(function (to, from, next) {
                     }
                 } else if (prcType === '6') {
                     //标准项目合规评估 项目维度
-                    if (path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2") {
+                  extracted("xmpgStep1-5");
-                        extracted("xmpg2Step1-2");
-                    } else {
-                        extracted("xmpg2Step1-12");
-                    }
                 } else if (prcType === '8') {
                     // 未符合项整改
                     extracted("wfhxzgStep5-1");

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

@@ -666,6 +666,11 @@ export default {
           _this: this
         }, res => {
           this.listForm.breakdownList = res.data;
+          this.listForm.breakdownList.map(item =>{
+            if(item.termsConditions){
+              item.termsConditions = ''
+            }
+          })
         });
     },
     //标准的多选框改变
@@ -827,7 +832,6 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes);
-        console.log(mes);
         if(mes.form.projectNumber){
           this.addShow = false
         }

src/pages/processCenter/pages/creatProcess/xmpg/step2.vue

@@ -334,6 +334,8 @@ export default {
                 key: item.standId,
                 id: item.id,
                 standId: item.id,
+                // standType: item.standType,
+                // zrbm: item.zrbm,
                 itemsNum: item.itemsNum,
                 itemsName: item.itemsName,
                 xcxssrq: item.xcxssrq,

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

@@ -772,11 +772,11 @@ export default {
           this.dataList = dataListChildren;
           this.total = this.dataList.length;
         } else {
-          this.listForm = item.form;
-          this.commentText = item.commentText;
           let dataChildren = [];
           let dataListChildren = [];
-          this.dataList = item.dataList;
+          this.listForm = item.form
+          this.commentText = item.commentText
+          this.dataList = item.form.dataList;
           this.dataList.forEach(item =>{
             if(item.children){
               item.children.forEach(items =>{
@@ -795,9 +795,6 @@ export default {
               }
             })
           })
-          this.listForm.dataList.forEach(item => {
-            dataChildren.push(item.children);
-          });
           dataChildren.forEach((item, index) => {
             dataListChildren = dataListChildren.concat(item);
           });
@@ -808,9 +805,8 @@ export default {
           if(index > -1){
             dataListChildren.splice(index, 1)
           }
+          this.dataList = dataListChildren;
           this.total = this.dataList.length;
-          // this.dataList = item.form.dataList[0].children;
-          // this.total = item.form.dataList[0].children.length;
         }
 
       });