From c3e006bba85f8e414d06f04804cd7f2050cbcb4d Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sun, 9 Jun 2024 19:12:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E7=AD=89?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=9B=BF=E6=8D=A2=E5=88=B0=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ProjectApply.vue          | 20 +++++++++++++++----
 .../implementation/detail.vue                 | 20 +++----------------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 8ae2735..d4b1edb 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -13,8 +13,15 @@
                       @getAttachment="getAttachment"
                       @getOtherFile="getOtherFile" :showFileList="true" :formData="formData"
                       :preview="route.query.state==3"/>
+    <div v-if="route.query.state==3">
+      <baseTitle title="审批记录"></baseTitle>
+      <div class="process">
+        <operation-render v-if="processDiagramViewer" :operation-list="data.operationList"
+                          :state="data.state"/>
+      </div>
+    </div>
+    <baseTitle title="流程"></baseTitle>
     <div class="approval-record">
-      <baseTitle title="流程"></baseTitle>
       <process-diagram-viewer mode="view" idName="projectApply" v-if="processDiagramViewer"/>
     </div>
     <div class="oper-page-btn">
@@ -25,6 +32,7 @@
 </template>
 
 <script setup lang="jsx">
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElNotification} from "element-plus";
 import {getApplyProcess, projectApply, resubmitApply, getApplyDetail} from "@/api/project-manage";
@@ -42,6 +50,10 @@ const props = defineProps({
   showTable: {
     type: Boolean,
     default: false
+  },
+  data: {
+    type: Array,
+    default: []
   }
 })
 const rules = reactive({
@@ -101,7 +113,7 @@ const handleSubmit = (instance) => {
       attachment.value.allFileList.forEach(item => {
         files.push(getFileParam(item))
       })
-    }else {
+    } else {
       otherFileList.value.forEach(item => {
         files.push(getFileParam(item))
       })
@@ -131,8 +143,8 @@ const handleSubmit = (instance) => {
     let res
     if (route.query.state === '3') {
       res = await resubmitApply(params)
-    }else {
-     res = await projectApply(params)
+    } else {
+      res = await projectApply(params)
     }
     ElNotification({
       title: '提示',
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index 0c63525..b3accf0 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -13,7 +13,7 @@
       <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm"
                       :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply&&!showTabs" :formData="commonForm.formData"
+      <ApprovalDetail type="approval" v-show="showActive == '20'&&!showApply" :formData="commonForm.formData"
                       :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
                       :fileListShow="fileListShow" v-model:value="auditOpinion"/>
       <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData"
@@ -22,17 +22,7 @@
       <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
                       :processViewer="commonProvessViewer" :loading="loading" :fileListShow="fileListShow"
                       v-model:value="auditOpinion"/>
-      <project-apply v-if="showApply"/>
-      <el-tabs v-if="showTabs" v-model="activeName">
-        <el-tab-pane label="详情" name="first">
-          <ApprovalDetail type="approval" idName="applyDetail" :formData="commonForm.formData"
-                          :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"
-                          :fileListShow="fileListShow" v-model:value="auditOpinion"/>
-        </el-tab-pane>
-        <el-tab-pane label="重新提交" name="second">
-          <project-apply/>
-        </el-tab-pane>
-      </el-tabs>
+      <project-apply v-if="showApply" :data="commonForm"/>
     </template>
   </steps>
   <opinion v-if="commonForm.taskId" :formData="commonForm.formData" :taskId="commonForm.taskId"
@@ -49,9 +39,7 @@ import {ElLoading, ElNotification} from "element-plus";
 import Opinion from "@/components/DetailComponent/Opinion.vue";
 
 const route = useRoute()
-const activeName = ref('first')
 const showApply = ref(false)
-const showTabs = ref(false)
 const loading = ref(false)
 const processStore = useProcessStore()
 const fileListShow = ref('READ')
@@ -107,12 +95,10 @@ const changeModel = (active) => {
   if (route.query.state === '0' && active === '20') {
     showApply.value = true
   } else if (route.query.state === '3' && active === '20') {
-    //tab左侧详情, 右侧重新提交
-    showTabs.value = true
+    showApply.value = true
     getAllInfo(active)
   } else {
     showApply.value = false
-    showTabs.value = false
     getAllInfo(active)
   }
 }