wq

ruoyi-server/src/main/java/com/ruoyi/server/expenselog/controller/ProjectExpenseLogController.java

@@ -0,0 +1,137 @@
+package com.ruoyi.server.expenselog.controller;
+
+import java.util.Date;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.server.expenselog.domain.ProjectExpenseLog;
+import com.ruoyi.server.expenselog.service.IProjectExpenseLogService;
+import com.ruoyi.server.report.domain.ProjectExpenseReport;
+import com.ruoyi.server.report.service.IProjectExpenseReportService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 费用报销审批记录Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+@RestController
+@RequestMapping("/expenselog/expenselog")
+public class ProjectExpenseLogController extends BaseController
+{
+    @Autowired
+    private IProjectExpenseLogService projectExpenseLogService;
+
+    @Autowired
+    private IProjectExpenseReportService projectExpenseReportService;
+
+    /**
+     * 查询费用报销审批记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ProjectExpenseLog projectExpenseLog)
+    {
+        startPage();
+        List<ProjectExpenseLog> list = projectExpenseLogService.selectProjectExpenseLogList(projectExpenseLog);
+        return getDataTable(list);
+    }
+    /**
+     * 查询费用报销审批记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:list')")
+    @GetMapping("/alllist")
+    public AjaxResult alllist(ProjectExpenseLog projectExpenseLog)
+    {
+        List<ProjectExpenseLog> list = projectExpenseLogService.selectProjectExpenseLogList(projectExpenseLog);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出费用报销审批记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:export')")
+    @Log(title = "费用报销审批记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProjectExpenseLog projectExpenseLog)
+    {
+        List<ProjectExpenseLog> list = projectExpenseLogService.selectProjectExpenseLogList(projectExpenseLog);
+        ExcelUtil<ProjectExpenseLog> util = new ExcelUtil<ProjectExpenseLog>(ProjectExpenseLog.class);
+        util.exportExcel(response, list, "费用报销审批记录数据");
+    }
+
+    /**
+     * 获取费用报销审批记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(projectExpenseLogService.selectProjectExpenseLogById(id));
+    }
+
+    /**
+     * 新增费用报销审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:add')")
+    @Log(title = "费用报销审批记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ProjectExpenseLog projectExpenseLog)
+    {
+        ProjectExpenseReport projectExpenseReport = new ProjectExpenseReport();
+        projectExpenseReport.setId(projectExpenseLog.getExpenseId());
+        projectExpenseReport.setReportStatus(projectExpenseLog.getReportStatus());
+        if("3".equals(projectExpenseLog.getReportStatus())){
+            projectExpenseReport.setRejectionReason(projectExpenseLog.getRejectionReason());
+            projectExpenseReport.setRejectionTime(new Date());
+        }
+        projectExpenseReportService.updateProjectExpenseReport(projectExpenseReport);
+        return toAjax(projectExpenseLogService.insertProjectExpenseLog(projectExpenseLog));
+    }
+
+    /**
+     * 修改费用报销审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:edit')")
+    @Log(title = "费用报销审批记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProjectExpenseLog projectExpenseLog)
+    {
+        ProjectExpenseReport projectExpenseReport = new ProjectExpenseReport();
+        projectExpenseReport.setId(projectExpenseLog.getExpenseId());
+        projectExpenseReport.setReportStatus(projectExpenseLog.getReportStatus());
+        if("3".equals(projectExpenseLog.getReportStatus())){
+            projectExpenseReport.setRejectionReason(projectExpenseLog.getRejectionReason());
+            projectExpenseReport.setRejectionTime(new Date());
+        }
+        projectExpenseReportService.updateProjectExpenseReport(projectExpenseReport);
+        return toAjax(projectExpenseLogService.updateProjectExpenseLog(projectExpenseLog));
+    }
+
+    /**
+     * 删除费用报销审批记录
+     */
+    @PreAuthorize("@ss.hasPermi('expenselog:expenselog:remove')")
+    @Log(title = "费用报销审批记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(projectExpenseLogService.deleteProjectExpenseLogByIds(ids));
+    }
+}

ruoyi-server/src/main/java/com/ruoyi/server/expenselog/domain/ProjectExpenseLog.java

@@ -0,0 +1,143 @@
+package com.ruoyi.server.expenselog.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 费用报销审批记录对象 project_expense_log
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+public class ProjectExpenseLog extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 关联报销记录 */
+    @Excel(name = "关联报销记录")
+    private String expenseId;
+
+    /** 关联报销名称 */
+    @Excel(name = "关联报销名称")
+    private String expenseName;
+
+    /** 状态(1：审批中  2：已通过  3：已驳回) */
+    @Excel(name = "状态(1：审批中  2：已通过  3：已驳回)")
+    private String reportStatus;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String reviewerId;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime;
+
+    /** 驳回原因（如果被驳回，可以再次申请） */
+    @Excel(name = "驳回原因", readConverterExp = "如=果被驳回，可以再次申请")
+    private String rejectionReason;
+
+    /** 删除标志（0代表存在 1代表删除） */
+    @Excel(name = "删除标志", readConverterExp = "0=代表存在,1=代表删除")
+    private String status;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setExpenseId(String expenseId)
+    {
+        this.expenseId = expenseId;
+    }
+
+    public String getExpenseId()
+    {
+        return expenseId;
+    }
+    public void setExpenseName(String expenseName)
+    {
+        this.expenseName = expenseName;
+    }
+
+    public String getExpenseName()
+    {
+        return expenseName;
+    }
+    public void setReportStatus(String reportStatus)
+    {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getReportStatus()
+    {
+        return reportStatus;
+    }
+    public void setReviewerId(String reviewerId)
+    {
+        this.reviewerId = reviewerId;
+    }
+
+    public String getReviewerId()
+    {
+        return reviewerId;
+    }
+    public void setReviewTime(Date reviewTime)
+    {
+        this.reviewTime = reviewTime;
+    }
+
+    public Date getReviewTime()
+    {
+        return reviewTime;
+    }
+    public void setRejectionReason(String rejectionReason)
+    {
+        this.rejectionReason = rejectionReason;
+    }
+
+    public String getRejectionReason()
+    {
+        return rejectionReason;
+    }
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("expenseId", getExpenseId())
+            .append("expenseName", getExpenseName())
+            .append("reportStatus", getReportStatus())
+            .append("reviewerId", getReviewerId())
+            .append("reviewTime", getReviewTime())
+            .append("rejectionReason", getRejectionReason())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("status", getStatus())
+            .toString();
+    }
+}

ruoyi-server/src/main/java/com/ruoyi/server/expenselog/mapper/ProjectExpenseLogMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.server.expenselog.mapper;
+
+import com.ruoyi.server.expenselog.domain.ProjectExpenseLog;
+
+import java.util.List;
+
+/**
+ * 费用报销审批记录Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+public interface ProjectExpenseLogMapper
+{
+    /**
+     * 查询费用报销审批记录
+     *
+     * @param id 费用报销审批记录主键
+     * @return 费用报销审批记录
+     */
+    public ProjectExpenseLog selectProjectExpenseLogById(String id);
+
+    /**
+     * 查询费用报销审批记录列表
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 费用报销审批记录集合
+     */
+    public List<ProjectExpenseLog> selectProjectExpenseLogList(ProjectExpenseLog projectExpenseLog);
+
+    /**
+     * 新增费用报销审批记录
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 结果
+     */
+    public int insertProjectExpenseLog(ProjectExpenseLog projectExpenseLog);
+
+    /**
+     * 修改费用报销审批记录
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 结果
+     */
+    public int updateProjectExpenseLog(ProjectExpenseLog projectExpenseLog);
+
+    /**
+     * 删除费用报销审批记录
+     *
+     * @param id 费用报销审批记录主键
+     * @return 结果
+     */
+    public int deleteProjectExpenseLogById(String id);
+
+    /**
+     * 批量删除费用报销审批记录
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteProjectExpenseLogByIds(String[] ids);
+}

ruoyi-server/src/main/java/com/ruoyi/server/expenselog/service/IProjectExpenseLogService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.server.expenselog.service;
+
+import com.ruoyi.server.expenselog.domain.ProjectExpenseLog;
+
+import java.util.List;
+
+/**
+ * 费用报销审批记录Service接口
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+public interface IProjectExpenseLogService
+{
+    /**
+     * 查询费用报销审批记录
+     *
+     * @param id 费用报销审批记录主键
+     * @return 费用报销审批记录
+     */
+    public ProjectExpenseLog selectProjectExpenseLogById(String id);
+
+    /**
+     * 查询费用报销审批记录列表
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 费用报销审批记录集合
+     */
+    public List<ProjectExpenseLog> selectProjectExpenseLogList(ProjectExpenseLog projectExpenseLog);
+
+    /**
+     * 新增费用报销审批记录
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 结果
+     */
+    public int insertProjectExpenseLog(ProjectExpenseLog projectExpenseLog);
+
+    /**
+     * 修改费用报销审批记录
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 结果
+     */
+    public int updateProjectExpenseLog(ProjectExpenseLog projectExpenseLog);
+
+    /**
+     * 批量删除费用报销审批记录
+     *
+     * @param ids 需要删除的费用报销审批记录主键集合
+     * @return 结果
+     */
+    public int deleteProjectExpenseLogByIds(String[] ids);
+
+    /**
+     * 删除费用报销审批记录信息
+     *
+     * @param id 费用报销审批记录主键
+     * @return 结果
+     */
+    public int deleteProjectExpenseLogById(String id);
+}

ruoyi-server/src/main/java/com/ruoyi/server/expenselog/service/impl/ProjectExpenseLogServiceImpl.java

@@ -0,0 +1,102 @@
+package com.ruoyi.server.expenselog.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.server.expenselog.domain.ProjectExpenseLog;
+import com.ruoyi.server.expenselog.mapper.ProjectExpenseLogMapper;
+import com.ruoyi.server.expenselog.service.IProjectExpenseLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import static com.ruoyi.common.utils.SecurityUtils.getUsername;
+
+/**
+ * 费用报销审批记录Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+@Service
+public class ProjectExpenseLogServiceImpl implements IProjectExpenseLogService
+{
+    @Autowired
+    private ProjectExpenseLogMapper projectExpenseLogMapper;
+
+    /**
+     * 查询费用报销审批记录
+     *
+     * @param id 费用报销审批记录主键
+     * @return 费用报销审批记录
+     */
+    @Override
+    public ProjectExpenseLog selectProjectExpenseLogById(String id)
+    {
+        return projectExpenseLogMapper.selectProjectExpenseLogById(id);
+    }
+
+    /**
+     * 查询费用报销审批记录列表
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 费用报销审批记录
+     */
+    @Override
+    public List<ProjectExpenseLog> selectProjectExpenseLogList(ProjectExpenseLog projectExpenseLog)
+    {
+        return projectExpenseLogMapper.selectProjectExpenseLogList(projectExpenseLog);
+    }
+
+    /**
+     * 新增费用报销审批记录
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 结果
+     */
+    @Override
+    public int insertProjectExpenseLog(ProjectExpenseLog projectExpenseLog)
+    {
+        projectExpenseLog.setId(IdUtils.simpleUUID());
+        projectExpenseLog.setCreateBy(getUsername());
+        projectExpenseLog.setCreateTime(DateUtils.getNowDate());
+        return projectExpenseLogMapper.insertProjectExpenseLog(projectExpenseLog);
+    }
+
+    /**
+     * 修改费用报销审批记录
+     *
+     * @param projectExpenseLog 费用报销审批记录
+     * @return 结果
+     */
+    @Override
+    public int updateProjectExpenseLog(ProjectExpenseLog projectExpenseLog)
+    {
+        projectExpenseLog.setUpdateBy(getUsername());
+        projectExpenseLog.setUpdateTime(DateUtils.getNowDate());
+        return projectExpenseLogMapper.updateProjectExpenseLog(projectExpenseLog);
+    }
+
+    /**
+     * 批量删除费用报销审批记录
+     *
+     * @param ids 需要删除的费用报销审批记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProjectExpenseLogByIds(String[] ids)
+    {
+        return projectExpenseLogMapper.deleteProjectExpenseLogByIds(ids);
+    }
+
+    /**
+     * 删除费用报销审批记录信息
+     *
+     * @param id 费用报销审批记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProjectExpenseLogById(String id)
+    {
+        return projectExpenseLogMapper.deleteProjectExpenseLogById(id);
+    }
+}

ruoyi-server/src/main/java/com/ruoyi/server/report/controller/ProjectExpenseReportController.java

@@ -0,0 +1,105 @@
+package com.ruoyi.server.report.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.server.report.domain.ProjectExpenseReport;
+import com.ruoyi.server.report.service.IProjectExpenseReportService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 报销费用Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+@RestController
+@RequestMapping("/report/report")
+public class ProjectExpenseReportController extends BaseController
+{
+    @Autowired
+    private IProjectExpenseReportService projectExpenseReportService;
+
+    /**
+     * 查询报销费用列表
+     */
+    @PreAuthorize("@ss.hasPermi('report:report:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ProjectExpenseReport projectExpenseReport)
+    {
+        startPage();
+        List<ProjectExpenseReport> list = projectExpenseReportService.selectProjectExpenseReportList(projectExpenseReport);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出报销费用列表
+     */
+    @PreAuthorize("@ss.hasPermi('report:report:export')")
+    @Log(title = "报销费用", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ProjectExpenseReport projectExpenseReport)
+    {
+        List<ProjectExpenseReport> list = projectExpenseReportService.selectProjectExpenseReportList(projectExpenseReport);
+        ExcelUtil<ProjectExpenseReport> util = new ExcelUtil<ProjectExpenseReport>(ProjectExpenseReport.class);
+        util.exportExcel(response, list, "报销费用数据");
+    }
+
+    /**
+     * 获取报销费用详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('report:report:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(projectExpenseReportService.selectProjectExpenseReportById(id));
+    }
+
+    /**
+     * 新增报销费用
+     */
+    @PreAuthorize("@ss.hasPermi('report:report:add')")
+    @Log(title = "报销费用", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ProjectExpenseReport projectExpenseReport)
+    {
+        return toAjax(projectExpenseReportService.insertProjectExpenseReport(projectExpenseReport));
+    }
+
+    /**
+     * 修改报销费用
+     */
+    @PreAuthorize("@ss.hasPermi('report:report:edit')")
+    @Log(title = "报销费用", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ProjectExpenseReport projectExpenseReport)
+    {
+        return toAjax(projectExpenseReportService.updateProjectExpenseReport(projectExpenseReport));
+    }
+
+    /**
+     * 删除报销费用
+     */
+    @PreAuthorize("@ss.hasPermi('report:report:remove')")
+    @Log(title = "报销费用", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(projectExpenseReportService.deleteProjectExpenseReportByIds(ids));
+    }
+}

ruoyi-server/src/main/java/com/ruoyi/server/report/domain/ProjectExpenseReport.java

@@ -0,0 +1,188 @@
+package com.ruoyi.server.report.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 报销费用对象 project_expense_report
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+public class ProjectExpenseReport extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键ID */
+    private String id;
+
+    /** 报销总金额 */
+    @Excel(name = "报销总金额")
+    private BigDecimal totalAmount;
+
+    /** 报销人 */
+    @Excel(name = "报销人")
+    private String applicantId;
+
+    /** 报销类别（1：差旅费 2：办公费，3：培训费，4：招待费） */
+    @Excel(name = "报销类别", readConverterExp = "1=：差旅费,2=：办公费，3：培训费，4：招待费")
+    private String expenseCategory;
+
+    /** 报销凭证编号 */
+    @Excel(name = "报销凭证编号")
+    private String voucherNumber;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applicationTime;
+
+    /** 状态(1：审批中  2：已通过  3：已驳回) */
+    @Excel(name = "状态(1：审批中  2：已通过  3：已驳回)")
+    private String reportStatus;
+
+    /** 审核人 */
+    @Excel(name = "审核人")
+    private String reviewerId;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime;
+
+    /** 驳回原因（如果被驳回，可以再次申请） */
+    @Excel(name = "驳回原因", readConverterExp = "如=果被驳回，可以再次申请")
+    private String rejectionReason;
+
+    /** 驳回时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "驳回时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date rejectionTime;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setTotalAmount(BigDecimal totalAmount)
+    {
+        this.totalAmount = totalAmount;
+    }
+
+    public BigDecimal getTotalAmount()
+    {
+        return totalAmount;
+    }
+    public void setApplicantId(String applicantId)
+    {
+        this.applicantId = applicantId;
+    }
+
+    public String getApplicantId()
+    {
+        return applicantId;
+    }
+    public void setExpenseCategory(String expenseCategory)
+    {
+        this.expenseCategory = expenseCategory;
+    }
+
+    public String getExpenseCategory()
+    {
+        return expenseCategory;
+    }
+    public void setVoucherNumber(String voucherNumber)
+    {
+        this.voucherNumber = voucherNumber;
+    }
+
+    public String getVoucherNumber()
+    {
+        return voucherNumber;
+    }
+    public void setApplicationTime(Date applicationTime)
+    {
+        this.applicationTime = applicationTime;
+    }
+
+    public Date getApplicationTime()
+    {
+        return applicationTime;
+    }
+    public void setReportStatus(String reportStatus)
+    {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getReportStatus()
+    {
+        return reportStatus;
+    }
+    public void setReviewerId(String reviewerId)
+    {
+        this.reviewerId = reviewerId;
+    }
+
+    public String getReviewerId()
+    {
+        return reviewerId;
+    }
+    public void setReviewTime(Date reviewTime)
+    {
+        this.reviewTime = reviewTime;
+    }
+
+    public Date getReviewTime()
+    {
+        return reviewTime;
+    }
+    public void setRejectionReason(String rejectionReason)
+    {
+        this.rejectionReason = rejectionReason;
+    }
+
+    public String getRejectionReason()
+    {
+        return rejectionReason;
+    }
+    public void setRejectionTime(Date rejectionTime)
+    {
+        this.rejectionTime = rejectionTime;
+    }
+
+    public Date getRejectionTime()
+    {
+        return rejectionTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("totalAmount", getTotalAmount())
+            .append("applicantId", getApplicantId())
+            .append("expenseCategory", getExpenseCategory())
+            .append("voucherNumber", getVoucherNumber())
+            .append("applicationTime", getApplicationTime())
+            .append("reportStatus", getReportStatus())
+            .append("reviewerId", getReviewerId())
+            .append("reviewTime", getReviewTime())
+            .append("rejectionReason", getRejectionReason())
+            .append("rejectionTime", getRejectionTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-server/src/main/java/com/ruoyi/server/report/mapper/ProjectExpenseReportMapper.java

@@ -0,0 +1,62 @@
+package com.ruoyi.server.report.mapper;
+
+import com.ruoyi.server.report.domain.ProjectExpenseReport;
+
+import java.util.List;
+
+/**
+ * 报销费用Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+public interface ProjectExpenseReportMapper
+{
+    /**
+     * 查询报销费用
+     *
+     * @param id 报销费用主键
+     * @return 报销费用
+     */
+    public ProjectExpenseReport selectProjectExpenseReportById(String id);
+
+    /**
+     * 查询报销费用列表
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 报销费用集合
+     */
+    public List<ProjectExpenseReport> selectProjectExpenseReportList(ProjectExpenseReport projectExpenseReport);
+
+    /**
+     * 新增报销费用
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 结果
+     */
+    public int insertProjectExpenseReport(ProjectExpenseReport projectExpenseReport);
+
+    /**
+     * 修改报销费用
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 结果
+     */
+    public int updateProjectExpenseReport(ProjectExpenseReport projectExpenseReport);
+
+    /**
+     * 删除报销费用
+     *
+     * @param id 报销费用主键
+     * @return 结果
+     */
+    public int deleteProjectExpenseReportById(String id);
+
+    /**
+     * 批量删除报销费用
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteProjectExpenseReportByIds(String[] ids);
+}

ruoyi-server/src/main/java/com/ruoyi/server/report/service/IProjectExpenseReportService.java

@@ -0,0 +1,62 @@
+package com.ruoyi.server.report.service;
+
+import com.ruoyi.server.report.domain.ProjectExpenseReport;
+
+import java.util.List;
+
+/**
+ * 报销费用Service接口
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+public interface IProjectExpenseReportService
+{
+    /**
+     * 查询报销费用
+     *
+     * @param id 报销费用主键
+     * @return 报销费用
+     */
+    public ProjectExpenseReport selectProjectExpenseReportById(String id);
+
+    /**
+     * 查询报销费用列表
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 报销费用集合
+     */
+    public List<ProjectExpenseReport> selectProjectExpenseReportList(ProjectExpenseReport projectExpenseReport);
+
+    /**
+     * 新增报销费用
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 结果
+     */
+    public int insertProjectExpenseReport(ProjectExpenseReport projectExpenseReport);
+
+    /**
+     * 修改报销费用
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 结果
+     */
+    public int updateProjectExpenseReport(ProjectExpenseReport projectExpenseReport);
+
+    /**
+     * 批量删除报销费用
+     *
+     * @param ids 需要删除的报销费用主键集合
+     * @return 结果
+     */
+    public int deleteProjectExpenseReportByIds(String[] ids);
+
+    /**
+     * 删除报销费用信息
+     *
+     * @param id 报销费用主键
+     * @return 结果
+     */
+    public int deleteProjectExpenseReportById(String id);
+}

ruoyi-server/src/main/java/com/ruoyi/server/report/service/impl/ProjectExpenseReportServiceImpl.java

@@ -0,0 +1,102 @@
+package com.ruoyi.server.report.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.server.report.domain.ProjectExpenseReport;
+import com.ruoyi.server.report.mapper.ProjectExpenseReportMapper;
+import com.ruoyi.server.report.service.IProjectExpenseReportService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import static com.ruoyi.common.utils.SecurityUtils.getUsername;
+
+/**
+ * 报销费用Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-07-02
+ */
+@Service
+public class ProjectExpenseReportServiceImpl implements IProjectExpenseReportService
+{
+    @Autowired
+    private ProjectExpenseReportMapper projectExpenseReportMapper;
+
+    /**
+     * 查询报销费用
+     *
+     * @param id 报销费用主键
+     * @return 报销费用
+     */
+    @Override
+    public ProjectExpenseReport selectProjectExpenseReportById(String id)
+    {
+        return projectExpenseReportMapper.selectProjectExpenseReportById(id);
+    }
+
+    /**
+     * 查询报销费用列表
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 报销费用
+     */
+    @Override
+    public List<ProjectExpenseReport> selectProjectExpenseReportList(ProjectExpenseReport projectExpenseReport)
+    {
+        return projectExpenseReportMapper.selectProjectExpenseReportList(projectExpenseReport);
+    }
+
+    /**
+     * 新增报销费用
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 结果
+     */
+    @Override
+    public int insertProjectExpenseReport(ProjectExpenseReport projectExpenseReport)
+    {
+        projectExpenseReport.setId(IdUtils.simpleUUID());
+        projectExpenseReport.setCreateBy(getUsername());
+        projectExpenseReport.setCreateTime(DateUtils.getNowDate());
+        return projectExpenseReportMapper.insertProjectExpenseReport(projectExpenseReport);
+    }
+
+    /**
+     * 修改报销费用
+     *
+     * @param projectExpenseReport 报销费用
+     * @return 结果
+     */
+    @Override
+    public int updateProjectExpenseReport(ProjectExpenseReport projectExpenseReport)
+    {
+        projectExpenseReport.setUpdateBy(getUsername());
+        projectExpenseReport.setUpdateTime(DateUtils.getNowDate());
+        return projectExpenseReportMapper.updateProjectExpenseReport(projectExpenseReport);
+    }
+
+    /**
+     * 批量删除报销费用
+     *
+     * @param ids 需要删除的报销费用主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProjectExpenseReportByIds(String[] ids)
+    {
+        return projectExpenseReportMapper.deleteProjectExpenseReportByIds(ids);
+    }
+
+    /**
+     * 删除报销费用信息
+     *
+     * @param id 报销费用主键
+     * @return 结果
+     */
+    @Override
+    public int deleteProjectExpenseReportById(String id)
+    {
+        return projectExpenseReportMapper.deleteProjectExpenseReportById(id);
+    }
+}

ruoyi-server/src/main/resources/mapper/expenselog/ProjectExpenseLogMapper.xml

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.server.expenselog.mapper.ProjectExpenseLogMapper">
+
+    <resultMap type="com.ruoyi.server.expenselog.domain.ProjectExpenseLog" id="ProjectExpenseLogResult">
+        <result property="id"    column="id"    />
+        <result property="expenseId"    column="expense_id"    />
+        <result property="expenseName"    column="expense_name"    />
+        <result property="reportStatus"    column="report_status"    />
+        <result property="reviewerId"    column="reviewer_id"    />
+        <result property="reviewTime"    column="review_time"    />
+        <result property="rejectionReason"    column="rejection_reason"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="status"    column="status"    />
+    </resultMap>
+
+    <sql id="selectProjectExpenseLogVo">
+        select id, expense_id, expense_name, report_status, reviewer_id, review_time, rejection_reason, create_by, create_time, update_by, update_time, remark, status from project_expense_log
+    </sql>
+
+    <select id="selectProjectExpenseLogList" parameterType="com.ruoyi.server.expenselog.domain.ProjectExpenseLog" resultMap="ProjectExpenseLogResult">
+        <include refid="selectProjectExpenseLogVo"/>
+        <where>
+            <if test="expenseId != null  and expenseId != ''"> and expense_id = #{expenseId}</if>
+            <if test="expenseName != null  and expenseName != ''"> and expense_name like concat('%', #{expenseName}, '%')</if>
+            <if test="reportStatus != null "> and report_status = #{reportStatus}</if>
+            <if test="reviewerId != null  and reviewerId != ''"> and reviewer_id = #{reviewerId}</if>
+            <if test="reviewTime != null "> and review_time = #{reviewTime}</if>
+            <if test="rejectionReason != null  and rejectionReason != ''"> and rejection_reason = #{rejectionReason}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+        </where>
+        order by expense_id,review_time desc
+    </select>
+
+    <select id="selectProjectExpenseLogById" parameterType="String" resultMap="ProjectExpenseLogResult">
+        <include refid="selectProjectExpenseLogVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertProjectExpenseLog" parameterType="com.ruoyi.server.expenselog.domain.ProjectExpenseLog">
+        insert into project_expense_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="expenseId != null">expense_id,</if>
+            <if test="expenseName != null">expense_name,</if>
+            <if test="reportStatus != null">report_status,</if>
+            <if test="reviewerId != null">reviewer_id,</if>
+            <if test="reviewTime != null">review_time,</if>
+            <if test="rejectionReason != null">rejection_reason,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="status != null">status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="expenseId != null">#{expenseId},</if>
+            <if test="expenseName != null">#{expenseName},</if>
+            <if test="reportStatus != null">#{reportStatus},</if>
+            <if test="reviewerId != null">#{reviewerId},</if>
+            <if test="reviewTime != null">#{reviewTime},</if>
+            <if test="rejectionReason != null">#{rejectionReason},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="status != null">#{status},</if>
+         </trim>
+    </insert>
+
+    <update id="updateProjectExpenseLog" parameterType="com.ruoyi.server.expenselog.domain.ProjectExpenseLog">
+        update project_expense_log
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="expenseId != null">expense_id = #{expenseId},</if>
+            <if test="expenseName != null">expense_name = #{expenseName},</if>
+            <if test="reportStatus != null">report_status = #{reportStatus},</if>
+            <if test="reviewerId != null">reviewer_id = #{reviewerId},</if>
+            <if test="reviewTime != null">review_time = #{reviewTime},</if>
+            <if test="rejectionReason != null">rejection_reason = #{rejectionReason},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="status != null">status = #{status},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteProjectExpenseLogById" parameterType="String">
+        delete from project_expense_log where id = #{id}
+    </delete>
+
+    <delete id="deleteProjectExpenseLogByIds" parameterType="String">
+        delete from project_expense_log where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-server/src/main/resources/mapper/report/ProjectExpenseReportMapper.xml

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.server.report.mapper.ProjectExpenseReportMapper">
+
+    <resultMap type="com.ruoyi.server.report.domain.ProjectExpenseReport" id="ProjectExpenseReportResult">
+        <result property="id"    column="id"    />
+        <result property="totalAmount"    column="total_amount"    />
+        <result property="applicantId"    column="applicant_id"    />
+        <result property="expenseCategory"    column="expense_category"    />
+        <result property="voucherNumber"    column="voucher_number"    />
+        <result property="applicationTime"    column="application_time"    />
+        <result property="reportStatus"    column="report_status"    />
+        <result property="reviewerId"    column="reviewer_id"    />
+        <result property="reviewTime"    column="review_time"    />
+        <result property="rejectionReason"    column="rejection_reason"    />
+        <result property="rejectionTime"    column="rejection_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectProjectExpenseReportVo">
+        select id, total_amount, applicant_id, expense_category, voucher_number, application_time, report_status, reviewer_id, review_time, rejection_reason, rejection_time, create_by, create_time, update_by, update_time, remark from project_expense_report
+    </sql>
+
+    <select id="selectProjectExpenseReportList" parameterType="com.ruoyi.server.report.domain.ProjectExpenseReport" resultMap="ProjectExpenseReportResult">
+        <include refid="selectProjectExpenseReportVo"/>
+        <where>
+            <if test="totalAmount != null "> and total_amount = #{totalAmount}</if>
+            <if test="applicantId != null  and applicantId != ''"> and applicant_id = #{applicantId}</if>
+            <if test="expenseCategory != null  and expenseCategory != ''"> and expense_category = #{expenseCategory}</if>
+            <if test="voucherNumber != null  and voucherNumber != ''"> and voucher_number = #{voucherNumber}</if>
+            <if test="applicationTime != null "> and application_time = #{applicationTime}</if>
+            <if test="reportStatus != null "> and report_status = #{reportStatus}</if>
+            <if test="reviewerId != null  and reviewerId != ''"> and reviewer_id = #{reviewerId}</if>
+            <if test="reviewTime != null "> and review_time = #{reviewTime}</if>
+            <if test="rejectionReason != null  and rejectionReason != ''"> and rejection_reason = #{rejectionReason}</if>
+            <if test="rejectionTime != null "> and rejection_time = #{rejectionTime}</if>
+        </where>
+    </select>
+
+    <select id="selectProjectExpenseReportById" parameterType="String" resultMap="ProjectExpenseReportResult">
+        <include refid="selectProjectExpenseReportVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertProjectExpenseReport" parameterType="com.ruoyi.server.report.domain.ProjectExpenseReport">
+        insert into project_expense_report
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="totalAmount != null">total_amount,</if>
+            <if test="applicantId != null">applicant_id,</if>
+            <if test="expenseCategory != null">expense_category,</if>
+            <if test="voucherNumber != null">voucher_number,</if>
+            <if test="applicationTime != null">application_time,</if>
+            <if test="reportStatus != null">report_status,</if>
+            <if test="reviewerId != null">reviewer_id,</if>
+            <if test="reviewTime != null">review_time,</if>
+            <if test="rejectionReason != null">rejection_reason,</if>
+            <if test="rejectionTime != null">rejection_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="totalAmount != null">#{totalAmount},</if>
+            <if test="applicantId != null">#{applicantId},</if>
+            <if test="expenseCategory != null">#{expenseCategory},</if>
+            <if test="voucherNumber != null">#{voucherNumber},</if>
+            <if test="applicationTime != null">#{applicationTime},</if>
+            <if test="reportStatus != null">#{reportStatus},</if>
+            <if test="reviewerId != null">#{reviewerId},</if>
+            <if test="reviewTime != null">#{reviewTime},</if>
+            <if test="rejectionReason != null">#{rejectionReason},</if>
+            <if test="rejectionTime != null">#{rejectionTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateProjectExpenseReport" parameterType="com.ruoyi.server.report.domain.ProjectExpenseReport">
+        update project_expense_report
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="totalAmount != null">total_amount = #{totalAmount},</if>
+            <if test="applicantId != null">applicant_id = #{applicantId},</if>
+            <if test="expenseCategory != null">expense_category = #{expenseCategory},</if>
+            <if test="voucherNumber != null">voucher_number = #{voucherNumber},</if>
+            <if test="applicationTime != null">application_time = #{applicationTime},</if>
+            <if test="reportStatus != null">report_status = #{reportStatus},</if>
+            <if test="reviewerId != null">reviewer_id = #{reviewerId},</if>
+            <if test="reviewTime != null">review_time = #{reviewTime},</if>
+            <if test="rejectionReason != null">rejection_reason = #{rejectionReason},</if>
+            <if test="rejectionTime != null">rejection_time = #{rejectionTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteProjectExpenseReportById" parameterType="String">
+        delete from project_expense_report where id = #{id}
+    </delete>
+
+    <delete id="deleteProjectExpenseReportByIds" parameterType="String">
+        delete from project_expense_report where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-ui/src/api/expenselog/expenselog.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询费用报销审批记录列表
+export function listExpenselog(query) {
+  return request({
+    url: '/expenselog/expenselog/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询费用报销审批记录列表
+export function listAllExpenselog(query) {
+  return request({
+    url: '/expenselog/expenselog/alllist',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询费用报销审批记录详细
+export function getExpenselog(id) {
+  return request({
+    url: '/expenselog/expenselog/' + id,
+    method: 'get'
+  })
+}
+
+// 新增费用报销审批记录
+export function addExpenselog(data) {
+  return request({
+    url: '/expenselog/expenselog',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改费用报销审批记录
+export function updateExpenselog(data) {
+  return request({
+    url: '/expenselog/expenselog',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除费用报销审批记录
+export function delExpenselog(id) {
+  return request({
+    url: '/expenselog/expenselog/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/api/report/report.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询报销费用列表
+export function listReport(query) {
+  return request({
+    url: '/report/report/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询报销费用详细
+export function getReport(id) {
+  return request({
+    url: '/report/report/' + id,
+    method: 'get'
+  })
+}
+
+// 新增报销费用
+export function addReport(data) {
+  return request({
+    url: '/report/report',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改报销费用
+export function updateReport(data) {
+  return request({
+    url: '/report/report',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除报销费用
+export function delReport(id) {
+  return request({
+    url: '/report/report/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/expenselog/expenselog/index.vue

@@ -0,0 +1,288 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="报销凭证编号" prop="expenseName">
+        <el-input
+          v-model="queryParams.expenseName"
+          placeholder="请输入报销凭证编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="reportStatus">
+        <el-select v-model="queryParams.reportStatus" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.fybxspzt_check"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['expenselog:expenselog:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['expenselog:expenselog:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="expenselogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="报销凭证编号" align="center" prop="expenseName" />
+      <el-table-column label="状态" align="center" prop="reportStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.fybxspzt_check" :value="scope.row.reportStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="reviewerId" />
+      <el-table-column label="审核时间" align="center" prop="reviewTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reviewTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批意见" align="center" prop="rejectionReason" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['expenselog:expenselog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['expenselog:expenselog:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改费用报销审批记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="状态" prop="reportStatus">
+          <el-radio-group v-model="form.reportStatus">
+            <el-radio
+              v-for="dict in dict.type.fybxspzt_check"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="审核人" prop="reviewerId">
+          <el-input v-model="form.reviewerId" placeholder="请输入审核人" />
+        </el-form-item>
+        <el-form-item label="审核时间" prop="reviewTime">
+          <el-date-picker clearable
+            v-model="form.reviewTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审批意见" prop="rejectionReason">
+          <el-input v-model="form.rejectionReason" type="textarea"  placeholder="请输入审批意见" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listExpenselog, getExpenselog, delExpenselog, addExpenselog, updateExpenselog } from "@/api/expenselog/expenselog";
+
+export default {
+  name: "Expenselog",
+  dicts: ['fybxspzt_check'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 费用报销审批记录表格数据
+      expenselogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        expenseId: null,
+        expenseName: null,
+        reportStatus: null,
+        reviewerId: null,
+        reviewTime: null,
+        rejectionReason: null,
+        status: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询费用报销审批记录列表 */
+    getList() {
+      this.loading = true;
+      listExpenselog(this.queryParams).then(response => {
+        this.expenselogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        expenseId: null,
+        expenseName: null,
+        reportStatus: null,
+        reviewerId: null,
+        reviewTime: null,
+        rejectionReason: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        status: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加费用报销审批记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getExpenselog(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改费用报销审批记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateExpenselog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addExpenselog(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除费用报销审批记录编号为"' + ids + '"的数据项？').then(function() {
+        return delExpenselog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('expenselog/expenselog/export', {
+        ...this.queryParams
+      }, `expenselog_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/report/report/index.vue

@@ -0,0 +1,618 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="报销人" prop="applicantId">
+        <el-input
+          v-model="queryParams.applicantId"
+          placeholder="请输入报销人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报销类别" prop="expenseCategory">
+        <el-input
+          v-model="queryParams.expenseCategory"
+          placeholder="请输入报销类别"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="报销凭证编号" prop="voucherNumber">
+        <el-input
+          v-model="queryParams.voucherNumber"
+          placeholder="请输入报销凭证编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请时间" prop="applicationTime">
+        <el-date-picker clearable
+          v-model="queryParams.applicationTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="状态" prop="reportStatus">
+        <el-select v-model="queryParams.reportStatus" placeholder="请选择状态" clearable>
+          <el-option
+            v-for="dict in dict.type.fybxspzt_check"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['report:report:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['report:report:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['report:report:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="报销凭证编号" align="center" prop="voucherNumber" />
+      <el-table-column label="报销人" align="center" prop="applicantId" />
+      <el-table-column label="报销总金额" align="center" prop="totalAmount" />
+      <el-table-column label="报销类别" align="center" prop="expenseCategory" />
+      <el-table-column label="申请时间" align="center" prop="applicationTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applicationTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="reportStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.fybxspzt_check" :value="scope.row.reportStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核时间" align="center" prop="reviewTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reviewTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="驳回原因" align="center" prop="rejectionReason" />
+      <el-table-column label="驳回时间" align="center" prop="rejectionTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.rejectionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注信息" align="center" prop="remark" />
+      <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"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['report:report:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['report:report:remove']"
+          >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDecal(scope.row)"
+            v-hasPermi="['report:report:edit']"
+          >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document-remove"
+            @click="handleShenPi(scope.row)"
+            v-hasPermi="['report:report:edit']"
+          >费用流程审批</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document-remove"
+            @click="handleShenPiList(scope.row)"
+            v-hasPermi="['expenselog:expenselog:export']"
+          >审批记录</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-document-remove"
+            @click="handleShenPijindu(scope.row)"
+            v-hasPermi="['expenselog:expenselog:export']"
+          >查看费用进度</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改报销费用对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form-item label="报销总金额" prop="totalAmount">
+          <el-input v-model="form.totalAmount" placeholder="请输入报销总金额" :disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="报销人" prop="applicantId">
+          <el-input v-model="form.applicantId" placeholder="请输入报销人" :disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="报销类别" prop="expenseCategory">
+          <el-input v-model="form.expenseCategory" placeholder="请输入报销类别" :disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="报销凭证编号" prop="voucherNumber">
+          <el-input v-model="form.voucherNumber" placeholder="请输入报销凭证编号" :disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="申请时间" prop="applicationTime">
+          <el-date-picker clearable
+            v-model="form.applicationTime"
+            :disabled="disabled"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择申请时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="状态" prop="reportStatus">
+          <el-select v-model="form.reportStatus" placeholder="请选择状态" clearable :disabled="disabled">
+          <el-option
+            v-for="dict in dict.type.fybxspzt_check"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注信息" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 添加审批记录 -->
+     <!-- 添加或修改费用报销审批记录对话框 -->
+    <el-dialog :title="title" :visible.sync="shenpiopen" width="900px" append-to-body>
+      <el-form ref="shenpiform" :model="shenpiform" :rules="rules" label-width="80px">
+        <el-form-item label="关联报销名称" prop="expenseName">
+          <el-input v-model="shenpiform.expenseName" placeholder="请输入关联报销名称" />
+        </el-form-item>
+        <el-form-item label="状态" prop="reportStatus">
+          <el-select v-model="shenpiform.reportStatus" placeholder="请选择状态" clearable :disabled="disabled">
+          <el-option
+            v-for="dict in dict.type.fybxspzt_check"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+        </el-form-item>
+        <el-form-item label="审核人" prop="reviewerId">
+          <el-input v-model="shenpiform.reviewerId" placeholder="请输入审核人" />
+        </el-form-item>
+        <el-form-item label="审核时间" prop="reviewTime">
+          <el-date-picker clearable
+            v-model="shenpiform.reviewTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="rejectionReason">
+          <el-input v-model="shenpiform.rejectionReason" type="textarea" placeholder="请输入审核意见" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="shenpiform.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="shenpisubmitForm">确 定</el-button>
+        <el-button @click="shenpicancel">取 消</el-button>
+      </div>
+    </el-dialog>
+     <!-- 添加或修改费用报销审批记录对话框 -->
+    <el-dialog :title="title" :visible.sync="shenpiopenList" width="900px" append-to-body>
+      <el-table v-loading="shenpiloading" :data="expenselogList">
+      <el-table-column label="报销凭证编号" align="center" prop="expenseName" />
+      <el-table-column label="状态" align="center" prop="reportStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.fybxspzt_check" :value="scope.row.reportStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审核人" align="center" prop="reviewerId" />
+      <el-table-column label="审核时间" align="center" prop="reviewTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.reviewTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批意见" align="center" prop="rejectionReason" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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"
+            @click="shenpihandleUpdate(scope.row)"
+            v-hasPermi="['expenselog:expenselog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="shenpihandleDelete(scope.row)"
+            v-hasPermi="['expenselog:expenselog:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    </el-dialog>
+     <!-- 添加或修改费用报销审批记录对话框 -->
+    <el-dialog :title="title" :visible.sync="shenpiopenjidu" width="900px" append-to-body>
+      <el-steps :active="active" align-center>
+  <el-step title="填写报销单" description="根据公司提供的报销单模板，逐项填写报销内容，包括费用类别、金额、日期、事由等。"></el-step>
+  <el-step title="审批中" description="部门经理或初审人员对报销申请进行初步审核，确认费用是否合理、凭证是否齐全"></el-step>
+  <el-step title="报销完成" description="报销人确认收款情况"></el-step>
+</el-steps>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listReport, getReport, delReport, addReport, updateReport } from "@/api/report/report";
+import { listExpenselog,listAllExpenselog, getExpenselog, delExpenselog, addExpenselog, updateExpenselog } from "@/api/expenselog/expenselog";
+export default {
+  name: "Report",
+  dicts: ['fybxspzt_check'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      shenpiloading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报销费用表格数据
+      reportList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      disabled: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        totalAmount: null,
+        applicantId: null,
+        expenseCategory: null,
+        voucherNumber: null,
+        applicationTime: null,
+        reportStatus: null,
+        reviewerId: null,
+        reviewTime: null,
+        rejectionReason: null,
+        rejectionTime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      // 费用报销审批记录表格数据
+      expenselogList: [],
+      // 是否显示弹出层
+      shenpiopen: false,
+      shenpiopenList: false,
+      shenpiopenjidu: false,
+      // 查询参数
+      shenpiqueryParams: {
+        expenseId: null,
+        expenseName: null,
+        reportStatus: null,
+        reviewerId: null,
+        reviewTime: null,
+        rejectionReason: null,
+        status: null
+      },
+      // 表单参数
+      shenpiform: {},
+      active: 2,
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询报销费用列表 */
+    getList() {
+      this.loading = true;
+      listReport(this.queryParams).then(response => {
+        this.reportList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        totalAmount: null,
+        applicantId: null,
+        expenseCategory: null,
+        voucherNumber: null,
+        applicationTime: null,
+        reportStatus: null,
+        reviewerId: null,
+        reviewTime: null,
+        rejectionReason: null,
+        rejectionTime: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加报销费用";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getReport(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改报销费用";
+      });
+    },
+    /** 修改按钮操作 */
+    handleDecal(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getReport(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.disabled = true;
+        this.title = "修改报销费用";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateReport(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addReport(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除报销费用编号为"' + ids + '"的数据项？').then(function() {
+        return delReport(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('report/report/export', {
+        ...this.queryParams
+      }, `report_${new Date().getTime()}.xlsx`)
+    },
+
+
+
+    /** 修改按钮操作 */
+    handleShenPi(row) {
+      this.shenpireset();
+      this.shenpiform.expenseId = row.id;
+      this.shenpiform.expenseName = row.voucherNumber;
+      this.shenpiopen = true;
+      this.title = "费用流程审批";
+    },
+    /** 修改按钮操作 */
+    handleShenPiList(row) {
+      this.shenpireset();
+      this.shenpiopenList = true;
+      this.title = "审批记录";
+      this.shenpiqueryParams.expenseId = row.id;
+      this.shenpigetList();
+    },
+    /** 修改按钮操作 */
+    handleShenPijindu(row) {
+      this.shenpiopenjidu = true;
+      this.active = row.reportStatus;
+      this.title = "费用进度";
+    },
+
+
+    /** 查询费用报销审批记录列表 */
+    shenpigetList() {
+      this.shenpiloading = true;
+      listAllExpenselog(this.shenpiqueryParams).then(response => {
+        this.expenselogList = response.data;
+        this.total = response.total;
+        this.shenpiloading = false;
+      });
+    },
+    // 取消按钮
+    shenpicancel() {
+      this.shenpiopen = false;
+      this.shenpireset();
+    },
+    // 表单重置
+    shenpireset() {
+      this.shenpiform = {
+        id: null,
+        expenseId: null,
+        expenseName: null,
+        reportStatus: null,
+        reviewerId: null,
+        reviewTime: null,
+        rejectionReason: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null,
+        status: null
+      };
+      this.resetForm("shenpiform");
+    },
+    /** 搜索按钮操作 */
+    shenpihandleQuery() {
+      this.shenpiqueryParams.pageNum = 1;
+      this.shenpigetList();
+    },
+    /** 重置按钮操作 */
+    shenpiresetQuery() {
+      this.resetForm("shenpiqueryForm");
+      this.shenpihandleQuery();
+    },
+    // 多选框选中数据
+    shenpihandleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    shenpihandleAdd() {
+      this.shenpireset();
+      this.shenpiopen = true;
+      this.title = "添加费用报销审批记录";
+    },
+    /** 修改按钮操作 */
+    shenpihandleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getExpenselog(id).then(response => {
+        this.shenpiform = response.data;
+        this.shenpiopen = true;
+        this.title = "修改费用报销审批记录";
+      });
+    },
+    /** 提交按钮 */
+    shenpisubmitForm() {
+      this.$refs["shenpiform"].validate(valid => {
+        if (valid) {
+          if (this.shenpiform.id != null) {
+            updateExpenselog(this.shenpiform).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.shenpiopen = false;
+              this.shenpigetList();
+              this.getList();
+            });
+          } else {
+            addExpenselog(this.shenpiform).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.shenpiopen = false;
+              this.shenpigetList();
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    shenpihandleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除费用报销审批记录编号为"' + ids + '"的数据项？').then(function() {
+        return delExpenselog(ids);
+      }).then(() => {
+        this.shenpigetList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+  }
+};
+</script>