Merge branch 'develop' into FOTON

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

@@ -2,7 +2,7 @@
 <template>
   <div class="link" id="link">
     <!--  此部分暂时这样写，到后面做修改    -->
-    <div style="display: inline-block;width: 10%;">
+    <div style="display: inline-block;width: 15%;">
       <span class="title borderRight">友情链接</span>
     </div>
     <div style="display: inline-block;width: 80%;text-align: center">
@@ -202,7 +202,7 @@ export default {
 
   .title {
     font-size: 15px;
-    padding-right: 40px;
+    padding-right: 8vh;
     font-weight: bold;
     padding-left: 40px;
     width: 80px;

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

@@ -224,7 +224,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
-                              @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                              @click.native="choiceZRR('directorUser', '选择业务经理', roleForm.directorUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>

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

@@ -224,7 +224,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.directorUserName" placeholder="选择业务经理"
-                              @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                              @click.native="choiceZRR('directorUser', '选择业务经理', roleForm.directorUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>

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

@@ -291,7 +291,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (row.taskInfo === '企标编写汇总修订'){
+            }else if (mes.taskInfo === '企标编写汇总修订'){
               this.$router.push({
                 name: 'bussLibrary3',
                 query: {
@@ -302,7 +302,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (row.taskInfo === '总院各中心兼职标准化员/各事业部标准化员初审'){
+            }else if (mes.taskInfo === '总院各中心兼职标准化员/各事业部标准化员初审'){
               this.$router.push({
                 name: 'bussLibrary4',
                 query: {
@@ -312,7 +312,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (row.taskInfo === '重新企标编写汇总修订'){
+            }else if (mes.taskInfo === '重新企标编写汇总修订'){
               this.$router.push({
                 name: 'bussLibraryC3',
                 query: {
@@ -409,7 +409,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (row.taskInfo === '主起草人培训'){
+            }else if (mes.taskInfo === '主起草人培训'){
               this.$router.push({
                 name: 'bussLibrary12',
                 query: {
@@ -420,7 +420,7 @@ export default {
                   prcType: row.prcType
                 }
               })
-            }else if (row.taskInfo === '标准法规部标准化工程师发布'){
+            }else if (mes.taskInfo === '标准法规部标准化工程师发布'){
               this.$router.push({
                 name: 'bussLibrary13',
                 query: {
@@ -456,7 +456,17 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (row.taskInfo === '企标编写汇总修订'){
+            }else if (mes.taskInfo === '发起企标制修订流程'){
+              this.$router.push({
+                name: 'bussLibraryProduct1',
+                query: {
+                  type: 'buss2',
+                  processName: mes.taskInfo,
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
+            }else if (mes.taskInfo === '企标编写汇总修订'){
               this.$router.push({
                 name: 'bussLibraryProduct3',
                 query: {
@@ -466,7 +476,7 @@ export default {
                   verifySarStandard: true,
                 }
               })
-            }else if (row.taskInfo === '重新企标编写汇总修订'){
+            }else if (mes.taskInfo === '重新企标编写汇总修订'){
               this.$router.push({
                 name: 'bussLibraryProductC3',
                 query: {