From 57f27c2b84eb7775aa5f1e985a84af5c7295fbda Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 20 Jun 2024 15:08:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E4=B8=93=E9=A1=B9?=
 =?UTF-8?q?=E8=B5=84=E9=87=91/=E8=B4=B9=E7=94=A8=E5=88=86=E6=91=8A,?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91,=E5=AE=A1=E6=89=B9=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/expense-management/share/add.vue | 11 ++++-----
 src/views/special-fund/add.vue             | 26 +++++++---------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index c7b3465..ec3dfeb 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -126,7 +126,8 @@
     </div>
     <div class="approval-record">
       <div class="approval-title">
-        <baseTitle title="审批记录"></baseTitle>
+        <baseTitle title="审批记录" v-if="processDiagramViewer&& opentionData.operationList"></baseTitle>
+        <div v-else></div>
         <div style="display: flex;align-items: center;justify-content: flex-end;">
           <div class="base-title">流程图</div>
           <el-switch
@@ -332,7 +333,7 @@ const handleResubmit = (instance) => {
   })
 }
 
-const getDetailInfo = async () => {
+const getDetailInfo =  () => {
   loading.value = true
   getAllocationDetail(route.query.id).then(res => {
     ElNotification({
@@ -399,10 +400,10 @@ const init = async () => {
 const handleBack = () => {
   history.back()
 }
-onMounted(async () => {
-  await init()
+onMounted( () => {
+   init()
   if (route.query.id) {
-    await getDetailInfo()
+     getDetailInfo()
   }
 })
 </script>
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index e83e470..ed70dab 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -27,23 +27,14 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <div class="approval-title">
-        <baseTitle title="审批记录"></baseTitle>
-        <div style="display: flex;align-items: center;justify-content: flex-end;">
-          <div class="base-title">流程图</div>
-          <el-switch
-              v-model="changeDiagram"
-              style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
-          />
-        </div>
-      </div>
-      <div class="process">
-        <operation-render
-            v-if="processDiagramViewer&& formData.operationList && formData.operationList.length > 0&&!changeDiagram"
-            :operation-list="formData.operationList"
-            :state="formData.state"/>
-        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
+      <div style="display: flex;align-items: center;justify-content: flex-end;">
+        <div class="base-title">流程图</div>
+        <el-switch
+            v-model="changeDiagram"
+            style="--el-switch-on-color: #13ce66; --el-switch-off-color:#BEA266;margin-left: 10px"
+        />
       </div>
+      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName === 'Fund/add'" @click="handleSubmit(fundForm)">提交</el-button>
@@ -55,14 +46,13 @@
 
 <script setup lang="jsx">
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
-import {ElMessageBox, ElNotification} from "element-plus";
+import {ElNotification} from "element-plus";
 import {addFund, resubmitFund, getFundDetail, getFundProcess} from "@/api/special-fund";
 import {useRouter} from "vue-router";
 import {useTagsView} from '@/stores/tagsview.js'
 import {useProcessStore} from '@/stores/processStore.js';
 import {downloadFile, deleteFile} from "@/api/project-demand";
 
-import OperationRender from '@/views/workflow/common/OperationRender.vue'
 const changeDiagram = ref(false)
 const tagsViewStore = useTagsView()
 const router = useRouter()