包名从activiti 改成 bpm

yudao-admin-ui/src/views/oa/leave/approve-hr/index.vue

@@ -53,7 +53,10 @@
           <el-step :title="stepTitle(item)" :description="stepDes(item)" v-for="(item) in handleTask.historyTask" ></el-step>
         </el-steps>
       </el-tab-pane>
-      <el-tab-pane label="流程图">流程图-TODO</el-tab-pane>
+      <el-tab-pane label="流程图">
+        <!-- TODO 云扬四海  svg 要如何展示 -->
+        流程图-TODO
+      </el-tab-pane>
     </el-tabs>
 
   </div>
@@ -61,7 +64,7 @@
 
 <script>
 import { getLeave } from "@/api/oa/leave"
-import { completeTask,taskSteps } from "@/api/oa/todo";
+import { completeTask,taskSteps, getHighlightImg } from "@/api/oa/todo";
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
 export default {
   name: "HrApproveLeave",
@@ -82,6 +85,7 @@ export default {
         approved : 1,
         variables: {},
         taskId: "",
+        processInstanceId: "",
         comment: "同意"
       },
       approvedData: [
@@ -139,6 +143,7 @@ export default {
     const businessKey = this.$route.query.businessKey;
     const taskId = this.$route.query.taskId;
     this.leaveApprove.taskId = taskId;
+    this.leaveApprove.processInstanceId = this.$route.query.processInstanceId;
     this.getForm(businessKey);
   },
   methods: {
@@ -174,8 +179,8 @@ export default {
       }
       taskSteps(data).then(response => {
         this.handleTask = response.data;
-
       });
+      getHighlightImg(this.leaveApprove.processInstanceId);
     },
     approveChange(){
       if (this.leaveApprove.approved === 1) {

yudao-admin-ui/src/views/oa/todo/index.vue

@@ -26,24 +26,6 @@
       <el-table-column label="任务Id" align="center" prop="id" />
       <el-table-column label="流程名称" align="center" prop="processName" />
       <el-table-column label="任务状态" align="center"  :formatter="statusFormat" prop="status" />
-<!--      <el-table-column label="申请人id" align="center" prop="userId" />-->
-<!--      <el-table-column label="开始时间" align="center" prop="startTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.startTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="结束时间" align="center" prop="endTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.endTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="请假类型" align="center" prop="leaveType" />-->
-<!--      <el-table-column label="原因" align="center" prop="reason" />-->
-<!--      <el-table-column label="申请时间" align="center" prop="applyTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.applyTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.status == 1"  @click="handleClaim(scope.row)">签收</el-button>
@@ -234,7 +216,8 @@ export default {
           path: path,
           query: {
             businessKey: businessKey,
-            taskId:taskId
+            taskId:taskId,
+            processInstanceId : resp.processInstanceId
           }
         }
         this.$router.replace(route);