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

src/pages/localTool/standContrast/pages/seeDatalis.vue

@@ -182,6 +182,7 @@ export default {
     },
     page () {
       this.spinShow = true
+      // this.$http.get('lawss/sarItemsCompareHis/page', {
       this.$http.get('lawss/sarStandItemsCompareHis/page', {
         page: this.splitInfoPage,
         pageSize: this.splitInfoPageSize,

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -363,6 +363,8 @@
           department: '',
           responUserName: '',
           state: '',
+          source: '',
+          id: '',
         },
         itermsConditionsFlag: false,
         itermsConditionsTitle: '',
@@ -454,6 +456,7 @@
             this.data[a].newText = this.editForm.newText
             this.data[a].reason = this.editForm.reason
             this.data[a].cause = this.editForm.cause
+            this.$set(this.data, a, this.editForm);
           }
         }
         this.modalshowflag2 = false
@@ -473,7 +476,9 @@
           cause: row.cause,
           department: row.department,
           responUserName: row.responUserName,
-          state: row.state
+          state: row.state,
+          source: row.source,
+          id: row.id,
         }
       },
       itermsConditionsClose () {
@@ -592,6 +597,7 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
+            console.log(data);
             this.commentText5 = data.commentText5 || ''
             this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
             this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] )

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -760,7 +760,7 @@ export default {
           }
           break;
         case '3':
-          if (row.taskInfo === '责任部门对接人选择责任人') {
+          if (row.taskInfo === '任务分发') {
             this.$router.push({
               name: 'bzzqyjStep2',
               query: {
@@ -771,7 +771,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任人反馈'){
+          } else if (row.taskInfo === '意见反馈'){
             this.$router.push({
               name: 'bzzqyjStep3',
               query: {
@@ -782,7 +782,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') {
+          } else if (row.taskInfo === '意见汇总报批') {
             this.$router.push({
               name: 'bzzqyjStep4',
               query: {
@@ -793,7 +793,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '审批人审批') {
+          } else if (row.taskInfo === '意见审批（经理、研发副总裁）') {
             this.$router.push({
               name: 'bzzqyjStep4-1',
               query: {
@@ -804,7 +804,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规工程师分线审核') {
+          } else if (row.taskInfo === '管理员（起草节点一个人）') {
             this.$router.push({
               name: 'bzzqyjStep4-2',
               query: {
@@ -815,7 +815,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规工程师汇总') {
+          } else if (row.taskInfo === '意见处理') {
           this.$router.push({
             name: 'bzzqyjStep5',
             query: {
@@ -826,7 +826,7 @@ export default {
               prcType: row.prcType
             }
           })
-        } else if (row.taskInfo === '责任人会签') {
+        } else if (row.taskInfo === '会签（选择会签人部长）') {
             this.$router.push({
               name: 'bzzqyjStep6',
               query: {
@@ -837,7 +837,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '部长+对接人审核') {
+          } else if (row.taskInfo === '审核（李部、会签人部长）') {
             this.$router.push({
               name: 'bzzqyjStep7',
               query: {
@@ -848,7 +848,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) {
+          } else if (row.taskInfo === '审定（阚主任、技术委员会相关专委会主任/研究总院职能部门领导）' ) {
             this.$router.push({
               name: 'bzzqyjStep8',
               query: {
@@ -859,7 +859,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '工程研究总院院长批准') {
+          } else if (row.taskInfo === '批准（工程研究总院院长批准、标准法规主管副院长）') {
             this.$router.push({
               name: 'bzzqyjStep9',
               query: {

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -573,7 +573,6 @@
                                 :data="standSystemOptions"
                                 show-checkbox
                                 node-key="id"
-                                default-expand-all
                                 check-strictly
                                 :default-checked-keys="TXJGList"
                                 :props="defaultProps">
@@ -729,6 +728,10 @@
                 this.TXJGmodal = false
             },
             TXJGenterDrawer () {
+                if (this.$refs.TXJGTree.getCheckedNodes().length > 1) {
+                    this.$message.warning('仅能选择一个体系结构')
+                    return;
+                }
                 let list = this.$refs.TXJGTree.getCheckedNodes()
                 let id = ''
                 let name = ''