From 1f10184ee4731ca37e3cd256362031107b7f5ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 26 Oct 2021 16:46:45 +0800
Subject: [PATCH] commit

---
 .../pages/components/ProcessFooter.vue        | 21 +++++++++++++++
 .../processCenter/pages/newProcess/index.vue  | 12 ++++-----
 .../tabComponents/processCenter/index.vue     | 26 +++++++++++++++++++
 src/router/index.js                           | 20 +++++++++++++-
 4 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 243e6163e..c04920b05 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -111,6 +111,15 @@
         :loading="submitLoading"
         v-if="showAffirm"
       >确认</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        class="common-button-primary"
+        icon="el-icon-close"
+        @click="handleRecord"
+        :loading="recordLoading"
+        v-if="showRecord"
+      >不备案</el-button>
     </div>
 
     <!-- 组织机构树 -->
@@ -188,6 +197,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showRecord:{
+      type: Boolean,
+      default: false
+    },
     showAffirm: {
       type: Boolean,
       default: false
@@ -206,6 +219,11 @@ export default {
       type: Boolean,
       default: false
     },
+    //不备案按钮Loading
+    recordLoading:{
+      type: Boolean,
+      default: false
+    },
     // 提交按钮loading
     submitLoading: {
       type: Boolean,
@@ -285,6 +303,9 @@ export default {
     handleSubmit2() {
       this.$emit('submit2')
     },
+    handleRecord(){
+      this.$emit('record')
+    },
     handleSubmit() {
       this.$emit('submit')
     },
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index c62c8ca78..87f644d28 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -189,7 +189,7 @@
         </el-col>
         <el-col :span="size ? 6 : 8">
           <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('18')">
+            <div class="card-box" @click="handleCreateProcess('16')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
@@ -204,7 +204,7 @@
         </el-col>
         <el-col :span="size ? 6 : 8">
           <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('19')">
+            <div class="card-box" @click="handleCreateProcess('15')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
@@ -219,7 +219,7 @@
         </el-col>
         <el-col :span="size ? 6 : 8">
           <el-card shadow="hover">
-            <div class="card-box" @click="handleCreateProcess('20')">
+            <div class="card-box" @click="handleCreateProcess('14')">
               <div class="card-top">
                 <div class="card-top-left">
                   <img :src="getImg(Math.floor(Math.random() * 6))">
@@ -352,19 +352,19 @@ export default {
             name: 'zchhStep1'
           })
           break
-        case '18':
+        case '16':
           //外部署名推荐审批流程
           this.$router.push({
             name: 'wbsmStep1'
           })
           break
-        case '19':
+        case '15':
           //加入标准化协会信息提报流程
           this.$router.push({
             name: 'jrbzhxhStep1'
           })
           break
-        case '20':
+        case '14':
           //参与外部标准制修订信息提报流程
           this.$router.push({
             name: 'cywbbzzxdStep1'
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6c76b6aad..0c4a73e68 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -869,6 +869,32 @@ export default {
             })
           }
           break
+        case '15':
+          if (row.taskInfo === '备案任务下发') {
+            this.$router.push({
+              name: 'jrbzhxhStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          // else if(row.taskInfo === '标准法规部经理审批'){
+          //   this.$router.push({
+          //     name: 'xmqdqrStep3',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          // }
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index 6bdd35887..1ad0b984b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1033,6 +1033,15 @@ const routes = [
           title: '参与外部标准制修订信息提报流程'
         }
       },
+      {
+        path: '/cywbbzzxdStep2',
+        name: 'cywbbzzxdStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '参与外部标准制修订信息提报流程'
+        }
+      },
       {
         path: '/jrbzhxhStep1',
         name: 'jrbzhxhStep1',
@@ -1041,7 +1050,16 @@ const routes = [
           requireAuth: true,
           title: '加入标准化协会信息提报流程'
         }
-      }
+      },
+      {
+        path: '/jrbzhxhStep2',
+        name: 'jrbzhxhStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '加入标准化协会信息提报流程'
+        }
+      },
     ]
   },
   // 本地工具