Merge branch 'main' of https://gitee.com/hdka/fad_oa

ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaCostController.java

@@ -0,0 +1,145 @@
+package com.ruoyi.oa.controller;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.oa.domain.vo.SysOaCostAllVo;
+import com.ruoyi.oa.domain.vo.SysOaCostRow;
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.vo.SysOaCostVo;
+import com.ruoyi.oa.domain.bo.SysOaCostBo;
+import com.ruoyi.oa.service.ISysOaCostService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目成本分析
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/oa/cost")
+public class SysOaCostController extends BaseController {
+
+    private final ISysOaCostService iSysOaCostService;
+
+    /**
+     * 查询项目成本分析列表
+     */
+    @SaCheckPermission("oa:oaCost:list")
+    @GetMapping("/list1")
+    public TableDataInfo<SysOaCostVo> list1(SysOaCostBo bo, PageQuery pageQuery) {
+        return iSysOaCostService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出项目成本分析列表
+     */
+    @SaCheckPermission("oa:oaCost:export")
+    @Log(title = "项目成本分析", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysOaCostBo bo, HttpServletResponse response) {
+        List<SysOaCostVo> list = iSysOaCostService.queryList(bo);
+        ExcelUtil.exportExcel(list, "项目成本分析", SysOaCostVo.class, response);
+    }
+
+    /**
+     * 获取项目成本分析详细信息
+     *
+     * @param costId 主键
+     */
+    @SaCheckPermission("oa:oaCost:query")
+    @GetMapping("/old/{costId}")
+    public R<SysOaCostVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long costId) {
+        return R.ok(iSysOaCostService.queryById(costId));
+    }
+
+    /**
+     * 新增项目成本分析
+     */
+    @SaCheckPermission("oa:oaCost:add")
+    @Log(title = "项目成本分析", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add1(@Validated(AddGroup.class) @RequestBody SysOaCostBo bo) {
+        return toAjax(iSysOaCostService.insertByBo(bo));
+    }
+
+    /**
+     * 修改项目成本分析
+     */
+    @SaCheckPermission("oa:oaCost:edit")
+    @Log(title = "项目成本分析", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOaCostBo bo) {
+        return toAjax(iSysOaCostService.updateByBo(bo));
+    }
+
+
+
+    /**
+     * 查询所有项目成本
+     */
+    @SaCheckPermission("oa:oaCost:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOaCostAllVo> AllList(@RequestParam(required = false) String projectName, @RequestParam(required = false)String createTime) {
+        return iSysOaCostService.AllList(projectName, createTime);
+    }
+    /**
+     * 查询详情
+     */
+    @SaCheckPermission("oa:oaCost:list")
+    @GetMapping("/{projectId}")
+    public TableDataInfo<SysOaCostRow> getDetail(@NotNull(message = "项目id不能为空")
+                                     @PathVariable Long projectId) {
+        return iSysOaCostService.getDetail(projectId);
+    }
+
+    /**
+     * 新增成本
+     */
+    @SaCheckPermission("oa:oaCost:add")
+    @Log(title = "项目成本分析", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOaCostBo bo) {
+        return toAjax(iSysOaCostService.insertByBo(bo));
+    }
+
+    /**
+     * 删除项目成本分析
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("oa:cost:remove")
+    @Log(title = "项目成本分析", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(iSysOaCostService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaCost.java

@@ -0,0 +1,68 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目成本分析对象 sys_oa_cost
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oa_cost")
+public class SysOaCost extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "cost_id")
+    private Long costId;
+    /**
+     * 绑定项目id
+     */
+    private Long projectId;
+    /**
+     * 花费
+     */
+    private Double cost;
+    /**
+     * 花费类型，字典查询
+     */
+    private Integer costType;
+    /**
+     * 花费备注
+     */
+    private String remark;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 若为物料花费需要绑定物料id
+     */
+    private Long materialId;
+    /**
+     * 若为人工花费则绑定用户id
+     */
+    private Long userId;
+    /**
+     * 绑定财政收支id
+     */
+    private Long financeId;
+    /**
+     * 若为差旅报销绑定差旅id
+     */
+    private Long claimId;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaCostBo.java

@@ -0,0 +1,73 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 项目成本分析业务对象 sys_oa_cost
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysOaCostBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long costId;
+
+    /**
+     * 绑定项目id
+     */
+    @NotNull(message = "绑定项目id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long projectId;
+
+    /**
+     * 花费
+     */
+    @NotNull(message = "花费不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Double cost;
+
+    /**
+     * 花费类型，字典查询
+     */
+    @NotNull(message = "花费类型，字典查询不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer costType;
+
+    /**
+     * 花费备注
+     */
+    private String remark;
+
+    /**
+     * 若为物料花费需要绑定物料id
+     */
+    private Long materialId;
+
+    /**
+     * 若为人工花费则绑定用户id
+     */
+    private Long userId;
+
+    /**
+     * 绑定财政收支id
+     */
+    private Long financeId;
+
+    /**
+     * 若为差旅报销绑定差旅id
+     */
+    private Long claimId;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaCostAll.java

@@ -0,0 +1,39 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询所有项目成本 返回对象
+ */
+@Data
+@AllArgsConstructor
+public class SysOaCostAll {
+
+    private Long projectId;
+
+    private String projectName;
+
+    private Double cost;
+
+    private Integer costType;
+
+    private String remark;
+
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date createTime;
+
+    private Long materialId;
+
+    private Long userId;
+
+    private Long financeId;
+
+    private Long claimId;
+
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaCostAllVo.java

@@ -0,0 +1,44 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 查询所有项目成本 返回对象
+ */
+@Data
+@AllArgsConstructor
+public class SysOaCostAllVo {
+
+    private Long projectId;
+
+    private String projectName;
+
+    private Double cost;
+
+    private Integer costType;
+
+    private String remark;
+
+    @JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
+    private Date createTime;
+
+    private Long materialId;
+
+    private Object materialVo;
+
+    private Long userId;
+
+    private Object userVo;
+
+    private Long claimId;
+
+    private Object claimVo;
+
+    private Long financeId;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaCostList.java

@@ -0,0 +1,20 @@
+package com.ruoyi.oa.domain.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysOaCostList {
+    private Long costId;
+    private Double cost;
+    private Long userId;
+    private Object userVo;
+    private Long materialId;
+    private Object materialVo;
+    private Long claimId;
+    private Object claimVo;
+    private Integer costType;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaCostRow.java

@@ -0,0 +1,13 @@
+package com.ruoyi.oa.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SysOaCostRow {
+    List<SysOaCostList> userCostList;
+    List<SysOaCostList> materialList;
+    List<SysOaCostList> claimList;
+    List<SysOaCostList> otherList;
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaCostVo.java

@@ -0,0 +1,80 @@
+package com.ruoyi.oa.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 项目成本分析视图对象 sys_oa_cost
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class SysOaCostVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long costId;
+
+    /**
+     * 绑定项目id
+     */
+    @ExcelProperty(value = "绑定项目id")
+    private Long projectId;
+
+    /**
+     * 花费
+     */
+    @ExcelProperty(value = "花费")
+    private Double cost;
+
+    /**
+     * 花费类型，字典查询
+     */
+    @ExcelProperty(value = "花费类型，字典查询", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "project_cost_type")
+    private Integer costType;
+
+    /**
+     * 花费备注
+     */
+    @ExcelProperty(value = "花费备注")
+    private String remark;
+
+    /**
+     * 若为物料花费需要绑定物料id
+     */
+    @ExcelProperty(value = "若为物料花费需要绑定物料id")
+    private Long materialId;
+
+    /**
+     * 若为人工花费则绑定用户id
+     */
+    @ExcelProperty(value = "若为人工花费则绑定用户id")
+    private Long userId;
+
+    /**
+     * 绑定财政收支id
+     */
+    @ExcelProperty(value = "绑定财政收支id")
+    private Long financeId;
+
+    /**
+     * 若为差旅报销绑定差旅id
+     */
+    @ExcelProperty(value = "若为差旅报销绑定差旅id")
+    private Long claimId;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaCostMapper.java

@@ -0,0 +1,28 @@
+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.oa.domain.SysOaCost;
+import com.ruoyi.oa.domain.vo.SysOaCostAll;
+import com.ruoyi.oa.domain.vo.SysOaCostAllVo;
+import com.ruoyi.oa.domain.vo.SysOaCostVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 项目成本分析Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+public interface SysOaCostMapper extends BaseMapperPlus<SysOaCostMapper, SysOaCost, SysOaCostVo> {
+
+
+    /**
+     * 查询所有项目成本
+     */
+    List<SysOaCostAll> AllList(@Param(value = "projectName") String projectName, @Param(value = "createTime") String createTime);
+
+
+    List<SysOaCost> getListByProjectId(Long projectId);
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/ISysOaCostService.java

@@ -0,0 +1,64 @@
+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.vo.SysOaCostAllVo;
+import com.ruoyi.oa.domain.vo.SysOaCostRow;
+import com.ruoyi.oa.domain.vo.SysOaCostVo;
+import com.ruoyi.oa.domain.bo.SysOaCostBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import javax.validation.constraints.NotNull;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 项目成本分析Service接口
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+public interface ISysOaCostService {
+
+    /**
+     * 查询项目成本分析
+     */
+    SysOaCostVo queryById(Long costId);
+
+    /**
+     * 查询项目成本分析列表
+     */
+    TableDataInfo<SysOaCostVo> queryPageList(SysOaCostBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询项目成本分析列表
+     */
+    List<SysOaCostVo> queryList(SysOaCostBo bo);
+
+    /**
+     * 新增项目成本分析
+     */
+    Boolean insertByBo(SysOaCostBo bo);
+
+    /**
+     * 修改项目成本分析
+     */
+    Boolean updateByBo(SysOaCostBo bo);
+
+    /**
+     * 校验并批量删除项目成本分析信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 查询所有项目成本
+     */
+    TableDataInfo<SysOaCostAllVo> AllList(String projectName, String createTime);
+
+    /**
+     * 查询详情
+     */
+    TableDataInfo<SysOaCostRow> getDetail(Long projectId);
+
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaCostServiceImpl.java

@@ -0,0 +1,212 @@
+package com.ruoyi.oa.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.oa.domain.SysOaProject;
+import com.ruoyi.oa.domain.vo.*;
+import com.ruoyi.oa.mapper.*;
+import com.ruoyi.system.mapper.SysUserMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.domain.bo.SysOaCostBo;
+import com.ruoyi.oa.domain.SysOaCost;
+import com.ruoyi.oa.service.ISysOaCostService;
+
+import java.util.*;
+
+/**
+ * 项目成本分析Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-03-04
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class SysOaCostServiceImpl implements ISysOaCostService {
+
+    private final SysOaCostMapper baseMapper;
+
+    private final SysUserMapper userMapper;
+
+    private final SysOaClaimMapper claimMapper;
+
+    private final SysOaWarehouseMapper warehouseMapper;
+
+
+    /**
+     * 查询项目成本分析
+     */
+    @Override
+    public SysOaCostVo queryById(Long costId){
+        return baseMapper.selectVoById(costId);
+    }
+
+    /**
+     * 查询项目成本分析列表
+     */
+    @Override
+    public TableDataInfo<SysOaCostVo> queryPageList(SysOaCostBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOaCost> lqw = buildQueryWrapper(bo);
+        Page<SysOaCostVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询项目成本分析列表
+     */
+    @Override
+    public List<SysOaCostVo> queryList(SysOaCostBo bo) {
+        LambdaQueryWrapper<SysOaCost> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysOaCost> buildQueryWrapper(SysOaCostBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysOaCost> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getProjectId() != null, SysOaCost::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getCost() != null, SysOaCost::getCost, bo.getCost());
+        lqw.eq(bo.getCostType() != null, SysOaCost::getCostType, bo.getCostType());
+        lqw.like(StringUtils.isNotBlank(bo.getRemark()), SysOaCost::getRemark, bo.getRemark());
+        lqw.eq(bo.getMaterialId() != null, SysOaCost::getMaterialId, bo.getMaterialId());
+        lqw.eq(bo.getUserId() != null, SysOaCost::getUserId, bo.getUserId());
+        lqw.eq(bo.getFinanceId() != null, SysOaCost::getFinanceId, bo.getFinanceId());
+        lqw.eq(bo.getClaimId() != null, SysOaCost::getClaimId, bo.getClaimId());
+        return lqw;
+    }
+
+    /**
+     * 新增项目成本分析
+     */
+    @Override
+    public Boolean insertByBo(SysOaCostBo bo) {
+        SysOaCost add = BeanUtil.toBean(bo, SysOaCost.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setCostId(add.getCostId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改项目成本分析
+     */
+    @Override
+    public Boolean updateByBo(SysOaCostBo bo) {
+        SysOaCost update = BeanUtil.toBean(bo, SysOaCost.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysOaCost entity){
+        //TODO 做一些数据校验,如唯一约束
+
+    }
+
+
+
+    /**
+     * 批量删除项目成本分析
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 查询所有项目成本
+     */
+
+    @Override
+    public TableDataInfo<SysOaCostAllVo> AllList(String projectName, String createTime) {
+
+        List<SysOaCostAll> alls = baseMapper.AllList(projectName,createTime);
+        List<SysOaCostAllVo> allVos = new java.util.ArrayList<>(Collections.emptyList());
+        if (alls.isEmpty()) return TableDataInfo.build(allVos);
+        for (SysOaCostAll all : alls) {
+            SysOaCostAllVo allVo = BeanUtil.toBean(all, SysOaCostAllVo.class);
+
+            // 车间用工
+            if (allVo.getCostType() == 1) {
+                allVo.setUserVo(userMapper.selectUserById(allVo.getUserId()));
+            } else if (allVo.getCostType() == 2) { // 差旅花费
+                allVo.setClaimVo(claimMapper.selectSysOaClaimVoById(allVo.getClaimId()));
+
+            } else if (allVo.getCostType() == 3) { // 库房物料
+                allVo.setMaterialVo(warehouseMapper.selectVoById(allVo.getMaterialId()));
+
+            } else if (allVo.getCostType() == 4) { // 其他
+
+
+            } else if (allVo.getCostType() == 5) { // 接待
+
+            }
+            allVos.add(allVo);
+        }
+        return TableDataInfo.build(allVos);
+    }
+
+    /**
+     * 查询详情
+     */
+    @Override
+    public TableDataInfo<SysOaCostRow> getDetail(Long projectId) {
+        log.info("查询projectId = {}", projectId);
+//        LambdaQueryWrapper<SysOaCost> lqw = Wrappers.lambdaQuery(SysOaCost.class);
+//        lqw.eq(SysOaCost::getProjectId,projectId);
+//        List<SysOaCost> costs = baseMapper.selectList(lqw);
+        List<SysOaCost> costs = baseMapper.getListByProjectId(projectId);
+        log.info("查询costs = {}", costs);
+
+        if (costs.isEmpty()) {
+            return TableDataInfo.build();
+        }
+        SysOaCostRow sysOaCostRow = new SysOaCostRow();
+        sysOaCostRow.setUserCostList(new ArrayList<>());
+        sysOaCostRow.setMaterialList(new ArrayList<>());
+        sysOaCostRow.setClaimList(new ArrayList<>());
+        sysOaCostRow.setOtherList(new ArrayList<>());
+        for(SysOaCost cost : costs) {
+            SysOaCostList sysOaCostList = BeanUtil.toBean(cost,SysOaCostList.class);
+            log.info("查询cost = {}", cost);
+            log.info("sysOaCostList = {}", sysOaCostList);
+
+            if(cost.getCostType() == 1) {
+                log.info("查询useVo = {}", userMapper.selectUserById(cost.getUserId()));
+                sysOaCostList.setUserVo(userMapper.selectUserById(cost.getUserId()));
+                sysOaCostRow.getUserCostList().add(sysOaCostList);
+            } else if(cost.getCostType() == 2) {
+                log.info("查询claimMapperVo = {}", claimMapper.selectSysOaClaimVoById(cost.getClaimId()));
+                sysOaCostList.setClaimVo(claimMapper.selectSysOaClaimVoById(cost.getClaimId()));
+                sysOaCostRow.getClaimList().add(sysOaCostList);
+            } else if(cost.getCostType() == 3) {
+                log.info("查询warehouseMapperVo = {}",warehouseMapper.selectVoById(cost.getMaterialId()));
+                sysOaCostList.setMaterialVo(warehouseMapper.selectVoById(cost.getMaterialId()));
+                sysOaCostRow.getMaterialList().add(sysOaCostList);
+            } else{
+                sysOaCostRow.getOtherList().add(sysOaCostList);
+            }
+
+        }
+        log.info("sysOaCostRow = {}", sysOaCostRow);
+        List<SysOaCostRow> rows = new java.util.ArrayList<>(Collections.singletonList(sysOaCostRow));
+        return TableDataInfo.build(rows);
+
+    }
+}

ruoyi-oa/src/main/resources/mapper/oa/SysOaCostMapper.xml

@@ -0,0 +1,44 @@
+<?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.oa.mapper.SysOaCostMapper">
+
+    <resultMap type="com.ruoyi.oa.domain.SysOaCost" id="SysOaCostResult">
+        <result property="costId" column="cost_id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="cost" column="cost"/>
+        <result property="costType" column="cost_type"/>
+        <result property="remark" column="remark"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="materialId" column="material_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="financeId" column="finance_id"/>
+        <result property="claimId" column="claim_id"/>
+    </resultMap>
+    <select id="AllList" resultType="com.ruoyi.oa.domain.vo.SysOaCostAll">
+    select op.project_id,op.project_name, cost, cost_type, oc.remark, oc.create_time, material_id, user_id, finance_id, claim_id
+    from sys_oa_cost oc
+    left join sys_oa_project op  on oc.project_id = op.project_id
+    <where>
+        <if test="projectName != null and projectName != ''">
+            and op.project_name like concat('%',#{projectName},'%')
+        </if>
+        <if test="createTime != null and createTime != '' ">
+            and oc.create_time like STR_TO_DATE(#{createTime}, '%Y-%m')
+        </if>
+        and del_flag is null
+    </where>
+    order by oc.update_time desc
+
+    </select>
+    <select id="getListByProjectId" resultType="com.ruoyi.oa.domain.SysOaCost">
+        select * from sys_oa_cost where project_id = #{projectId} and del_flag is null
+    </select>
+
+
+</mapper>

ruoyi-ui/src/views/dashboard/BarChart.vue

@@ -64,6 +64,7 @@ export default {
     this.chart.dispose();
     this.chart = null;
   },
+
   methods: {
     initChart() {
       this.chart = echarts.init(this.$el, 'macarons');
@@ -73,37 +74,41 @@ export default {
     updateData(projectList) {
       this.colors = projectList.map((item) => item.color);
       this.laborCosts = projectList.map((item) => item.laborCost);
-      this.projectNames = projectList.map((item) => item.projectName.replace(/(.{5})/g, '$1\n'));
+      this.projectNames = projectList.map((item) => item.projectName.replace(/(.{5})/g, '$1\n')); // 保持换行格式
     },
     setOption() {
       this.chart.setOption({
         tooltip: {
           trigger: 'axis',
-          axisPointer: {type: 'shadow'},
+          axisPointer: { type: 'shadow' },
+          formatter: (params) => { // 自定义 tooltip 格式
+            const { dataIndex } = params[0]; // 获取鼠标悬停的索引
+            const projectName = this.projectNames[dataIndex]; // 获取对应的项目名称
+            const laborCost = this.laborCosts[dataIndex]; // 获取对应的人工成本
+            return `${projectName}<br/>人工成本: ${laborCost} 人天`; // 显示项目名称和人工成本
+          },
         },
         grid: {
           top: 10,
           left: '2%',
-          right: '8%', // 增加右边距以适应标签
+          right: '8%',
           bottom: '3%',
           containLabel: true,
         },
         xAxis: {
           max: 'dataMax',
-          name: '人天', // 设置横坐标名称
-          nameLocation: 'middle', // 横坐标名称的位置
-          nameGap: 25, // 横坐标名称与轴线的距离
+          name: '人天',
+          nameLocation: 'middle',
+          nameGap: 25,
         },
         yAxis: {
           type: 'category',
           data: this.projectNames,
           inverse: true,
-          animationDuration: 300,
-          animationDurationUpdate: 300,
           axisLabel: {
-            rotate: 45, // 设置标签旋转角度，正值表示顺时针旋转
+            rotate: 45, // 设置标签旋转角度
             interval: 0, // 强制显示所有标签
-          }
+          },
         },
         series: [
           {
@@ -130,5 +135,6 @@ export default {
       });
     },
   },
+
 };
 </script>

ruoyi-ui/src/views/oa/apply/absence/index.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="流程分类" prop="category">
+              <el-select v-model="queryParams.category" clearable placeholder="请选择" size="small">
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.categoryId"
+                  :label="item.categoryName"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>-->
+      <el-form-item label="提交时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        ></el-date-picker>
+      </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
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="btnLoading"
+          @click="handleStart"
+        >发起请假
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="请假事由" align="left" prop="procVars" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />-->
+      <el-table-column label="当前节点" width="150" align="center" prop="taskName"/>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="当前状态" align="center" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wf_process_status" :value="scope.row.processStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="耗时" align="center" prop="duration" width="130"/>
+      <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-tickets"
+            @click="handleFlowRecord(scope.row)"
+            v-hasPermi="['workflow:process:query']"
+          >详情
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.finishTime"
+            v-hasPermi="['workflow:process:remove']"
+          >删除
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-circle-close"
+            @click="handleStop(scope.row)"
+            v-hasPermi="['workflow:process:cancel']"
+          >取消
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-refresh-right"
+            v-hasPermi="['workflow:process:start']"
+            @click="handleAgain(scope.row)"
+          >重新发起
+          </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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {listOwnProcess, stopProcess, delProcess, listProcess} from '@/api/workflow/process';
+import {listAllCategory} from '@/api/workflow/category';
+import {detailProcess} from '@/api/workflow/process'
+
+export default {
+  name: "Own",
+  dicts: ['wf_process_status'],
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      processLoading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      categoryOptions: [],
+      processTotal: 0,
+      // 我发起的流程列表数据
+      ownProcessList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      process: {},
+      src: "",
+      definitionList: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: undefined,
+        category: "absence"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      btnLoading:true
+    };
+  },
+  created() {
+    this.getCategoryList();
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
+  methods: {
+
+    handleStart() {
+      const row = this.process
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deploymentId,
+        query: {
+          definitionId: row.definitionId,
+        }
+      })
+    },
+    /** 查询流程分类列表 */
+    getCategoryList() {
+      listAllCategory().then(response => this.categoryOptions = response.data)
+    },
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      this.btnLoading = true;
+      listOwnProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        listProcess(this.queryParams).then(response => {
+          this.process = response.rows[response.rows.length - 1];
+          this.btnLoading = false;
+        })
+        this.ownProcessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /**流程标题搜索**/
+    searchList(list, str) {
+      let arr = [];
+      list.forEach((item) => {
+        if (item.procVars.description.indexOf(str) > -1) {
+          arr.push(item)
+        }
+      })
+      return arr;
+    },
+
+    //对象数组排序（文本类）
+    /*    compare(propertyName, order) {
+          return function (object1, object2) {
+            var value1 = object1[propertyName];
+            var value2 = object2[propertyName];
+            if (order == 0) {
+              if (value2 < value1) {
+                return -1;
+              } else if (value2 > value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+            if (order == 1) {
+              if (value2 > value1) {
+                return -1;
+              } else if (value2 < value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+
+          }
+        },*/
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.procInsId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    handleAgain(row) {
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deployId,
+        query: {
+          definitionId: row.procDefId,
+          procInsId: row.procInsId
+        }
+      })
+      // console.log(row);
+    },
+    /**  取消流程申请 */
+    handleStop(row) {
+      const params = {
+        procInsId: row.procInsId
+      }
+      stopProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
+        this.getList();
+      });
+    },
+    /** 流程流转记录 */
+    handleFlowRecord(row) {
+      this.$router.push({
+        path: '/workflow/process/detail/' + row.procInsId,
+        query: {
+          processed: false
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.procInsId || this.ids;
+      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delProcess(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('workflow/process/ownExport', {
+        ...this.queryParams
+      }, `wf_own_process_${new Date().getTime()}.xlsx`)
+    },
+    categoryFormat(row, column) {
+      return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/oa/apply/entertain/index.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="流程分类" prop="category">
+              <el-select v-model="queryParams.category" clearable placeholder="请选择" size="small">
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.categoryId"
+                  :label="item.categoryName"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>-->
+      <el-form-item label="提交时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        ></el-date-picker>
+      </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
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="btnLoading"
+          @click="handleStart"
+        >发起招待申请
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="招待事由" align="left" prop="procVars" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />-->
+      <el-table-column label="当前节点" width="150" align="center" prop="taskName"/>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="当前状态" align="center" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wf_process_status" :value="scope.row.processStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="耗时" align="center" prop="duration" width="130"/>
+      <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-tickets"
+            @click="handleFlowRecord(scope.row)"
+            v-hasPermi="['workflow:process:query']"
+          >详情
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.finishTime"
+            v-hasPermi="['workflow:process:remove']"
+          >删除
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-circle-close"
+            @click="handleStop(scope.row)"
+            v-hasPermi="['workflow:process:cancel']"
+          >取消
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-refresh-right"
+            v-hasPermi="['workflow:process:start']"
+            @click="handleAgain(scope.row)"
+          >重新发起
+          </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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {listOwnProcess, stopProcess, delProcess, listProcess} from '@/api/workflow/process';
+import {listAllCategory} from '@/api/workflow/category';
+import {detailProcess} from '@/api/workflow/process'
+
+export default {
+  name: "Own",
+  dicts: ['wf_process_status'],
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      processLoading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      categoryOptions: [],
+      processTotal: 0,
+      // 我发起的流程列表数据
+      ownProcessList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      process: {},
+      src: "",
+      definitionList: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: undefined,
+        category: "entertain"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      btnLoading:true
+    };
+  },
+  created() {
+    this.getCategoryList();
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
+  methods: {
+
+    handleStart() {
+      const row = this.process
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deploymentId,
+        query: {
+          definitionId: row.definitionId,
+        }
+      })
+    },
+    /** 查询流程分类列表 */
+    getCategoryList() {
+      listAllCategory().then(response => this.categoryOptions = response.data)
+    },
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      this.btnLoading = true;
+      listOwnProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        listProcess(this.queryParams).then(response => {
+          this.process = response.rows[response.rows.length - 1];
+          this.btnLoading = false;
+        })
+        this.ownProcessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /**流程标题搜索**/
+    searchList(list, str) {
+      let arr = [];
+      list.forEach((item) => {
+        if (item.procVars.description.indexOf(str) > -1) {
+          arr.push(item)
+        }
+      })
+      return arr;
+    },
+
+    //对象数组排序（文本类）
+    /*    compare(propertyName, order) {
+          return function (object1, object2) {
+            var value1 = object1[propertyName];
+            var value2 = object2[propertyName];
+            if (order == 0) {
+              if (value2 < value1) {
+                return -1;
+              } else if (value2 > value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+            if (order == 1) {
+              if (value2 > value1) {
+                return -1;
+              } else if (value2 < value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+
+          }
+        },*/
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.procInsId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    handleAgain(row) {
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deployId,
+        query: {
+          definitionId: row.procDefId,
+          procInsId: row.procInsId
+        }
+      })
+      // console.log(row);
+    },
+    /**  取消流程申请 */
+    handleStop(row) {
+      const params = {
+        procInsId: row.procInsId
+      }
+      stopProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
+        this.getList();
+      });
+    },
+    /** 流程流转记录 */
+    handleFlowRecord(row) {
+      this.$router.push({
+        path: '/workflow/process/detail/' + row.procInsId,
+        query: {
+          processed: false
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.procInsId || this.ids;
+      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delProcess(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('workflow/process/ownExport', {
+        ...this.queryParams
+      }, `wf_own_process_${new Date().getTime()}.xlsx`)
+    },
+    categoryFormat(row, column) {
+      return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/oa/apply/other/index.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="流程分类" prop="category">
+              <el-select v-model="queryParams.category" clearable placeholder="请选择" size="small">
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.categoryId"
+                  :label="item.categoryName"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>-->
+      <el-form-item label="提交时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        ></el-date-picker>
+      </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
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="btnLoading"
+          @click="handleStart"
+        >发起申请
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="申请事由" align="left" prop="procVars" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />-->
+      <el-table-column label="当前节点" width="150" align="center" prop="taskName"/>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="当前状态" align="center" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wf_process_status" :value="scope.row.processStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="耗时" align="center" prop="duration" width="130"/>
+      <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-tickets"
+            @click="handleFlowRecord(scope.row)"
+            v-hasPermi="['workflow:process:query']"
+          >详情
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.finishTime"
+            v-hasPermi="['workflow:process:remove']"
+          >删除
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-circle-close"
+            @click="handleStop(scope.row)"
+            v-hasPermi="['workflow:process:cancel']"
+          >取消
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-refresh-right"
+            v-hasPermi="['workflow:process:start']"
+            @click="handleAgain(scope.row)"
+          >重新发起
+          </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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {listOwnProcess, stopProcess, delProcess, listProcess} from '@/api/workflow/process';
+import {listAllCategory} from '@/api/workflow/category';
+import {detailProcess} from '@/api/workflow/process'
+
+export default {
+  name: "Own",
+  dicts: ['wf_process_status'],
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      processLoading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      categoryOptions: [],
+      processTotal: 0,
+      // 我发起的流程列表数据
+      ownProcessList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      process: {},
+      src: "",
+      definitionList: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: undefined,
+        category: "other"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      btnLoading:true
+    };
+  },
+  created() {
+    this.getCategoryList();
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
+  methods: {
+
+    handleStart() {
+      const row = this.process
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deploymentId,
+        query: {
+          definitionId: row.definitionId,
+        }
+      })
+    },
+    /** 查询流程分类列表 */
+    getCategoryList() {
+      listAllCategory().then(response => this.categoryOptions = response.data)
+    },
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      this.btnLoading = true;
+      listOwnProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        listProcess(this.queryParams).then(response => {
+          this.process = response.rows[response.rows.length - 1];
+          this.btnLoading = false;
+        })
+        this.ownProcessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /**流程标题搜索**/
+    searchList(list, str) {
+      let arr = [];
+      list.forEach((item) => {
+        if (item.procVars.description.indexOf(str) > -1) {
+          arr.push(item)
+        }
+      })
+      return arr;
+    },
+
+    //对象数组排序（文本类）
+    /*    compare(propertyName, order) {
+          return function (object1, object2) {
+            var value1 = object1[propertyName];
+            var value2 = object2[propertyName];
+            if (order == 0) {
+              if (value2 < value1) {
+                return -1;
+              } else if (value2 > value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+            if (order == 1) {
+              if (value2 > value1) {
+                return -1;
+              } else if (value2 < value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+
+          }
+        },*/
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.procInsId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    handleAgain(row) {
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deployId,
+        query: {
+          definitionId: row.procDefId,
+          procInsId: row.procInsId
+        }
+      })
+      // console.log(row);
+    },
+    /**  取消流程申请 */
+    handleStop(row) {
+      const params = {
+        procInsId: row.procInsId
+      }
+      stopProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
+        this.getList();
+      });
+    },
+    /** 流程流转记录 */
+    handleFlowRecord(row) {
+      this.$router.push({
+        path: '/workflow/process/detail/' + row.procInsId,
+        query: {
+          processed: false
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.procInsId || this.ids;
+      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delProcess(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('workflow/process/ownExport', {
+        ...this.queryParams
+      }, `wf_own_process_${new Date().getTime()}.xlsx`)
+    },
+    categoryFormat(row, column) {
+      return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/oa/apply/seal/index.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <!--      <el-form-item label="流程分类" prop="category">
+              <el-select v-model="queryParams.category" clearable placeholder="请选择" size="small">
+                <el-option
+                  v-for="item in categoryOptions"
+                  :key="item.categoryId"
+                  :label="item.categoryName"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </el-form-item>-->
+      <el-form-item label="提交时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+        ></el-date-picker>
+      </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
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="btnLoading"
+          @click="handleStart"
+        >发起用印申请
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="ownProcessList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <!--      <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="用印事由" align="left" prop="procVars" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column label="流程类别" align="center" prop="category" :formatter="categoryFormat" />-->
+      <el-table-column label="当前节点" width="150" align="center" prop="taskName"/>
+      <el-table-column label="提交时间" align="center" prop="createTime" width="160"/>
+      <el-table-column label="当前状态" align="center" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.wf_process_status" :value="scope.row.processStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="耗时" align="center" prop="duration" width="130"/>
+      <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-tickets"
+            @click="handleFlowRecord(scope.row)"
+            v-hasPermi="['workflow:process:query']"
+          >详情
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-if="scope.row.finishTime"
+            v-hasPermi="['workflow:process:remove']"
+          >删除
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-circle-close"
+            @click="handleStop(scope.row)"
+            v-hasPermi="['workflow:process:cancel']"
+          >取消
+          </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            icon="el-icon-refresh-right"
+            v-hasPermi="['workflow:process:start']"
+            @click="handleAgain(scope.row)"
+          >重新发起
+          </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"
+    />
+
+  </div>
+</template>
+
+<script>
+import {listOwnProcess, stopProcess, delProcess, listProcess} from '@/api/workflow/process';
+import {listAllCategory} from '@/api/workflow/category';
+import {detailProcess} from '@/api/workflow/process'
+
+export default {
+  name: "Own",
+  dicts: ['wf_process_status'],
+  components: {},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      processLoading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      categoryOptions: [],
+      processTotal: 0,
+      // 我发起的流程列表数据
+      ownProcessList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      process: {},
+      src: "",
+      definitionList: [],
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        processKey: undefined,
+        processName: undefined,
+        category: "seal"
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      btnLoading:true
+    };
+  },
+  created() {
+    this.getCategoryList();
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
+  methods: {
+
+    handleStart() {
+      const row = this.process
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deploymentId,
+        query: {
+          definitionId: row.definitionId,
+        }
+      })
+    },
+    /** 查询流程分类列表 */
+    getCategoryList() {
+      listAllCategory().then(response => this.categoryOptions = response.data)
+    },
+    /** 查询流程定义列表 */
+    getList() {
+      this.loading = true;
+      this.btnLoading = true;
+      listOwnProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        listProcess(this.queryParams).then(response => {
+          this.process = response.rows[response.rows.length - 1];
+          this.btnLoading = false;
+        })
+        this.ownProcessList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    /**流程标题搜索**/
+    searchList(list, str) {
+      let arr = [];
+      list.forEach((item) => {
+        if (item.procVars.description.indexOf(str) > -1) {
+          arr.push(item)
+        }
+      })
+      return arr;
+    },
+
+    //对象数组排序（文本类）
+    /*    compare(propertyName, order) {
+          return function (object1, object2) {
+            var value1 = object1[propertyName];
+            var value2 = object2[propertyName];
+            if (order == 0) {
+              if (value2 < value1) {
+                return -1;
+              } else if (value2 > value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+            if (order == 1) {
+              if (value2 > value1) {
+                return -1;
+              } else if (value2 < value1) {
+                return 1;
+              } else {
+                return 0;
+              }
+            }
+
+          }
+        },*/
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        category: null,
+        key: null,
+        tenantId: null,
+        deployTime: null,
+        derivedFrom: null,
+        derivedFromRoot: null,
+        parentDeploymentId: null,
+        engineVersion: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.procInsId);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    handleAgain(row) {
+      this.$router.push({
+        path: '/workflow/process/start/' + row.deployId,
+        query: {
+          definitionId: row.procDefId,
+          procInsId: row.procInsId
+        }
+      })
+      // console.log(row);
+    },
+    /**  取消流程申请 */
+    handleStop(row) {
+      const params = {
+        procInsId: row.procInsId
+      }
+      stopProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
+        this.getList();
+      });
+    },
+    /** 流程流转记录 */
+    handleFlowRecord(row) {
+      this.$router.push({
+        path: '/workflow/process/detail/' + row.procInsId,
+        query: {
+          processed: false
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.procInsId || this.ids;
+      this.$confirm('是否确认删除流程定义编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delProcess(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('workflow/process/ownExport', {
+        ...this.queryParams
+      }, `wf_own_process_${new Date().getTime()}.xlsx`)
+    },
+    categoryFormat(row, column) {
+      return this.categoryOptions.find(k => k.code === row.category)?.categoryName ?? '';
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/oa/attendance/index.vue

@@ -161,7 +161,8 @@
             <el-button @click="calcWork"
                        element-loading-text="正在计算，请稍等"
                        v-loading.fullscreen.lock="fullscreenLoading"
-            >计算</el-button>
+            >计算
+            </el-button>
           </el-col>
         </el-row>
 
@@ -231,7 +232,7 @@
             </div>
 
             <!-- 月度工作情况表格 -->
-            <h2>{{ date.getMonth()+1 }} 月度工作签到情况</h2>
+            <h2>{{ date.getMonth() + 1 }} 月度工作签到情况</h2>
 
 
             <el-descriptions class="margin-top" title="报告详情" :column="3" :size="size" border>
@@ -389,7 +390,7 @@ export default {
       calcResultAttendances: [],
       calcResultProject: {},
       projects: [],
-      fullscreenLoading:false,
+      fullscreenLoading: false,
 
     }
   },
@@ -470,7 +471,7 @@ export default {
           projectId: 0,
           userId: this.selectUser.userId,
           attendanceDay: this.selectIndex,
-          selectTime:this.queryParams.selectTime
+          selectTime: this.queryParams.selectTime
         }
         addOaAttendance(this.form).then(res => {
           this.getList()
@@ -481,7 +482,7 @@ export default {
         this.form = {
           projectId: 0,
           attendanceDay: this.selectIndex,
-          selectTime:this.queryParams.selectTime
+          selectTime: this.queryParams.selectTime
         }
         // 集体赋予状态
         addBatchOaAttendance(this.form).then(res => {
@@ -496,7 +497,7 @@ export default {
           projectId: 1,
           userId: this.selectUser.userId,
           attendanceDay: this.selectIndex,
-          selectTime:this.queryParams.selectTime
+          selectTime: this.queryParams.selectTime
         }
         addOaAttendance(this.form).then(res => {
           this.getList()
@@ -507,7 +508,7 @@ export default {
         this.form = {
           projectId: 1,
           attendanceDay: this.selectIndex,
-          selectTime:this.queryParams.selectTime
+          selectTime: this.queryParams.selectTime
         }
         // 集体赋予状态
         addBatchOaAttendance(this.form).then(res => {
@@ -609,7 +610,7 @@ export default {
           attendanceDay: this.selectIndex,
           dayLength: this.timeFlag === 0 ? this.form.dayLength : undefined,
           hour: this.timeFlag === 1 ? this.form.hour : undefined,
-          selectTime:this.queryParams.selectTime
+          selectTime: this.queryParams.selectTime
         }
         addOaAttendance(this.form).then(res => {
           this.selectUser = this.selectArrayIndex >= this.userList.length - 1 ? this.selectUser : this.userList[this.selectArrayIndex + 1]
@@ -624,7 +625,7 @@ export default {
           attendanceDay: this.selectIndex,
           dayLength: this.timeFlag === 0 ? this.form.dayLength : undefined,
           hour: this.timeFlag === 1 ? this.form.hour : undefined,
-          selectTime:this.queryParams.selectTime
+          selectTime: this.queryParams.selectTime
         }
         // 集体赋予状态
         addBatchOaAttendance(this.form).then(res => {

ruoyi-ui/src/views/oa/claim/detail.vue

@@ -18,6 +18,28 @@
                 <el-form-item label="审批意见" prop="comment">
                   <el-input type="textarea" :rows="5" v-model="taskForm.comment" placeholder="请输入 审批意见" />
                 </el-form-item>
+                <el-form-item label="抄送人" prop="copyUserIds">
+                  <el-tag
+                    :key="index"
+                    v-for="(item, index) in copyUser"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose('copy', item)">
+                    {{ item.nickName }}
+                  </el-tag>
+                  <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectCopyUsers" />
+                </el-form-item>
+                <el-form-item label="指定审批人" prop="copyUserIds">
+                  <el-tag
+                    :key="index"
+                    v-for="(item, index) in nextUser"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose('next', item)">
+                    {{ item.nickName }}
+                  </el-tag>
+                  <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectNextUsers" />
+                </el-form-item>
               </el-form>
             </el-col>
           </el-row>
@@ -251,13 +273,7 @@
           />
         </el-card>
       </el-tab-pane>
-
-
     </el-tabs>
-
-
-
-
   </div>
 </template>
 

ruoyi-ui/src/views/workflow/work/detail.vue

@@ -19,12 +19,34 @@
             <el-col :span="20" :offset="2">
               <el-form ref="taskForm" :model="taskForm" :rules="rules" label-width="120px">
                 <el-form-item label="审批意见" prop="comment">
-                  <el-input type="textarea" :rows="5" v-model="taskForm.comment" placeholder="请输入 审批意见" />
+                  <el-input type="textarea" :rows="5" v-model="taskForm.comment" placeholder="请输入 审批意见"/>
+                </el-form-item>
+              <el-form-item label="抄送人" prop="copyUserIds">
+                  <el-tag
+                    :key="index"
+                    v-for="(item, index) in copyUser"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose('copy', item)">
+                    {{ item.nickName }}
+                  </el-tag>
+                  <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectCopyUsers" />
+                </el-form-item>
+                <el-form-item label="指定审批人" prop="copyUserIds">
+                  <el-tag
+                    :key="index"
+                    v-for="(item, index) in nextUser"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose('next', item)">
+                    {{ item.nickName }}
+                  </el-tag>
+                  <el-button class="button-new-tag" type="primary" icon="el-icon-plus" size="mini" circle @click="onSelectNextUsers" />
                 </el-form-item>
               </el-form>
             </el-col>
           </el-row>
-          <el-row :gutter="10" type="flex" justify="center" >
+          <el-row :gutter="10" type="flex" justify="center">
             <el-col :span="1.5">
               <el-button icon="el-icon-circle-check" type="success" @click="handleComplete">通过</el-button>
             </el-col>
@@ -42,44 +64,47 @@
       </el-tab-pane>
 
       <el-tab-pane label="表单信息" name="form">
-        <div  v-loading="loading">
+        <div v-loading="loading">
           <el-card class="box-card" shadow="never" v-for="(formInfo, index) in processFormList" :key="index">
             <div slot="header" class="clearfix">
               <span>{{ formInfo.title }}</span>
             </div>
             <!--流程处理表单模块-->
             <el-col :span="20" :offset="2">
-              <parser :form-conf="formInfo" v-if="formType===''"/>
-                <claim-detail :form="form" :detailList="detailList" v-if="formType ==='claim'"></claim-detail>
+              <claim-detail :form="form" :detailList="detailList" v-if="formType ==='claim'"></claim-detail>
+              <parser :form-conf="formInfo" v-else/>
             </el-col>
           </el-card>
         </div>
-      </el-tab-pane >
+      </el-tab-pane>
 
       <el-tab-pane label="流转记录" name="record">
 
-        <div class="title-record">流程标题：{{processTitleValue}}</div>
+        <div class="title-record">流程标题：{{ processTitleValue }}</div>
 
         <el-card class="box-card" shadow="never">
           <el-col :span="20" :offset="2">
             <div class="block">
               <el-timeline>
-                <el-timeline-item v-for="(item,index) in historyProcNodeList" :key="index" :icon="setIcon(item.endTime)" :color="setColor(item.endTime)">
+                <el-timeline-item v-for="(item,index) in historyProcNodeList" :key="index" :icon="setIcon(item.endTime)"
+                                  :color="setColor(item.endTime)">
                   <p style="font-weight: 700">{{ item.activityName }}</p>
                   <el-card v-if="item.activityType === 'startEvent'" class="box-card" shadow="hover">
                     {{ item.assigneeName }} 在 {{ item.createTime }} 发起流程
                   </el-card>
                   <el-card v-if="item.activityType === 'userTask'" class="box-card" shadow="hover">
                     <el-descriptions :column="5" :labelStyle="{'font-weight': 'bold'}">
-                      <el-descriptions-item label="实际办理">{{ item.assigneeName || '-'}}</el-descriptions-item>
-<!--                      <el-descriptions-item label="候选办理">{{ item.candidate || '-'}}</el-descriptions-item>-->
-                      <el-descriptions-item label="接收时间">{{ item.createTime || '-'}}</el-descriptions-item>
+                      <el-descriptions-item label="实际办理">{{ item.assigneeName || '-' }}</el-descriptions-item>
+                      <!--                      <el-descriptions-item label="候选办理">{{ item.candidate || '-'}}</el-descriptions-item>-->
+                      <el-descriptions-item label="接收时间">{{ item.createTime || '-' }}</el-descriptions-item>
                       <el-descriptions-item label="办结时间">{{ item.endTime || '-' }}</el-descriptions-item>
-                      <el-descriptions-item label="耗时">{{ item.duration || '-'}}</el-descriptions-item>
+                      <el-descriptions-item label="耗时">{{ item.duration || '-' }}</el-descriptions-item>
                     </el-descriptions>
                     <div v-if="item.commentList && item.commentList.length > 0">
                       <el-divider content-position="left">
-                        <el-tag :type="approveTypeTag(item.commentList[0].type)" size="mini">{{ commentType(item.commentList[0].type) }}</el-tag>
+                        <el-tag :type="approveTypeTag(item.commentList[0].type)" size="mini">
+                          {{ commentType(item.commentList[0].type) }}
+                        </el-tag>
                         <el-tag type="info" effect="plain" size="mini">{{ item.commentList[0].time }}</el-tag>
                       </el-divider>
                       <span>{{ item.commentList[0].fullMessage }}</span>
@@ -108,14 +133,15 @@
 
     <!--退回流程-->
     <el-dialog :title="returnTitle" :visible.sync="returnOpen" width="40%" append-to-body>
-      <el-form ref="taskForm" :model="taskForm" label-width="80px" >
+      <el-form ref="taskForm" :model="taskForm" label-width="80px">
         <el-form-item label="退回节点" prop="targetKey">
           <el-radio-group v-model="taskForm.targetKey">
             <el-radio-button
               v-for="item in returnTaskList"
               :key="item.id"
               :label="item.id"
-            >{{item.name}}</el-radio-button>
+            >{{ item.name }}
+            </el-radio-button>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -134,7 +160,8 @@
               <span>部门列表</span>
             </div>
             <div class="head-container">
-              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"/>
+              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small"
+                        prefix-icon="el-icon-search"/>
               <el-tree
                 :data="deptOptions"
                 :props="deptProps"
@@ -156,15 +183,15 @@
                     highlight-current-row
                     @current-change="changeCurrentUser"
                     @selection-change="handleSelectionChange">
-            <el-table-column v-if="userData.type === 'copy' || userData.type === 'next'" width="55" type="selection" />
+            <el-table-column v-if="userData.type === 'copy' || userData.type === 'next'" width="55" type="selection"/>
             <el-table-column v-else width="30">
               <template slot-scope="scope">
-                <el-radio :label="scope.row.userId" v-model="currentUserId">{{''}}</el-radio>
+                <el-radio :label="scope.row.userId" v-model="currentUserId">{{ '' }}</el-radio>
               </template>
             </el-table-column>
-            <el-table-column label="用户名" align="center" prop="nickName" />
-            <el-table-column label="手机" align="center" prop="phonenumber" />
-            <el-table-column label="部门" align="center" prop="dept.deptName" />
+            <el-table-column label="用户名" align="center" prop="nickName"/>
+            <el-table-column label="手机" align="center" prop="phonenumber"/>
+            <el-table-column label="部门" align="center" prop="dept.deptName"/>
           </el-table>
           <pagination
             :total="total"
@@ -183,10 +210,10 @@
 </template>
 
 <script>
-import { detailProcess } from '@/api/workflow/process'
+import {detailProcess} from '@/api/workflow/process'
 import Parser from '@/utils/generator/parser'
-import { complete, delegate, transfer, rejectTask, returnList, returnTask } from '@/api/workflow/task'
-import { selectUser, deptTreeSelect } from '@/api/system/user'
+import {complete, delegate, transfer, rejectTask, returnList, returnTask} from '@/api/workflow/task'
+import {selectUser, deptTreeSelect} from '@/api/system/user'
 import ProcessViewer from '@/components/ProcessViewer'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Treeselect from '@riophae/vue-treeselect'
@@ -206,26 +233,40 @@ export default {
     commentType() {
       return val => {
         switch (val) {
-          case '1': return '通过'
-          case '2': return '退回'
-          case '3': return '驳回'
-          case '4': return '委派'
-          case '5': return '转办'
-          case '6': return '终止'
-          case '7': return '撤回'
+          case '1':
+            return '通过'
+          case '2':
+            return '退回'
+          case '3':
+            return '驳回'
+          case '4':
+            return '委派'
+          case '5':
+            return '转办'
+          case '6':
+            return '终止'
+          case '7':
+            return '撤回'
         }
       }
     },
     approveTypeTag() {
       return val => {
         switch (val) {
-          case '1': return 'success'
-          case '2': return 'warning'
-          case '3': return 'danger'
-          case '4': return 'primary'
-          case '5': return 'success'
-          case '6': return 'danger'
-          case '7': return 'info'
+          case '1':
+            return 'success'
+          case '2':
+            return 'warning'
+          case '3':
+            return 'danger'
+          case '4':
+            return 'primary'
+          case '5':
+            return 'success'
+          case '6':
+            return 'danger'
+          case '7':
+            return 'info'
         }
       }
     }
@@ -263,16 +304,16 @@ export default {
       total: 0,
       // 遮罩层
       loading: true,
-      taskForm:{
-        comment:"", // 意见内容
+      taskForm: {
+        comment: "", // 意见内容
         procInsId: "", // 流程实例编号
-        taskId: "" ,// 流程任务编号
+        taskId: "",// 流程任务编号
         copyUserIds: "", // 抄送人Id
         vars: "",
-        targetKey:""
+        targetKey: ""
       },
       rules: {
-        comment: [{ required: true, message: '请输入审批意见', trigger: 'blur' }],
+        comment: [{required: true, message: '请输入审批意见', trigger: 'blur'}],
       },
       currentUserId: null,
       variables: [], // 流程变量数据
@@ -297,9 +338,9 @@ export default {
       userMultipleSelection: [],
       userDialogTitle: '',
       userOpen: false,
-      formType:"",
-      form:{},
-      detailList:[]
+      formType: "",
+      form: {},
+      detailList: []
     };
   },
   created() {
@@ -307,16 +348,16 @@ export default {
   },
   methods: {
     initData() {
-      this.loading=true
+      this.loading = true
       this.taskForm.procInsId = this.$route.params && this.$route.params.procInsId;
-      this.taskForm.taskId  = this.$route.query && this.$route.query.taskId;
+      this.taskForm.taskId = this.$route.query && this.$route.query.taskId;
       this.formType = this.$route.query.category;
       this.processed = this.$route.query && eval(this.$route.query.processed || false);
-      if (this.$route.query.category==='claim'){
-        getOaClaimByProcInsId(this.$route.params.procInsId).then(res=>{
+      if (this.$route.query.category === 'claim') {
+        getOaClaimByProcInsId(this.$route.params.procInsId).then(res => {
           this.form = res.data
           this.detailList = res.data.detailList
-          this.loading=false
+          this.loading = false
         })
       }
       // 流程任务重获取变量表单
@@ -369,7 +410,7 @@ export default {
     },
     toggleSelection(selection) {
       if (selection && selection.length > 0) {
-        this.$nextTick(()=> {
+        this.$nextTick(() => {
           selection.forEach(item => {
             let row = this.userList.find(k => k.userId === item.userId);
             this.$refs.userTable.toggleRowSelection(row);
@@ -421,6 +462,7 @@ export default {
     getProcessDetails(procInsId, taskId) {
       const params = {procInsId: procInsId, taskId: taskId}
       detailProcess(params).then(res => {
+        console.log(res.data)
         const data = res.data;
         this.xmlData = data.bpmnXml;
         this.processFormList = data.processFormList;
@@ -432,6 +474,7 @@ export default {
         this.finishedInfo = data.flowViewer;
         this.formOpen = true
         this.processTitleValue = data.processFormList[0].fields[0].__config__.defaultValue;
+        this.loading = false
       })
     },
     onSelectCopyUsers() {
@@ -488,7 +531,7 @@ export default {
       })
     },
     /** 转办任务 */
-    handleTransfer(){
+    handleTransfer() {
       this.$refs["taskForm"].validate(valid => {
         if (valid) {
           this.userData.type = 'transfer';
@@ -503,7 +546,7 @@ export default {
       this.$refs["taskForm"].validate(valid => {
         if (valid) {
           const _this = this;
-          this.$modal.confirm('拒绝审批单流程会终止，是否继续？').then(function() {
+          this.$modal.confirm('拒绝审批单流程会终止，是否继续？').then(function () {
             return rejectTask(_this.taskForm);
           }).then(res => {
             this.$modal.msgSuccess(res.msg);
@@ -623,6 +666,7 @@ export default {
   display: table;
   content: "";
 }
+
 .clearfix:after {
   clear: both
 }
@@ -638,10 +682,12 @@ export default {
 
 .el-row {
   margin-bottom: 20px;
+
   &:last-child {
     margin-bottom: 0;
   }
 }
+
 .el-col {
   border-radius: 4px;
 }
@@ -649,7 +695,12 @@ export default {
 .button-new-tag {
   margin-left: 10px;
 }
-.title-record{font-size: 16px; padding: 10px 0; color: #1ab394}
+
+.title-record {
+  font-size: 16px;
+  padding: 10px 0;
+  color: #1ab394
+}
 
 
 </style>

ruoyi-ui/src/views/workflow/work/own.vue

@@ -205,7 +205,6 @@ export default {
     getList() {
       this.loading = true;
       listOwnProcess(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        // console.log(5555,response.rows)
         this.ownProcessList = response.rows;
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/workflow/work/start.vue

@@ -77,12 +77,16 @@ export default {
         // 启动流程并将表单数据加入流程变量
         startProcess(this.definitionId, JSON.stringify(data.valData)).then(res => {
           this.$modal.msgSuccess(res.msg);
-          this.$tab.closeOpenPage({
-            path: '/work/own'
-          })
+          this.goBack()
         })
       }
-    }
+    },
+    /** 返回页面 */
+    goBack() {
+      // 关闭当前标签页并返回上个页面
+      this.$tab.closePage(this.$route)
+      this.$router.back()
+    },
   }
 }
 </script>