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

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

@@ -673,9 +673,9 @@ export default {
             })
           }
           break
-              //标准清单更新/发布流程
+        //标准清单更新/发布流程
         case'4' :
-          if (row.taskInfo === '进行会签，填写意见') {
+          if (row.taskInfo === '会签') {
             this.$router.push({
               name: 'bzqdfbStep2',
               query: {
@@ -686,7 +686,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '根据会签意见修订') {
+          } else if (row.taskInfo === '修订') {
             this.$router.push({
               name: 'bzqdfbStep3',
               query: {
@@ -697,7 +697,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '业务经理审批') {
+          }else if (row.taskInfo === '批准') {
             this.$router.push({
               name: 'bzqdfbStep4',
               query: {
@@ -1610,7 +1610,7 @@ export default {
           }
           break
         case '25':
-          if (row.taskInfo === '部门高级经理审批') {
+          if (row.taskInfo === '审核') {
             this.$router.push({
               name: 'qbzxdjhgkStep2',
               query:{
@@ -1621,7 +1621,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '部门中心主任会签') {
+          } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbzxdjhgkStep3',
               query:{
@@ -1632,7 +1632,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准法规工作组组长审定') {
+          }else if(row.taskInfo === '审定') {
             this.$router.push({
               name: 'qbzxdjhgkStep4',
               query:{
@@ -1643,7 +1643,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准法规部部长审批') {
+          }else if(row.taskInfo === '批准') {
             this.$router.push({
               name: 'qbzxdjhgkStep5',
               query:{

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">发起流程</template>
+            <template slot="proNode">起草</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准调研流程</template>
-      <template slot="proNode">工程研究总院院长审批</template>
+      <template slot="proNode"></template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准调研流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">对接人选择责任人</template>
+            <template slot="proNode">任务分发</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任人上传调研结果</template>
+            <template slot="proNode">调研结果反馈</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任对接人审批</template>
+            <template slot="proNode">调研结果审批</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">汇总调研结果</template>
+            <template slot="proNode">调研结果处理</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任人会签</template>
+            <template slot="proNode">会签</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">责任部门对接人及标准法规部部长审核</template>
+            <template slot="proNode">审核</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定</template>
+            <template slot="proNode">审定</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准调研流程</template>
-            <template slot="proNode">工程研究总院院长或标准法规主管副院长审批</template>
+            <template slot="proNode">批准</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -3,7 +3,7 @@
         <!--    标准解读流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准解读流程</template>
-            <template slot="proNode">发起流程</template>
+            <template slot="proNode">起草</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准解读流程</template>
-      <template slot="proNode">部长审批</template>
+      <template slot="proNode"></template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准征求意见流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准解读流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准征求意见流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">工程研究总院院长批准</template>
+      <template slot="proNode"></template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准征求意见流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">发起流程</template>
+      <template slot="proNode">起草</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">对接人选择责任人</template>
+      <template slot="proNode">任务分发</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">填写征求意见</template>
+            <template slot="proNode">意见反馈</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">审批人审批</template>
+            <template slot="proNode">意见审批</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">标准法规工程师分线审核</template>
+            <template slot="proNode">管理员</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">责任部门对接人汇总并选择审批人</template>
+      <template slot="proNode">意见汇总报批</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">汇总填写处理意见</template>
+      <template slot="proNode">意见处理</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">责任人会签</template>
+      <template slot="proNode">会签</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">部长及对接人审核</template>
+      <template slot="proNode">审核</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定</template>
+      <template slot="proNode">审定</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -3,7 +3,7 @@
     <!--    标准调研流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准征求意见流程</template>
-      <template slot="proNode">工程研究总院院长或标准法规主管副院长</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -921,7 +921,7 @@ export default {
           break
           //标准清单更新/发布流程
         case'4' :
-          if (row.taskInfo === '进行会签，填写意见') {
+          if (row.taskInfo === '会签') {
             this.$router.push({
               name: 'bzqdfbStep2',
               query: {
@@ -932,7 +932,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '根据会签意见修订') {
+          } else if (row.taskInfo === '修订') {
             this.$router.push({
               name: 'bzqdfbStep3',
               query: {
@@ -943,7 +943,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '业务经理审批') {
+          }else if (row.taskInfo === '批准') {
             this.$router.push({
               name: 'bzqdfbStep4',
               query: {
@@ -2124,7 +2124,7 @@ export default {
           }
           break
         case '25':
-          if (row.taskInfo === '部门高级经理审批') {
+          if (row.taskInfo === '审核') {
             this.$router.push({
               name: 'qbzxdjhgkStep2',
               query:{
@@ -2135,7 +2135,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if(row.taskInfo === '部门中心主任会签') {
+          } else if(row.taskInfo === '会签') {
             this.$router.push({
               name: 'qbzxdjhgkStep3',
               query:{
@@ -2146,7 +2146,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准法规工作组组长审定') {
+          }else if(row.taskInfo === '审定') {
             this.$router.push({
               name: 'qbzxdjhgkStep4',
               query:{
@@ -2157,7 +2157,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if(row.taskInfo === '标准法规部部长审批') {
+          }else if(row.taskInfo === '批准') {
             this.$router.push({
               name: 'qbzxdjhgkStep5',
               query:{