From 9394110a24c13814b9b8eaad46c2d8cd5bbe2407 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 14 Oct 2021 14:45:03 +0800
Subject: [PATCH] feat: There is no way the oa

---
 src/main.js                                   | 28 ++++++++++++++++++-
 .../pages/components/ProcessFooter.vue        |  4 +--
 .../pages/creatProcess/bzdy/step3.vue         |  4 +--
 .../pages/creatProcess/xmpg/step4.vue         |  4 +++
 .../pages/creatProcess/xmpg2/step6.vue        | 10 +++++--
 .../pages/creatProcess/xmqdqr/step2.vue       | 13 ++++-----
 src/router/index.js                           |  9 ++++++
 7 files changed, 57 insertions(+), 15 deletions(-)

diff --git a/src/main.js b/src/main.js
index b5ca09e3c..e61c92d04 100644
--- a/src/main.js
+++ b/src/main.js
@@ -68,6 +68,7 @@ router.beforeEach(function (to, from, next) {
     let prcNum = to.query.prcNum;
     let prcName = to.query.prcName;
     let prcType = to.query.prcType;
+    let routerType = to.query.routerType;
     let param = "taskIds=" + taskId + "&prcId=" + prcId
         + "&prcNum=" + prcNum + "&prcName=" + prcName + "&prcType=" + prcType;
     console.log(store)
@@ -162,12 +163,37 @@ router.beforeEach(function (to, from, next) {
                     }
                 } else { // 业务系统 当前节点未完成
                     // commitStatus 大于0 表示当前节点存在未完成干活流程
-                    if (isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
+                    // isNotFinished OA 系统显示接受任务 已置为已办
+                    if (routerType && routerType === 'oa' &&isNotFinished && isNotFinished > 0 && commitStatus && commitStatus > 0) {
                         if (prcType === '3') {
                             //标准征求意见 接受节点 未完成 oa已办 跳转详情页面
                             if (path === '/bzzqyjStep3') {
                                 extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
                             }
+                        }else if (prcType === '5') {
+                            if (path === '/xmpgStep4') {
+                                extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
+                            }
+                        }else if (prcType === '2') {
+                            if (path === '/bzdyStep3') {
+                                extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
+                            }
+                        }else if (prcType === '9') {
+                            if (path === '/bzjdStep3') {
+                                extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
+                            }
+                        }else if (prcType === '6') {
+                            if (path === '/xmpg2Step6') {
+                                extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
+                            }
+                        }else if (prcType === '10') {
+                            if (path === '/xmqdqrStep2') {
+                                extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
+                            }
+                        }else if (prcType === '8') {
+                            if (path === '/wfhxzgStep4') {
+                                extracted2("processAcceptDetail","prcNum=" + prcNum + "&tabsName=AlreadyProcess");
+                            }
                         }
                     } else {
                         // oa 待测 sso
diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue
index 33376f829..243e6163e 100644
--- a/src/pages/processCenter/pages/components/ProcessFooter.vue
+++ b/src/pages/processCenter/pages/components/ProcessFooter.vue
@@ -70,7 +70,7 @@
         size="mini"
         class="common-button-primary"
         @click="handleSave"
-        :loading="saveLoading"
+        :loading="submitLoading"
         v-if="showSave">
         <i class="iconfont">&#xe608;</i>
         保存
@@ -80,7 +80,7 @@
         size="small"
         class="common-button-danger"
         @click="beforeBack"
-        :loading="isSubmitBack"
+        :loading="submitLoading"
         v-if="showBack">
         <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
         {{ backBTNText }}</el-button>
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index b6b2b8062..dee9d8c5b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -183,13 +183,13 @@
             </el-table>
         </div>
         <ProcessFooter
-                show-save
+                :show-save="submitShow"
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 :show-submit="submitShow"
                 :show-confirm="acceptShow"
-                show-transfer
+                :show-transfer="submitShow"
                 @transfer="handleTransfer"
                 @save="handleSave"
                 @submit="handleSubmit"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 267cda73a..89de0012f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -230,6 +230,7 @@
                 </el-input>
                 <el-input
                    v-else
+                   :disabled="acceptShow"
                     v-model="dataList[scope.$index].complianceReasons"
                     placeholder="请输入合规原因"
                 >
@@ -256,6 +257,7 @@
                   </el-input>
                   <el-input
                       v-else
+                      :disabled="acceptShow"
                       v-model="dataList[scope.$index].noCompliance"
                       placeholder="请输入不合规项目"
                   >
@@ -277,6 +279,7 @@
                   </el-input>
                   <el-input
                       v-else
+                      :disabled="acceptShow"
                       v-model="dataList[scope.$index].countermeasures"
                       placeholder="请输入应对措施"
                   >
@@ -298,6 +301,7 @@
                   </el-date-picker>
                   <el-date-picker
                       v-else
+                      :disabled="acceptShow"
                       class="datePickLen"
                       clearable
                       v-model="dataList[scope.$index].completionTime"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 174852e93..3fff5346e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -44,7 +44,7 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
+            <el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini" @click="batchEdit">批量编辑
             </el-button>
           </div>
         </div>
@@ -142,6 +142,7 @@
                 </el-input>
                 <el-input
                     v-else
+                    :disabled="acceptShow"
                     v-model="scope.row.complianceReasons"
                     placeholder="请输入合规原因"
                 >
@@ -168,6 +169,7 @@
                   </el-input>
                   <el-input
                       v-else
+                      :disabled="acceptShow"
                       v-model="scope.row.noCompliance"
                       placeholder="请输入不合规项目"
                   >
@@ -189,6 +191,7 @@
                   </el-input>
                   <el-input
                       v-else
+                      :disabled="acceptShow"
                       v-model="scope.row.countermeasures"
                       placeholder="请输入应对措施"
                   >
@@ -210,6 +213,7 @@
                   </el-date-picker>
                   <el-date-picker
                       v-else
+                      :disabled="acceptShow"
                       class="datePickLen"
                       clearable
                       v-model="scope.row.completionTime"
@@ -422,9 +426,9 @@
       </div>
     </div>
     <ProcessFooter
-      show-save
+      :show-save="submitShow"
       show-submit
-      show-transfer
+      :show-transfer="submitShow"
       :show-submit="submitShow"
       :show-confirm="acceptShow"
       :submitLoading="isSubmit"
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
index b35cd2736..2ad37bfa7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
@@ -52,8 +52,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
+            <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
+            <el-button :disabled="acceptShow" plain class="common-button-primary" size="mini" @click="delectList">批量删除</el-button>
           </div>
         </div>
         <el-table
@@ -382,10 +382,9 @@
       </div>
     </el-drawer>
     <ProcessFooter
-      show-save
-      show-transfer
-      show-affirm
-      show-confirm
+      :show-save="submitShow"
+      :show-transfer="submitShow"
+      :show-affirm="submitShow"
       :show-submit="submitShow"
       :show-confirm="acceptShow"
       :submitLoading="isSubmit"
@@ -413,7 +412,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
+import { inboundLiaisonDetail, queryDetail, saveTaskForPub ,changeAssigneeNew, execTask} from "api/process";
 
 export default {
   name: "xmqdqrStep2",
diff --git a/src/router/index.js b/src/router/index.js
index d5a2f3b34..fcedda517 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -249,6 +249,15 @@ const routes = [
           title: '流程详情'
         }
       },
+      {
+        path: '/processAcceptDetail',
+        name: 'ProcessAcceptDetail',
+        component: () => import('@/pages/processCenter/pages/processAcceptDetail/index.vue'),
+        meta: {
+          requireAuth: true,
+          title: '流程详情'
+        }
+      },
       {
         path: '/bzffStep1',
         name: 'bzffStep1',