采购流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcureApprovalController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.oa.domain.CmcProcureApproval;
+import com.ruoyi.oa.service.ICmcProcureApprovalService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 采购审批Controller
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+@RestController
+@RequestMapping("/oa/procureApproval")
+public class CmcProcureApprovalController extends BaseController
+{
+    @Autowired
+    private ICmcProcureApprovalService cmcProcureApprovalService;
+
+    /**
+     * 查询采购审批列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProcureApproval cmcProcureApproval)
+    {
+        startPage();
+        List<CmcProcureApproval> list = cmcProcureApprovalService.selectCmcProcureApprovalList(cmcProcureApproval);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出采购审批列表
+     */
+    @Log(title = "采购审批", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProcureApproval cmcProcureApproval)
+    {
+        List<CmcProcureApproval> list = cmcProcureApprovalService.selectCmcProcureApprovalList(cmcProcureApproval);
+        ExcelUtil<CmcProcureApproval> util = new ExcelUtil<CmcProcureApproval>(CmcProcureApproval.class);
+        util.exportExcel(response, list, "采购审批数据");
+    }
+
+    /**
+     * 获取采购审批详细信息
+     */
+    @GetMapping(value = "/{procureApplyId}")
+    public AjaxResult getInfo(@PathVariable("procureApplyId") String procureApplyId)
+    {
+        return success(cmcProcureApprovalService.selectCmcProcureApprovalByProcureApplyId(procureApplyId));
+    }
+
+    /**
+     * 新增采购审批
+     */
+    @Log(title = "采购审批", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProcureApproval cmcProcureApproval)
+    {
+        return toAjax(cmcProcureApprovalService.insertCmcProcureApproval(cmcProcureApproval));
+    }
+
+    /**
+     * 修改采购审批
+     */
+    @Log(title = "采购审批", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProcureApproval cmcProcureApproval)
+    {
+        return toAjax(cmcProcureApprovalService.updateCmcProcureApproval(cmcProcureApproval));
+    }
+
+    /**
+     * 删除采购审批
+     */
+    @Log(title = "采购审批", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{procureApplyIds}")
+    public AjaxResult remove(@PathVariable String[] procureApplyIds)
+    {
+        return toAjax(cmcProcureApprovalService.deleteCmcProcureApprovalByProcureApplyIds(procureApplyIds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProcurePlanController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.oa.domain.CmcProcurePlan;
+import com.ruoyi.oa.service.ICmcProcurePlanService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 采购计划Controller
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+@RestController
+@RequestMapping("/oa/procurePlan")
+public class CmcProcurePlanController extends BaseController
+{
+    @Autowired
+    private ICmcProcurePlanService cmcProcurePlanService;
+
+    /**
+     * 查询采购计划列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProcurePlan cmcProcurePlan)
+    {
+        startPage();
+        List<CmcProcurePlan> list = cmcProcurePlanService.selectCmcProcurePlanList(cmcProcurePlan);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出采购计划列表
+     */
+    @Log(title = "采购计划", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProcurePlan cmcProcurePlan)
+    {
+        List<CmcProcurePlan> list = cmcProcurePlanService.selectCmcProcurePlanList(cmcProcurePlan);
+        ExcelUtil<CmcProcurePlan> util = new ExcelUtil<CmcProcurePlan>(CmcProcurePlan.class);
+        util.exportExcel(response, list, "采购计划数据");
+    }
+
+    /**
+     * 获取采购计划详细信息
+     */
+    @GetMapping(value = "/{procurePlanId}")
+    public AjaxResult getInfo(@PathVariable("procurePlanId") Integer procurePlanId)
+    {
+        return success(cmcProcurePlanService.selectCmcProcurePlanByProcurePlanId(procurePlanId));
+    }
+
+    /**
+     * 新增采购计划
+     */
+    @Log(title = "采购计划", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProcurePlan cmcProcurePlan)
+    {
+        return toAjax(cmcProcurePlanService.insertCmcProcurePlan(cmcProcurePlan));
+    }
+
+    /**
+     * 修改采购计划
+     */
+    @Log(title = "采购计划", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProcurePlan cmcProcurePlan)
+    {
+        return toAjax(cmcProcurePlanService.updateCmcProcurePlan(cmcProcurePlan));
+    }
+
+    /**
+     * 删除采购计划
+     */
+    @Log(title = "采购计划", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{procurePlanIds}")
+    public AjaxResult remove(@PathVariable Integer[] procurePlanIds)
+    {
+        return toAjax(cmcProcurePlanService.deleteCmcProcurePlanByProcurePlanIds(procurePlanIds));
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProcureApproval.java

@@ -0,0 +1,210 @@
+package com.ruoyi.oa.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;
+
+/**
+ * 采购审批对象 cmc_buy_approval
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+public class CmcProcureApproval extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 采购申请id */
+    private String buyApplyId;
+
+    /** 购置说明 */
+    @Excel(name = "购置说明")
+    private String applyReason;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private Long applier;
+
+    /** 申请部门 */
+    @Excel(name = "申请部门")
+    private Long applyDept;
+
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private Long managerUserId;
+
+    /** 分管审核意见 */
+    @Excel(name = "分管审核意见")
+    private String managerComment;
+
+    /** 分管审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private Long zjlUserId;
+
+    /** 总经理审批意见 */
+    @Excel(name = "总经理审批意见")
+    private String zjlComment;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zjlTime;
+
+    /** 计划编制人 */
+    @Excel(name = "计划编制人")
+    private Long planUserId;
+
+    /** 计划编制时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划编制时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planTime;
+
+    /** 计划编制意见 */
+    @Excel(name = "计划编制意见")
+    private String planComment;
+
+    public void setProcureApplyId(String procureApplyId) 
+    {
+        this.buyApplyId = buyApplyId;
+    }
+
+    public String getProcureApplyId() 
+    {
+        return buyApplyId;
+    }
+    public void setApplyReason(String applyReason) 
+    {
+        this.applyReason = applyReason;
+    }
+
+    public String getApplyReason() 
+    {
+        return applyReason;
+    }
+    public void setApplier(Long applier) 
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier() 
+    {
+        return applier;
+    }
+    public void setApplyDept(Long applyDept) 
+    {
+        this.applyDept = applyDept;
+    }
+
+    public Long getApplyDept() 
+    {
+        return applyDept;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    public void setManagerComment(String managerComment) 
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment() 
+    {
+        return managerComment;
+    }
+    public void setManagerTime(Date managerTime) 
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime() 
+    {
+        return managerTime;
+    }
+    public void setZjlUserId(Long zjlUserId) 
+    {
+        this.zjlUserId = zjlUserId;
+    }
+
+    public Long getZjlUserId() 
+    {
+        return zjlUserId;
+    }
+    public void setZjlComment(String zjlComment) 
+    {
+        this.zjlComment = zjlComment;
+    }
+
+    public String getZjlComment() 
+    {
+        return zjlComment;
+    }
+    public void setZjlTime(Date zjlTime) 
+    {
+        this.zjlTime = zjlTime;
+    }
+
+    public Date getZjlTime() 
+    {
+        return zjlTime;
+    }
+    public void setPlanUserId(Long planUserId) 
+    {
+        this.planUserId = planUserId;
+    }
+
+    public Long getPlanUserId() 
+    {
+        return planUserId;
+    }
+    public void setPlanTime(Date planTime) 
+    {
+        this.planTime = planTime;
+    }
+
+    public Date getPlanTime() 
+    {
+        return planTime;
+    }
+    public void setPlanComment(String planComment) 
+    {
+        this.planComment = planComment;
+    }
+
+    public String getPlanComment() 
+    {
+        return planComment;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("buyApplyId", getProcureApplyId())
+            .append("applyReason", getApplyReason())
+            .append("applier", getApplier())
+            .append("applyDept", getApplyDept())
+            .append("managerUserId", getManagerUserId())
+            .append("managerComment", getManagerComment())
+            .append("managerTime", getManagerTime())
+            .append("zjlUserId", getZjlUserId())
+            .append("zjlComment", getZjlComment())
+            .append("zjlTime", getZjlTime())
+            .append("planUserId", getPlanUserId())
+            .append("planTime", getPlanTime())
+            .append("planComment", getPlanComment())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProcurePlan.java

@@ -0,0 +1,165 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+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;
+
+/**
+ * 采购计划对象 cmc_procure_plan
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+public class CmcProcurePlan extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 采购计划id */
+    private Integer procurePlanId;
+
+    /** 采购申请id */
+    @Excel(name = "采购申请id")
+    private String procureApplyId;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 规格型号 */
+    @Excel(name = "规格型号")
+    private String series;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 参考单价 */
+    @Excel(name = "参考单价")
+    private BigDecimal price;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private Double num;
+
+    /** 总价 */
+    @Excel(name = "总价")
+    private BigDecimal amount;
+
+    /** 购买方式 */
+    @Excel(name = "购买方式")
+    private String procureWay;
+
+    /** 用途 */
+    @Excel(name = "用途")
+    private String usage;
+
+    public void setProcurePlanId(Integer procurePlanId) 
+    {
+        this.procurePlanId = procurePlanId;
+    }
+
+    public Integer getProcurePlanId() 
+    {
+        return procurePlanId;
+    }
+    public void setProcureApplyId(String procureApplyId) 
+    {
+        this.procureApplyId = procureApplyId;
+    }
+
+    public String getProcureApplyId() 
+    {
+        return procureApplyId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSeries(String series) 
+    {
+        this.series = series;
+    }
+
+    public String getSeries() 
+    {
+        return series;
+    }
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+    public void setPrice(BigDecimal price) 
+    {
+        this.price = price;
+    }
+
+    public BigDecimal getPrice() 
+    {
+        return price;
+    }
+    public void setNum(Double num) 
+    {
+        this.num = num;
+    }
+
+    public Double getNum() 
+    {
+        return num;
+    }
+    public void setAmount(BigDecimal amount) 
+    {
+        this.amount = amount;
+    }
+
+    public BigDecimal getAmount() 
+    {
+        return amount;
+    }
+    public void setProcureWay(String procureWay) 
+    {
+        this.procureWay = procureWay;
+    }
+
+    public String getProcureWay() 
+    {
+        return procureWay;
+    }
+    public void setUsage(String usage) 
+    {
+        this.usage = usage;
+    }
+
+    public String getUsage() 
+    {
+        return usage;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("procurePlanId", getProcurePlanId())
+            .append("procureApplyId", getProcureApplyId())
+            .append("name", getName())
+            .append("series", getSeries())
+            .append("unit", getUnit())
+            .append("price", getPrice())
+            .append("num", getNum())
+            .append("amount", getAmount())
+            .append("procureWay", getProcureWay())
+            .append("usage", getUsage())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProcureApprovalMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProcureApproval;
+
+/**
+ * 采购审批Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+public interface CmcProcureApprovalMapper 
+{
+    /**
+     * 查询采购审批
+     * 
+     * @param procureApplyId 采购审批主键
+     * @return 采购审批
+     */
+    public CmcProcureApproval selectCmcProcureApprovalByProcureApplyId(String procureApplyId);
+
+    /**
+     * 查询采购审批列表
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 采购审批集合
+     */
+    public List<CmcProcureApproval> selectCmcProcureApprovalList(CmcProcureApproval cmcProcureApproval);
+
+    /**
+     * 新增采购审批
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 结果
+     */
+    public int insertCmcProcureApproval(CmcProcureApproval cmcProcureApproval);
+
+    /**
+     * 修改采购审批
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 结果
+     */
+    public int updateCmcProcureApproval(CmcProcureApproval cmcProcureApproval);
+
+    /**
+     * 删除采购审批
+     * 
+     * @param procureApplyId 采购审批主键
+     * @return 结果
+     */
+    public int deleteCmcProcureApprovalByProcureApplyId(String procureApplyId);
+
+    /**
+     * 批量删除采购审批
+     * 
+     * @param procureApplyIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProcureApprovalByProcureApplyIds(String[] procureApplyIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProcurePlanMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProcurePlan;
+
+/**
+ * 采购计划Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+public interface CmcProcurePlanMapper 
+{
+    /**
+     * 查询采购计划
+     * 
+     * @param procurePlanId 采购计划主键
+     * @return 采购计划
+     */
+    public CmcProcurePlan selectCmcProcurePlanByProcurePlanId(Integer procurePlanId);
+
+    /**
+     * 查询采购计划列表
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 采购计划集合
+     */
+    public List<CmcProcurePlan> selectCmcProcurePlanList(CmcProcurePlan cmcProcurePlan);
+
+    /**
+     * 新增采购计划
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 结果
+     */
+    public int insertCmcProcurePlan(CmcProcurePlan cmcProcurePlan);
+
+    /**
+     * 修改采购计划
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 结果
+     */
+    public int updateCmcProcurePlan(CmcProcurePlan cmcProcurePlan);
+
+    /**
+     * 删除采购计划
+     * 
+     * @param procurePlanId 采购计划主键
+     * @return 结果
+     */
+    public int deleteCmcProcurePlanByProcurePlanId(Integer procurePlanId);
+
+    /**
+     * 批量删除采购计划
+     * 
+     * @param procurePlanIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProcurePlanByProcurePlanIds(Integer[] procurePlanIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProcureApprovalService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProcureApproval;
+
+/**
+ * 采购审批Service接口
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+public interface ICmcProcureApprovalService 
+{
+    /**
+     * 查询采购审批
+     * 
+     * @param procureApplyId 采购审批主键
+     * @return 采购审批
+     */
+    public CmcProcureApproval selectCmcProcureApprovalByProcureApplyId(String procureApplyId);
+
+    /**
+     * 查询采购审批列表
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 采购审批集合
+     */
+    public List<CmcProcureApproval> selectCmcProcureApprovalList(CmcProcureApproval cmcProcureApproval);
+
+    /**
+     * 新增采购审批
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 结果
+     */
+    public int insertCmcProcureApproval(CmcProcureApproval cmcProcureApproval);
+
+    /**
+     * 修改采购审批
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 结果
+     */
+    public int updateCmcProcureApproval(CmcProcureApproval cmcProcureApproval);
+
+    /**
+     * 批量删除采购审批
+     * 
+     * @param procureApplyIds 需要删除的采购审批主键集合
+     * @return 结果
+     */
+    public int deleteCmcProcureApprovalByProcureApplyIds(String[] procureApplyIds);
+
+    /**
+     * 删除采购审批信息
+     * 
+     * @param procureApplyId 采购审批主键
+     * @return 结果
+     */
+    public int deleteCmcProcureApprovalByProcureApplyId(String procureApplyId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProcurePlanService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcProcurePlan;
+
+/**
+ * 采购计划Service接口
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+public interface ICmcProcurePlanService 
+{
+    /**
+     * 查询采购计划
+     * 
+     * @param procurePlanId 采购计划主键
+     * @return 采购计划
+     */
+    public CmcProcurePlan selectCmcProcurePlanByProcurePlanId(Integer procurePlanId);
+
+    /**
+     * 查询采购计划列表
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 采购计划集合
+     */
+    public List<CmcProcurePlan> selectCmcProcurePlanList(CmcProcurePlan cmcProcurePlan);
+
+    /**
+     * 新增采购计划
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 结果
+     */
+    public int insertCmcProcurePlan(CmcProcurePlan cmcProcurePlan);
+
+    /**
+     * 修改采购计划
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 结果
+     */
+    public int updateCmcProcurePlan(CmcProcurePlan cmcProcurePlan);
+
+    /**
+     * 批量删除采购计划
+     * 
+     * @param procurePlanIds 需要删除的采购计划主键集合
+     * @return 结果
+     */
+    public int deleteCmcProcurePlanByProcurePlanIds(Integer[] procurePlanIds);
+
+    /**
+     * 删除采购计划信息
+     * 
+     * @param procurePlanId 采购计划主键
+     * @return 结果
+     */
+    public int deleteCmcProcurePlanByProcurePlanId(Integer procurePlanId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProcureApprovalServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcProcureApprovalMapper;
+import com.ruoyi.oa.domain.CmcProcureApproval;
+import com.ruoyi.oa.service.ICmcProcureApprovalService;
+
+/**
+ * 采购审批Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+@Service
+public class CmcProcureApprovalServiceImpl implements ICmcProcureApprovalService
+{
+    @Autowired
+    private CmcProcureApprovalMapper cmcProcureApprovalMapper;
+
+    /**
+     * 查询采购审批
+     * 
+     * @param procureApplyId 采购审批主键
+     * @return 采购审批
+     */
+    @Override
+    public CmcProcureApproval selectCmcProcureApprovalByProcureApplyId(String procureApplyId)
+    {
+        return cmcProcureApprovalMapper.selectCmcProcureApprovalByProcureApplyId(procureApplyId);
+    }
+
+    /**
+     * 查询采购审批列表
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 采购审批
+     */
+    @Override
+    public List<CmcProcureApproval> selectCmcProcureApprovalList(CmcProcureApproval cmcProcureApproval)
+    {
+        return cmcProcureApprovalMapper.selectCmcProcureApprovalList(cmcProcureApproval);
+    }
+
+    /**
+     * 新增采购审批
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProcureApproval(CmcProcureApproval cmcProcureApproval)
+    {
+        return cmcProcureApprovalMapper.insertCmcProcureApproval(cmcProcureApproval);
+    }
+
+    /**
+     * 修改采购审批
+     * 
+     * @param cmcProcureApproval 采购审批
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProcureApproval(CmcProcureApproval cmcProcureApproval)
+    {
+        return cmcProcureApprovalMapper.updateCmcProcureApproval(cmcProcureApproval);
+    }
+
+    /**
+     * 批量删除采购审批
+     * 
+     * @param procureApplyIds 需要删除的采购审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProcureApprovalByProcureApplyIds(String[] procureApplyIds)
+    {
+        return cmcProcureApprovalMapper.deleteCmcProcureApprovalByProcureApplyIds(procureApplyIds);
+    }
+
+    /**
+     * 删除采购审批信息
+     * 
+     * @param procureApplyId 采购审批主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProcureApprovalByProcureApplyId(String procureApplyId)
+    {
+        return cmcProcureApprovalMapper.deleteCmcProcureApprovalByProcureApplyId(procureApplyId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProcurePlanServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcProcurePlanMapper;
+import com.ruoyi.oa.domain.CmcProcurePlan;
+import com.ruoyi.oa.service.ICmcProcurePlanService;
+
+/**
+ * 采购计划Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-09-18
+ */
+@Service
+public class CmcProcurePlanServiceImpl implements ICmcProcurePlanService
+{
+    @Autowired
+    private CmcProcurePlanMapper cmcProcurePlanMapper;
+
+    /**
+     * 查询采购计划
+     * 
+     * @param procurePlanId 采购计划主键
+     * @return 采购计划
+     */
+    @Override
+    public CmcProcurePlan selectCmcProcurePlanByProcurePlanId(Integer procurePlanId)
+    {
+        return cmcProcurePlanMapper.selectCmcProcurePlanByProcurePlanId(procurePlanId);
+    }
+
+    /**
+     * 查询采购计划列表
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 采购计划
+     */
+    @Override
+    public List<CmcProcurePlan> selectCmcProcurePlanList(CmcProcurePlan cmcProcurePlan)
+    {
+        return cmcProcurePlanMapper.selectCmcProcurePlanList(cmcProcurePlan);
+    }
+
+    /**
+     * 新增采购计划
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProcurePlan(CmcProcurePlan cmcProcurePlan)
+    {
+        return cmcProcurePlanMapper.insertCmcProcurePlan(cmcProcurePlan);
+    }
+
+    /**
+     * 修改采购计划
+     * 
+     * @param cmcProcurePlan 采购计划
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProcurePlan(CmcProcurePlan cmcProcurePlan)
+    {
+        return cmcProcurePlanMapper.updateCmcProcurePlan(cmcProcurePlan);
+    }
+
+    /**
+     * 批量删除采购计划
+     * 
+     * @param procurePlanIds 需要删除的采购计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProcurePlanByProcurePlanIds(Integer[] procurePlanIds)
+    {
+        return cmcProcurePlanMapper.deleteCmcProcurePlanByProcurePlanIds(procurePlanIds);
+    }
+
+    /**
+     * 删除采购计划信息
+     * 
+     * @param procurePlanId 采购计划主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProcurePlanByProcurePlanId(Integer procurePlanId)
+    {
+        return cmcProcurePlanMapper.deleteCmcProcurePlanByProcurePlanId(procurePlanId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProcureApprovalMapper.xml

@@ -0,0 +1,113 @@
+<?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.CmcProcureApprovalMapper">
+    
+    <resultMap type="CmcProcureApproval" id="CmcProcureApprovalResult">
+        <result property="procureApplyId"    column="procure_apply_id"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyDept"    column="apply_dept"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="zjlUserId"    column="zjl_user_id"    />
+        <result property="zjlComment"    column="zjl_comment"    />
+        <result property="zjlTime"    column="zjl_time"    />
+        <result property="planUserId"    column="plan_user_id"    />
+        <result property="planTime"    column="plan_time"    />
+        <result property="planComment"    column="plan_comment"    />
+    </resultMap>
+
+    <sql id="selectCmcProcureApprovalVo">
+        select procure_apply_id, apply_reason, applier, apply_dept, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, plan_user_id, plan_time, plan_comment from cmc_procure_approval
+    </sql>
+
+    <select id="selectCmcProcureApprovalList" parameterType="CmcProcureApproval" resultMap="CmcProcureApprovalResult">
+        <include refid="selectCmcProcureApprovalVo"/>
+        <where>  
+            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
+            <if test="applier != null "> and applier = #{applier}</if>
+            <if test="applyDept != null "> and apply_dept = #{applyDept}</if>
+            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
+            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
+            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
+            <if test="planUserId != null "> and plan_user_id = #{planUserId}</if>
+            <if test="planTime != null "> and plan_time = #{planTime}</if>
+            <if test="planComment != null  and planComment != ''"> and plan_comment = #{planComment}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcProcureApprovalByProcureApplyId" parameterType="String" resultMap="CmcProcureApprovalResult">
+        <include refid="selectCmcProcureApprovalVo"/>
+        where procure_apply_id = #{procureApplyId}
+    </select>
+        
+    <insert id="insertCmcProcureApproval" parameterType="CmcProcureApproval">
+        insert into cmc_procure_approval
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="procureApplyId != null">procure_apply_id,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyDept != null">apply_dept,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="zjlUserId != null">zjl_user_id,</if>
+            <if test="zjlComment != null">zjl_comment,</if>
+            <if test="zjlTime != null">zjl_time,</if>
+            <if test="planUserId != null">plan_user_id,</if>
+            <if test="planTime != null">plan_time,</if>
+            <if test="planComment != null">plan_comment,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="procureApplyId != null">#{procureApplyId},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyDept != null">#{applyDept},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="zjlUserId != null">#{zjlUserId},</if>
+            <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="zjlTime != null">#{zjlTime},</if>
+            <if test="planUserId != null">#{planUserId},</if>
+            <if test="planTime != null">#{planTime},</if>
+            <if test="planComment != null">#{planComment},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProcureApproval" parameterType="CmcProcureApproval">
+        update cmc_procure_approval
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyReason != null">apply_reason = #{applyReason},</if>
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyDept != null">apply_dept = #{applyDept},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
+            <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+            <if test="planUserId != null">plan_user_id = #{planUserId},</if>
+            <if test="planTime != null">plan_time = #{planTime},</if>
+            <if test="planComment != null">plan_comment = #{planComment},</if>
+        </trim>
+        where procure_apply_id = #{procureApplyId}
+    </update>
+
+    <delete id="deleteCmcProcureApprovalByProcureApplyId" parameterType="String">
+        delete from cmc_procure_approval where procure_apply_id = #{procureApplyId}
+    </delete>
+
+    <delete id="deleteCmcProcureApprovalByProcureApplyIds" parameterType="String">
+        delete from cmc_procure_approval where procure_apply_id in 
+        <foreach item="procureApplyId" collection="array" open="(" separator="," close=")">
+            #{procureApplyId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProcurePlanMapper.xml

@@ -0,0 +1,100 @@
+<?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.CmcProcurePlanMapper">
+    
+    <resultMap type="CmcProcurePlan" id="CmcProcurePlanResult">
+        <result property="procurePlanId"    column="procure_plan_id"    />
+        <result property="procureApplyId"    column="procure_apply_id"    />
+        <result property="name"    column="name"    />
+        <result property="series"    column="series"    />
+        <result property="unit"    column="unit"    />
+        <result property="price"    column="price"    />
+        <result property="num"    column="num"    />
+        <result property="amount"    column="amount"    />
+        <result property="procureWay"    column="procure_way"    />
+        <result property="usage"    column="usage"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcProcurePlanVo">
+        select procure_plan_id, procure_apply_id, name, series, unit, price, num, amount, procure_way, usage, remark from cmc_procure_plan
+    </sql>
+
+    <select id="selectCmcProcurePlanList" parameterType="CmcProcurePlan" resultMap="CmcProcurePlanResult">
+        <include refid="selectCmcProcurePlanVo"/>
+        <where>  
+            <if test="procureApplyId != null  and procureApplyId != ''"> and procure_apply_id = #{procureApplyId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="series != null  and series != ''"> and series = #{series}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="num != null "> and num = #{num}</if>
+            <if test="amount != null "> and amount = #{amount}</if>
+            <if test="procureWay != null  and procureWay != ''"> and procure_way = #{procureWay}</if>
+            <if test="usage != null  and usage != ''"> and usage = #{usage}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcProcurePlanByProcurePlanId" parameterType="Integer" resultMap="CmcProcurePlanResult">
+        <include refid="selectCmcProcurePlanVo"/>
+        where procure_plan_id = #{procurePlanId}
+    </select>
+        
+    <insert id="insertCmcProcurePlan" parameterType="CmcProcurePlan" useGeneratedKeys="true" keyProperty="procurePlanId">
+        insert into cmc_procure_plan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="procureApplyId != null">procure_apply_id,</if>
+            <if test="name != null">name,</if>
+            <if test="series != null">series,</if>
+            <if test="unit != null">unit,</if>
+            <if test="price != null">price,</if>
+            <if test="num != null">num,</if>
+            <if test="amount != null">amount,</if>
+            <if test="procureWay != null">procure_way,</if>
+            <if test="usage != null">usage,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="procureApplyId != null">#{procureApplyId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="series != null">#{series},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="price != null">#{price},</if>
+            <if test="num != null">#{num},</if>
+            <if test="amount != null">#{amount},</if>
+            <if test="procureWay != null">#{procureWay},</if>
+            <if test="usage != null">#{usage},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProcurePlan" parameterType="CmcProcurePlan">
+        update cmc_procure_plan
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="procureApplyId != null">procure_apply_id = #{procureApplyId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="series != null">series = #{series},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="amount != null">amount = #{amount},</if>
+            <if test="procureWay != null">procure_way = #{procureWay},</if>
+            <if test="usage != null">usage = #{usage},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where procure_plan_id = #{procurePlanId}
+    </update>
+
+    <delete id="deleteCmcProcurePlanByProcurePlanId" parameterType="Integer">
+        delete from cmc_procure_plan where procure_plan_id = #{procurePlanId}
+    </delete>
+
+    <delete id="deleteCmcProcurePlanByProcurePlanIds" parameterType="String">
+        delete from cmc_procure_plan where procure_plan_id in 
+        <foreach item="procurePlanId" collection="array" open="(" separator="," close=")">
+            #{procurePlanId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTechnicalMapper.xml

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="accepter != null">accepter = #{accepter},</if>
             <if test="disclosurer != null">disclosurer = #{disclosurer},</if>
-            <if test="confirmer != null">confirmer = #confirmer},</if>
+            <if test="confirmer != null">confirmer = #{confirmer},</if>
             <if test="content != null">content = #{content},</if>
             <if test="document != null">document = #{document},</if>
             <if test="disclosureComment != null">disclosure_comment = #{disclosureComment},</if>

oa-ui/src/api/oa/procure/procureApproval.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询采购审批列表
+export function listProcureApproval(query) {
+  return request({
+    url: '/oa/procureApproval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询采购审批详细
+export function getProcureApproval(procureApplyId) {
+  return request({
+    url: '/oa/procureApproval/' + procureApplyId,
+    method: 'get'
+  })
+}
+
+// 新增采购审批
+export function addProcureApproval(data) {
+  return request({
+    url: '/oa/procureApproval',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采购审批
+export function updateProcureApproval(data) {
+  return request({
+    url: '/oa/procureApproval',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采购审批
+export function delProcureApproval(procureApplyId) {
+  return request({
+    url: '/oa/procureApproval/' + procureApplyId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/procure/procurePlan.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询采购计划列表
+export function listProcurePlan(query) {
+  return request({
+    url: '/oa/procurePlan/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询采购计划详细
+export function getProcurePlan(procurePlanId) {
+  return request({
+    url: '/oa/procurePlan/' + procurePlanId,
+    method: 'get'
+  })
+}
+
+// 新增采购计划
+export function addProcurePlan(data) {
+  return request({
+    url: '/oa/procurePlan',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改采购计划
+export function updateProcurePlan(data) {
+  return request({
+    url: '/oa/procurePlan',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除采购计划
+export function delProcurePlan(procurePlanId) {
+  return request({
+    url: '/oa/procurePlan/' + procurePlanId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/form/settleForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-09-13 10:01:22
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-18 15:23:24
 -->
 <template>
   <div class="app-container" v-loading="loading">
@@ -353,7 +353,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.zhUserName ? "" : getUserName(form.zhUserId) }} </span>
+                  <span class="auditor"> {{ form.zhUserName ? form.zhUserName : getUserName(form.zhUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -370,7 +370,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.jsUserName ? "" : getUserName(form.jsUserId) }} </span>
+                  <span class="auditor"> {{ form.jsUserName ? form.jsUserName : getUserName(form.jsUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -387,7 +387,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.jyUserName ? "" : getUserName(form.jyUserId) }} </span>
+                  <span class="auditor"> {{ form.jyUserName ? form.jyUserName : getUserName(form.jyUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -404,7 +404,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.managerUserName ? "" : getUserName(form.managerUserId) }} </span>
+                  <span class="auditor"> {{ form.managerUserName ? form.managerUserName : getUserName(form.managerUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -421,7 +421,7 @@
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.gmUserName ? "" : getUserName(form.gmUserId) }} </span>
+                  <span class="auditor"> {{ form.gmUserName ? form.gmUserName : getUserName(form.gmUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -439,7 +439,7 @@
             <el-row v-if="exceed">
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.dszUserName ? "" : getUserName(form.dszUserId) }} </span>
+                  <span class="auditor"> {{ form.dszUserName ? form.dszUserName : getUserName(form.dszUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">

oa-ui/src/views/oa/car/index.vue

@@ -328,10 +328,10 @@ export default {
         return 'success'
       }
       if (row == '2') {
-        return 'danger'
+        return 'primary'
       }
       if (row == '3') {
-        return 'primary'
+        return 'danger'
       }
       if (row == '4') {
         return 'info'

oa-ui/src/views/oa/device/detail.vue

@@ -899,10 +899,10 @@ export default {
         return 'success'
       }
       if (row == '2') {
-        return 'danger'
+        return 'primary'
       }
       if (row == '3') {
-        return 'primary'
+        return 'danger'
       }
       if (row == '4') {
         return 'info'

oa-ui/src/views/oa/device/index.vue

@@ -397,10 +397,10 @@ export default {
         return 'success'
       }
       if (row == '2') {
-        return 'danger'
+        return 'primary'
       }
       if (row == '3') {
-        return 'primary'
+        return 'danger'
       }
       if (row == '4') {
         return 'info'

oa-ui/src/views/oa/procure/approval.vue

@@ -0,0 +1,426 @@
+<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="applyReason">
+        <el-input
+          v-model="queryParams.applyReason"
+          placeholder="请输入购置说明"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请人" prop="applier">
+        <el-input
+          v-model="queryParams.applier"
+          placeholder="请输入申请人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请部门" prop="applyDept">
+        <el-input
+          v-model="queryParams.applyDept"
+          placeholder="请输入申请部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审核人" prop="managerUserId">
+        <el-input
+          v-model="queryParams.managerUserId"
+          placeholder="请输入分管审核人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审核意见" prop="managerComment">
+        <el-input
+          v-model="queryParams.managerComment"
+          placeholder="请输入分管审核意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审核时间" prop="managerTime">
+        <el-date-picker clearable
+          v-model="queryParams.managerTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择分管审核时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总经理审批人" prop="zjlUserId">
+        <el-input
+          v-model="queryParams.zjlUserId"
+          placeholder="请输入总经理审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理审批意见" prop="zjlComment">
+        <el-input
+          v-model="queryParams.zjlComment"
+          placeholder="请输入总经理审批意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理审批时间" prop="zjlTime">
+        <el-date-picker clearable
+          v-model="queryParams.zjlTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择总经理审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="计划编制人" prop="planUserId">
+        <el-input
+          v-model="queryParams.planUserId"
+          placeholder="请输入计划编制人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计划编制时间" prop="planTime">
+        <el-date-picker clearable
+          v-model="queryParams.planTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择计划编制时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="计划编制意见" prop="planComment">
+        <el-input
+          v-model="queryParams.planComment"
+          placeholder="请输入计划编制意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="['oa:procureApproval: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="['oa:procureApproval: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="['oa:procureApproval:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:procureApproval:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="procureApprovalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="采购申请id" align="center" prop="procureApplyId" />
+      <el-table-column label="购置说明" align="center" prop="applyReason" />
+      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="申请部门" align="center" prop="applyDept" />
+      <el-table-column label="分管审核人" align="center" prop="managerUserId" />
+      <el-table-column label="分管审核意见" align="center" prop="managerComment" />
+      <el-table-column label="分管审核时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" />
+      <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
+      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计划编制人" align="center" prop="planUserId" />
+      <el-table-column label="计划编制时间" align="center" prop="planTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.planTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="计划编制意见" align="center" prop="planComment" />
+      <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="['oa:procureApproval:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:procureApproval: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="applyReason">
+          <el-input v-model="form.applyReason" placeholder="请输入购置说明" />
+        </el-form-item>
+        <el-form-item label="申请人" prop="applier">
+          <el-input v-model="form.applier" placeholder="请输入申请人" />
+        </el-form-item>
+        <el-form-item label="申请部门" prop="applyDept">
+          <el-input v-model="form.applyDept" placeholder="请输入申请部门" />
+        </el-form-item>
+        <el-form-item label="分管审核人" prop="managerUserId">
+          <el-input v-model="form.managerUserId" placeholder="请输入分管审核人" />
+        </el-form-item>
+        <el-form-item label="分管审核意见" prop="managerComment">
+          <el-input v-model="form.managerComment" placeholder="请输入分管审核意见" />
+        </el-form-item>
+        <el-form-item label="分管审核时间" prop="managerTime">
+          <el-date-picker clearable
+            v-model="form.managerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择分管审核时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总经理审批人" prop="zjlUserId">
+          <el-input v-model="form.zjlUserId" placeholder="请输入总经理审批人" />
+        </el-form-item>
+        <el-form-item label="总经理审批意见" prop="zjlComment">
+          <el-input v-model="form.zjlComment" placeholder="请输入总经理审批意见" />
+        </el-form-item>
+        <el-form-item label="总经理审批时间" prop="zjlTime">
+          <el-date-picker clearable
+            v-model="form.zjlTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择总经理审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划编制人" prop="planUserId">
+          <el-input v-model="form.planUserId" placeholder="请输入计划编制人" />
+        </el-form-item>
+        <el-form-item label="计划编制时间" prop="planTime">
+          <el-date-picker clearable
+            v-model="form.planTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择计划编制时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划编制意见" prop="planComment">
+          <el-input v-model="form.planComment" 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 { listProcureApproval, getProcureApproval, delProcureApproval, addProcureApproval, updateProcureApproval } from "@/api/oa/procure/procureApproval";
+
+export default {
+  name: "ProcureApproval",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 采购审批表格数据
+      procureApprovalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applyReason: null,
+        applier: null,
+        applyDept: null,
+        managerUserId: null,
+        managerComment: null,
+        managerTime: null,
+        zjlUserId: null,
+        zjlComment: null,
+        zjlTime: null,
+        planUserId: null,
+        planTime: null,
+        planComment: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询采购审批列表 */
+    getList() {
+      this.loading = true;
+      listProcureApproval(this.queryParams).then(response => {
+        this.procureApprovalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        procureApplyId: null,
+        applyReason: null,
+        applier: null,
+        applyDept: null,
+        managerUserId: null,
+        managerComment: null,
+        managerTime: null,
+        zjlUserId: null,
+        zjlComment: null,
+        zjlTime: null,
+        planUserId: null,
+        planTime: null,
+        planComment: 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.procureApplyId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加采购审批";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const procureApplyId = row.procureApplyId || this.ids
+      getProcureApproval(procureApplyId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改采购审批";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.procureApplyId != null) {
+            updateProcureApproval(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addProcureApproval(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const procureApplyIds = row.procureApplyId || this.ids;
+      this.$modal.confirm('是否确认删除采购审批编号为"' + procureApplyIds + '"的数据项？').then(function() {
+        return delProcureApproval(procureApplyIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/procureApproval/export', {
+        ...this.queryParams
+      }, `procureApproval_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/supply/deviceList.vue

@@ -187,7 +187,7 @@ export default {
         return 'success'
       }
       if (row == '2') {
-        return 'info'
+        return 'primary'
       }
       if (row == '3') {
         return 'danger'

oa-ui/src/views/oa/supply/index.vue

@@ -359,10 +359,10 @@ export default {
         return 'success'
       }
       if (row == '2') {
-        return 'danger'
+        return 'primary'
       }
       if (row == '3') {
-        return 'primary'
+        return 'danger'
       }
       if (row == '4') {
         return 'info'