commit

src/pages/home2/components/todoList/index.vue

@@ -185,7 +185,7 @@ export default {
           }
           break;
         case '3':
-          if (row.taskInfo === '责任对接人选择责任人') {
+          if (row.taskInfo === '责任部门对接人选择责任人') {
             this.$router.push({
               name: 'bzzqyjStep2',
               query: {
@@ -196,7 +196,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任人填写征求意见'){
+          } else if (row.taskInfo === '责任人反馈'){
             this.$router.push({
               name: 'bzzqyjStep3',
               query: {
@@ -207,7 +207,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任对接人审批') {
+          } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') {
             this.$router.push({
               name: 'bzzqyjStep4',
               query: {
@@ -218,7 +218,29 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') {
+          } else if (row.taskInfo === '审批人审批') {
+            this.$router.push({
+              name: 'bzzqyjStep4-1',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师分线审核') {
+            this.$router.push({
+              name: 'bzzqyjStep4-2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '标准法规工程师汇总') {
             this.$router.push({
               name: 'bzzqyjStep5',
               query: {
@@ -251,7 +273,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) {
+          } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) {
             this.$router.push({
               name: 'bzzqyjStep8',
               query: {
@@ -262,7 +284,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else {
+          } else if (row.taskInfo === '工程研究总院院长批准') {
             this.$router.push({
               name: 'bzzqyjStep9',
               query: {

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -62,7 +62,7 @@
                                         - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="标准法规工程师分线管理员" prop="spId" class="add-form-item form-item-disabled">
+                                <el-form-item label="标准法规工程师分线管理员" prop="bzfgId" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.bzfgId"
                                             style="display: none;"
@@ -400,6 +400,8 @@
                             }
                             this.isSubmit = false
                         })
+                    } else {
+                        this.$message.warning('请选择标准法规工程师分线管理员')
                     }
                 })
             },

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

@@ -585,6 +585,8 @@ export default {
             }
             this.isSubmit = false
           })
+        } else {
+          this.$message.warning('请选择审批人')
         }
       })
     },

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

@@ -573,11 +573,12 @@
             if (data.introduce) {
             } else {
               this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
-                unique: data.unique
+                unique: data.uniques
               }, {}, res => {
                 res.data.forEach(item => {
                   item.chapterNumber = item.partCode;
                   item.responUserName = item.userName;
+                  item.state = '1'
                   this.data.push(item);
                 });
               });

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -80,6 +80,12 @@
           align="center"
           width="120">
         </el-table-column>
+        <el-table-column
+                prop="chapterName"
+                align="center"
+                width="200px"
+                label="章节名称">
+        </el-table-column>
         <el-table-column
           prop="content"
           align="center"
@@ -166,6 +172,9 @@
                         :value="item.itemsNum"></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="章节名称" prop="chapterName" label-width="" class="add-form-item">
+              <el-input v-model="opinionContent.chapterName" autocomplete="off" placeholder="请输入"></el-input>
+            </el-form-item>
             <el-form-item label="修改前" prop="oldText" label-width="" class="add-form-item">
               <div v-html="opinionContent.oldText" style="margin: 56px 0 0 10px;"></div>
             </el-form-item>
@@ -260,6 +269,7 @@ export default {
       for  (let a = 0; a < this.options.length; a++) {
         if (data === this.options[a].itemsNum) {
           this.opinionContent.oldText = this.options[a].termsConditions
+          this.opinionContent.chapterName = this.options[a].itemsName
         }
       }
     },