From d0a59f7ef16414f8a72882bda4865e4c01daf626 Mon Sep 17 00:00:00 2001
From: Roland <763506525@qq.com>
Date: Sat, 6 Nov 2021 10:59:48 +0800
Subject: [PATCH] =?UTF-8?q?#=E4=BA=BA=E4=BA=8B=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/oa/leave/approve-hr/index.vue          | 12 +++++++++---
 yudao-admin-ui/src/views/oa/leave/index.vue          |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue b/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue
index 5e1468cb0..45fd4adb8 100644
--- a/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue
+++ b/yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue
@@ -54,8 +54,7 @@
         </el-steps>
       </el-tab-pane>
       <el-tab-pane label="流程图">
-        <!-- TODO 云扬四海  svg 要如何展示 -->
-        流程图-TODO
+        <div v-html="highlightSvgUrl"></div>
       </el-tab-pane>
     </el-tabs>
 
@@ -98,6 +97,7 @@ export default {
           label: '不同意'
         }
       ],
+      highlightSvgUrl: "",
       statusFormat(row, column) {
         return getDictDataLabel(DICT_TYPE.OA_LEAVE_STATUS, row.status)
       },
@@ -145,8 +145,15 @@ export default {
     this.leaveApprove.taskId = taskId;
     this.leaveApprove.processInstanceId = this.$route.query.processInstanceId;
     this.getForm(businessKey);
+    this.getHighlightImg(this.leaveApprove.processInstanceId);
   },
   methods: {
+    getHighlightImg(processInstanceId){
+      getHighlightImg(processInstanceId).then(response => {
+        console.log(response)
+        this.highlightSvgUrl = response
+      })
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["taskForm"].validate(valid => {
@@ -180,7 +187,6 @@ export default {
       taskSteps(data).then(response => {
         this.handleTask = response.data;
       });
-      getHighlightImg(this.leaveApprove.processInstanceId);
     },
     approveChange(){
       if (this.leaveApprove.approved === 1) {
diff --git a/yudao-admin-ui/src/views/oa/leave/index.vue b/yudao-admin-ui/src/views/oa/leave/index.vue
index ef9db1bc6..bb46460bc 100644
--- a/yudao-admin-ui/src/views/oa/leave/index.vue
+++ b/yudao-admin-ui/src/views/oa/leave/index.vue
@@ -358,6 +358,7 @@ export default {
     },
     /** 审批进度 */
     handleStep(row) {
+      const that = this;
       const id = row.processInstanceId;
       processHistorySteps(id).then(response => {
         this.handleTask.historyTask = response.data;