From 4c8959e3c4dd579c77921b4ba6c7ab40c82f7942 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 20 Jun 2024 14:39:24 +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 | 26 ++++++++++++++++------
 src/views/special-fund/add.vue             | 24 ++++++++++++++------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/src/views/expense-management/share/add.vue b/src/views/expense-management/share/add.vue
index a53b35f..c7b3465 100644
--- a/src/views/expense-management/share/add.vue
+++ b/src/views/expense-management/share/add.vue
@@ -125,14 +125,23 @@
       <el-button type="primary" @click="handleAdd" link style="font-size: 18px">添加一行</el-button>
     </div>
     <div class="approval-record">
-      <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 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&& opentionData.operationList && opentionData.operationList.length > 0&&!changeDiagram"
+            :operation-list="opentionData.operationList"
+            :state="opentionData.state"/>
+        <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
       </div>
-      <process-diagram-viewer mode="view" v-if="processDiagramViewer&&changeDiagram"/>
     </div>
     <div class="oper-page-btn">
       <el-button color="#DED0B2" v-if="routerName==='Share/add'" @click="handleSubmit(form)">提交</el-button>
@@ -156,6 +165,7 @@ import {
 } from "@/api/expense-manage";
 import {useProcessStore} from '@/stores/processStore.js';
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
+import OperationRender from '@/views/workflow/common/OperationRender.vue'
 
 const changeDiagram = ref(false)
 const rules = reactive({
@@ -172,6 +182,7 @@ const rules = reactive({
   researchDuration: [{required: true, message: '请输入研发时长', trigger: 'blur'}],
 })
 const processStore = useProcessStore()
+const opentionData = ref()
 const processInstanceData = ref()
 const processDiagramViewer = ref(false)
 const loading = ref(false)
@@ -332,6 +343,7 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       getDetailList()
       formData.value = res.data.formData
+      opentionData.value = res.data
       loading.value = false
     }
   })
diff --git a/src/views/special-fund/add.vue b/src/views/special-fund/add.vue
index 6eadf53..e83e470 100644
--- a/src/views/special-fund/add.vue
+++ b/src/views/special-fund/add.vue
@@ -27,14 +27,23 @@
       </template>
     </fvTable>
     <div class="approval-record">
-      <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 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>
-      <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>
@@ -53,6 +62,7 @@ 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()