查看当前审批总流程

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -2925,5 +2925,10 @@ public class ReportController {
         }
         //TODO: 针对钉钉和微信公众号进行推送
     }
+
+    @RequestMapping("/getCurAuditNode")
+    public HttpRespMsg getCurAuditNode(String date, String userId) {
+        return reportService.getCurAuditNode(date,userId);
+    }
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ReportService.java

@@ -169,4 +169,6 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg batchDenyHisReport(Integer reportAuditLogId, String reason, HttpServletRequest request) throws Exception;
 
     HttpRespMsg exportListByState(Integer state, Integer departmentId, Integer projectId, String date, String startDate, String endDate, String userId, String auditUserId, HttpServletRequest request) throws Exception;
+
+    HttpRespMsg getCurAuditNode(String date, String userId);
 }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -10113,4 +10113,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         String fileName="待审核日报列表_"+System.currentTimeMillis();
         return excelExportService.exportGeneralExcelByTitleAndList(wxCorpInfo,dingding,fileName,dataList,path);
     }
+
+    @Override
+    public HttpRespMsg getCurAuditNode(String date, String userId) {
+        List<Report> list = reportMapper.selectList(new QueryWrapper<Report>().eq("create_date", date).eq("creator_id", userId));
+        if (list.size() == 0) {
+            return new HttpRespMsg().setError("日报已不存在");
+        }
+        return null;
+    }
 }

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -2166,7 +2166,14 @@
         <!-- 审核流程展示 -->
         <el-dialog :title="$t('title.reviewProcess')" v-if="approvalProcessDialog" :visible.sync="approvalProcessDialog" customClass="customWidth" width="400px">
             <div style="padding:20px 40px 20px 0">
-                <el-timeline :reverse="false">
+                <el-steps  :active="curAuditNode" align-center="true" finish-status="success">
+                <el-step title="员工提交"></el-step>
+                <el-step title="项目经理审核"></el-step>
+                <el-step title="公司副总审核"></el-step>
+                </el-steps>
+                <el-divider></el-divider>
+                <p style="color:#aaaaaa;">审核记录</p>
+                <el-timeline :reverse="false" style="margin-top:10px;">
                     <el-timeline-item v-for="item in approvalProcessData" :key="item.id" :timestamp="item.operateDate">
                         <!-- {{item.msg}} -->
                         <span v-if="user.userNameNeedTranslate != 1">{{item.msg}}</span>
@@ -2219,6 +2226,7 @@
         },
         data() {
             return {
+                curAuditNode: 1,
                 refreshingTime: false,
                 substitudeStep: 1,
                 showHidden: false,