借款申请表

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowController.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.CmcBorrow;
+import com.ruoyi.oa.service.ICmcBorrowService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc借款申请Controller
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+@RestController
+@RequestMapping("/oa/borrow")
+public class CmcBorrowController extends BaseController
+{
+    @Autowired
+    private ICmcBorrowService cmcBorrowService;
+
+    /**
+     * 查询cmc借款申请列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBorrow cmcBorrow)
+    {
+        startPage();
+        List<CmcBorrow> list = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc借款申请列表
+     */
+    @Log(title = "cmc借款申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBorrow cmcBorrow)
+    {
+        List<CmcBorrow> list = cmcBorrowService.selectCmcBorrowList(cmcBorrow);
+        ExcelUtil<CmcBorrow> util = new ExcelUtil<CmcBorrow>(CmcBorrow.class);
+        util.exportExcel(response, list, "cmc借款申请数据");
+    }
+
+    /**
+     * 获取cmc借款申请详细信息
+     */
+    @GetMapping(value = "/{borrowJd}")
+    public AjaxResult getInfo(@PathVariable("borrowJd") String borrowJd)
+    {
+        return success(cmcBorrowService.selectCmcBorrowByBorrowJd(borrowJd));
+    }
+
+    /**
+     * 新增cmc借款申请
+     */
+    @Log(title = "cmc借款申请", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBorrow cmcBorrow)
+    {
+        return toAjax(cmcBorrowService.insertCmcBorrow(cmcBorrow));
+    }
+
+    /**
+     * 修改cmc借款申请
+     */
+    @Log(title = "cmc借款申请", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBorrow cmcBorrow)
+    {
+        return toAjax(cmcBorrowService.updateCmcBorrow(cmcBorrow));
+    }
+
+    /**
+     * 删除cmc借款申请
+     */
+    @Log(title = "cmc借款申请", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{borrowJds}")
+    public AjaxResult remove(@PathVariable String[] borrowJds)
+    {
+        return toAjax(cmcBorrowService.deleteCmcBorrowByBorrowJds(borrowJds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBorrowDetailController.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.CmcBorrowDetail;
+import com.ruoyi.oa.service.ICmcBorrowDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc借款明细Controller
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+@RestController
+@RequestMapping("/oa/borrowDetail")
+public class CmcBorrowDetailController extends BaseController
+{
+    @Autowired
+    private ICmcBorrowDetailService cmcBorrowDetailService;
+
+    /**
+     * 查询cmc借款明细列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcBorrowDetail cmcBorrowDetail)
+    {
+        startPage();
+        List<CmcBorrowDetail> list = cmcBorrowDetailService.selectCmcBorrowDetailList(cmcBorrowDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc借款明细列表
+     */
+    @Log(title = "cmc借款明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcBorrowDetail cmcBorrowDetail)
+    {
+        List<CmcBorrowDetail> list = cmcBorrowDetailService.selectCmcBorrowDetailList(cmcBorrowDetail);
+        ExcelUtil<CmcBorrowDetail> util = new ExcelUtil<CmcBorrowDetail>(CmcBorrowDetail.class);
+        util.exportExcel(response, list, "cmc借款明细数据");
+    }
+
+    /**
+     * 获取cmc借款明细详细信息
+     */
+    @GetMapping(value = "/{borrowDetailId}")
+    public AjaxResult getInfo(@PathVariable("borrowDetailId") String borrowDetailId)
+    {
+        return success(cmcBorrowDetailService.selectCmcBorrowDetailByBorrowDetailId(borrowDetailId));
+    }
+
+    /**
+     * 新增cmc借款明细
+     */
+    @Log(title = "cmc借款明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcBorrowDetail cmcBorrowDetail)
+    {
+        return toAjax(cmcBorrowDetailService.insertCmcBorrowDetail(cmcBorrowDetail));
+    }
+
+    /**
+     * 修改cmc借款明细
+     */
+    @Log(title = "cmc借款明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcBorrowDetail cmcBorrowDetail)
+    {
+        return toAjax(cmcBorrowDetailService.updateCmcBorrowDetail(cmcBorrowDetail));
+    }
+
+    /**
+     * 删除cmc借款明细
+     */
+    @Log(title = "cmc借款明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{borrowDetailIds}")
+    public AjaxResult remove(@PathVariable String[] borrowDetailIds)
+    {
+        return toAjax(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowDetailIds(borrowDetailIds));
+    }
+}

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

@@ -107,6 +107,7 @@ public class CmcProjectController extends BaseController
     {
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcProject cmcProject = new CmcProject();
+        cmcProject.setProjectId(formDataJson.getString("formId"));
         cmcProject.setProjectName(formDataJson.getString("projectName"));
         cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
         cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));

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

@@ -0,0 +1,354 @@
+package com.ruoyi.oa.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc借款申请对象 cmc_borrow
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+public class CmcBorrow extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 借款申请id */
+    private String borrowJd;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 借款类型 */
+    @Excel(name = "借款类型")
+    private String borrowType;
+
+    /** 借款事由 */
+    @Excel(name = "借款事由")
+    private String applyReason;
+
+    /** 借款人 */
+    @Excel(name = "借款人")
+    private Long applier;
+
+    /** 借款日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "借款日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
+    /** 申请金额 */
+    @Excel(name = "申请金额")
+    private BigDecimal applyAmount;
+
+    /** 核准金额 */
+    @Excel(name = "核准金额")
+    private BigDecimal managerAmount;
+
+    /** 部门意见 */
+    @Excel(name = "部门意见")
+    private String deptComment;
+
+    /** 部门审批人 */
+    @Excel(name = "部门审批人")
+    private Long deptUserId;
+
+    /** 项目部审批人 */
+    @Excel(name = "项目部审批人")
+    private Long xmUserId;
+
+    /** 项目部审批意见 */
+    @Excel(name = "项目部审批意见")
+    private String xmComment;
+
+    /** 分管审批意见 */
+    @Excel(name = "分管审批意见")
+    private String managerComment;
+
+    /** 分管审批人 */
+    @Excel(name = "分管审批人")
+    private Long managerUserId;
+
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private Long zjlUserId;
+
+    /** 总经理审批意见 */
+    @Excel(name = "总经理审批意见")
+    private String zjlComment;
+
+    /** 财务部经办人 */
+    @Excel(name = "财务部经办人")
+    private Long cwUserId;
+
+    /** 财务部支付备注 */
+    @Excel(name = "财务部支付备注")
+    private String cwComment;
+
+    /** 部门审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
+    /** 项目部审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目部审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date xmTime;
+
+    /** 分管审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zjlTime;
+
+    /** 借款支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "借款支付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lendTime;
+
+    public void setBorrowJd(String borrowJd) 
+    {
+        this.borrowJd = borrowJd;
+    }
+
+    public String getBorrowJd() 
+    {
+        return borrowJd;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setBorrowType(String borrowType) 
+    {
+        this.borrowType = borrowType;
+    }
+
+    public String getBorrowType() 
+    {
+        return borrowType;
+    }
+    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 setApplyDate(Date applyDate) 
+    {
+        this.applyDate = applyDate;
+    }
+
+    public Date getApplyDate() 
+    {
+        return applyDate;
+    }
+    public void setApplyAmount(BigDecimal applyAmount) 
+    {
+        this.applyAmount = applyAmount;
+    }
+
+    public BigDecimal getApplyAmount() 
+    {
+        return applyAmount;
+    }
+    public void setManagerAmount(BigDecimal managerAmount) 
+    {
+        this.managerAmount = managerAmount;
+    }
+
+    public BigDecimal getManagerAmount() 
+    {
+        return managerAmount;
+    }
+    public void setDeptComment(String deptComment) 
+    {
+        this.deptComment = deptComment;
+    }
+
+    public String getDeptComment() 
+    {
+        return deptComment;
+    }
+    public void setDeptUserId(Long deptUserId) 
+    {
+        this.deptUserId = deptUserId;
+    }
+
+    public Long getDeptUserId() 
+    {
+        return deptUserId;
+    }
+    public void setXmUserId(Long xmUserId) 
+    {
+        this.xmUserId = xmUserId;
+    }
+
+    public Long getXmUserId() 
+    {
+        return xmUserId;
+    }
+    public void setXmComment(String xmComment) 
+    {
+        this.xmComment = xmComment;
+    }
+
+    public String getXmComment() 
+    {
+        return xmComment;
+    }
+    public void setManagerComment(String managerComment) 
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment() 
+    {
+        return managerComment;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    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 setCwUserId(Long cwUserId) 
+    {
+        this.cwUserId = cwUserId;
+    }
+
+    public Long getCwUserId() 
+    {
+        return cwUserId;
+    }
+    public void setCwComment(String cwComment) 
+    {
+        this.cwComment = cwComment;
+    }
+
+    public String getCwComment() 
+    {
+        return cwComment;
+    }
+    public void setDeptTime(Date deptTime) 
+    {
+        this.deptTime = deptTime;
+    }
+
+    public Date getDeptTime() 
+    {
+        return deptTime;
+    }
+    public void setXmTime(Date xmTime) 
+    {
+        this.xmTime = xmTime;
+    }
+
+    public Date getXmTime() 
+    {
+        return xmTime;
+    }
+    public void setManagerTime(Date managerTime) 
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime() 
+    {
+        return managerTime;
+    }
+    public void setZjlTime(Date zjlTime) 
+    {
+        this.zjlTime = zjlTime;
+    }
+
+    public Date getZjlTime() 
+    {
+        return zjlTime;
+    }
+    public void setLendTime(Date lendTime) 
+    {
+        this.lendTime = lendTime;
+    }
+
+    public Date getLendTime() 
+    {
+        return lendTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("borrowJd", getBorrowJd())
+            .append("projectId", getProjectId())
+            .append("borrowType", getBorrowType())
+            .append("applyReason", getApplyReason())
+            .append("applier", getApplier())
+            .append("applyDate", getApplyDate())
+            .append("applyAmount", getApplyAmount())
+            .append("managerAmount", getManagerAmount())
+            .append("deptComment", getDeptComment())
+            .append("deptUserId", getDeptUserId())
+            .append("xmUserId", getXmUserId())
+            .append("xmComment", getXmComment())
+            .append("managerComment", getManagerComment())
+            .append("managerUserId", getManagerUserId())
+            .append("zjlUserId", getZjlUserId())
+            .append("zjlComment", getZjlComment())
+            .append("cwUserId", getCwUserId())
+            .append("cwComment", getCwComment())
+            .append("deptTime", getDeptTime())
+            .append("xmTime", getXmTime())
+            .append("managerTime", getManagerTime())
+            .append("zjlTime", getZjlTime())
+            .append("lendTime", getLendTime())
+            .toString();
+    }
+}

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

@@ -0,0 +1,150 @@
+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借款明细对象 cmc_borrow_detail
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+public class CmcBorrowDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 借款明细id */
+    private String borrowDetailId;
+
+    /** 借款id */
+    @Excel(name = "借款id")
+    private String borrowId;
+
+    /** 开支项 */
+    @Excel(name = "开支项")
+    private String borrowItem;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private BigDecimal price;
+
+    /** 数量 */
+    @Excel(name = "数量")
+    private Integer quantity;
+
+    /** 申请金额 */
+    @Excel(name = "申请金额")
+    private BigDecimal applyAmount;
+
+    /** 项目部校核金额 */
+    @Excel(name = "项目部校核金额")
+    private BigDecimal xmAmount;
+
+    /** 分管审核金额 */
+    @Excel(name = "分管审核金额")
+    private BigDecimal managerAmount;
+
+    public void setBorrowDetailId(String borrowDetailId) 
+    {
+        this.borrowDetailId = borrowDetailId;
+    }
+
+    public String getBorrowDetailId() 
+    {
+        return borrowDetailId;
+    }
+    public void setBorrowId(String borrowId) 
+    {
+        this.borrowId = borrowId;
+    }
+
+    public String getBorrowId() 
+    {
+        return borrowId;
+    }
+    public void setBorrowItem(String borrowItem) 
+    {
+        this.borrowItem = borrowItem;
+    }
+
+    public String getBorrowItem() 
+    {
+        return borrowItem;
+    }
+    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 setQuantity(Integer quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public Integer getQuantity() 
+    {
+        return quantity;
+    }
+    public void setApplyAmount(BigDecimal applyAmount) 
+    {
+        this.applyAmount = applyAmount;
+    }
+
+    public BigDecimal getApplyAmount() 
+    {
+        return applyAmount;
+    }
+    public void setXmAmount(BigDecimal xmAmount) 
+    {
+        this.xmAmount = xmAmount;
+    }
+
+    public BigDecimal getXmAmount() 
+    {
+        return xmAmount;
+    }
+    public void setManagerAmount(BigDecimal managerAmount) 
+    {
+        this.managerAmount = managerAmount;
+    }
+
+    public BigDecimal getManagerAmount() 
+    {
+        return managerAmount;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("borrowDetailId", getBorrowDetailId())
+            .append("borrowId", getBorrowId())
+            .append("borrowItem", getBorrowItem())
+            .append("unit", getUnit())
+            .append("price", getPrice())
+            .append("quantity", getQuantity())
+            .append("applyAmount", getApplyAmount())
+            .append("xmAmount", getXmAmount())
+            .append("managerAmount", getManagerAmount())
+            .toString();
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBorrowDetail;
+
+/**
+ * cmc借款明细Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+public interface CmcBorrowDetailMapper 
+{
+    /**
+     * 查询cmc借款明细
+     * 
+     * @param borrowDetailId cmc借款明细主键
+     * @return cmc借款明细
+     */
+    public CmcBorrowDetail selectCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+
+    /**
+     * 查询cmc借款明细列表
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return cmc借款明细集合
+     */
+    public List<CmcBorrowDetail> selectCmcBorrowDetailList(CmcBorrowDetail cmcBorrowDetail);
+
+    /**
+     * 新增cmc借款明细
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return 结果
+     */
+    public int insertCmcBorrowDetail(CmcBorrowDetail cmcBorrowDetail);
+
+    /**
+     * 修改cmc借款明细
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return 结果
+     */
+    public int updateCmcBorrowDetail(CmcBorrowDetail cmcBorrowDetail);
+
+    /**
+     * 删除cmc借款明细
+     * 
+     * @param borrowDetailId cmc借款明细主键
+     * @return 结果
+     */
+    public int deleteCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+
+    /**
+     * 批量删除cmc借款明细
+     * 
+     * @param borrowDetailIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBorrowDetailByBorrowDetailIds(String[] borrowDetailIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBorrow;
+
+/**
+ * cmc借款申请Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+public interface CmcBorrowMapper 
+{
+    /**
+     * 查询cmc借款申请
+     * 
+     * @param borrowJd cmc借款申请主键
+     * @return cmc借款申请
+     */
+    public CmcBorrow selectCmcBorrowByBorrowJd(String borrowJd);
+
+    /**
+     * 查询cmc借款申请列表
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return cmc借款申请集合
+     */
+    public List<CmcBorrow> selectCmcBorrowList(CmcBorrow cmcBorrow);
+
+    /**
+     * 新增cmc借款申请
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return 结果
+     */
+    public int insertCmcBorrow(CmcBorrow cmcBorrow);
+
+    /**
+     * 修改cmc借款申请
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return 结果
+     */
+    public int updateCmcBorrow(CmcBorrow cmcBorrow);
+
+    /**
+     * 删除cmc借款申请
+     * 
+     * @param borrowJd cmc借款申请主键
+     * @return 结果
+     */
+    public int deleteCmcBorrowByBorrowJd(String borrowJd);
+
+    /**
+     * 批量删除cmc借款申请
+     * 
+     * @param borrowJds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcBorrowByBorrowJds(String[] borrowJds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBorrowDetail;
+
+/**
+ * cmc借款明细Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+public interface ICmcBorrowDetailService 
+{
+    /**
+     * 查询cmc借款明细
+     * 
+     * @param borrowDetailId cmc借款明细主键
+     * @return cmc借款明细
+     */
+    public CmcBorrowDetail selectCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+
+    /**
+     * 查询cmc借款明细列表
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return cmc借款明细集合
+     */
+    public List<CmcBorrowDetail> selectCmcBorrowDetailList(CmcBorrowDetail cmcBorrowDetail);
+
+    /**
+     * 新增cmc借款明细
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return 结果
+     */
+    public int insertCmcBorrowDetail(CmcBorrowDetail cmcBorrowDetail);
+
+    /**
+     * 修改cmc借款明细
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return 结果
+     */
+    public int updateCmcBorrowDetail(CmcBorrowDetail cmcBorrowDetail);
+
+    /**
+     * 批量删除cmc借款明细
+     * 
+     * @param borrowDetailIds 需要删除的cmc借款明细主键集合
+     * @return 结果
+     */
+    public int deleteCmcBorrowDetailByBorrowDetailIds(String[] borrowDetailIds);
+
+    /**
+     * 删除cmc借款明细信息
+     * 
+     * @param borrowDetailId cmc借款明细主键
+     * @return 结果
+     */
+    public int deleteCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcBorrow;
+
+/**
+ * cmc借款申请Service接口
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+public interface ICmcBorrowService 
+{
+    /**
+     * 查询cmc借款申请
+     * 
+     * @param borrowJd cmc借款申请主键
+     * @return cmc借款申请
+     */
+    public CmcBorrow selectCmcBorrowByBorrowJd(String borrowJd);
+
+    /**
+     * 查询cmc借款申请列表
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return cmc借款申请集合
+     */
+    public List<CmcBorrow> selectCmcBorrowList(CmcBorrow cmcBorrow);
+
+    /**
+     * 新增cmc借款申请
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return 结果
+     */
+    public int insertCmcBorrow(CmcBorrow cmcBorrow);
+
+    /**
+     * 修改cmc借款申请
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return 结果
+     */
+    public int updateCmcBorrow(CmcBorrow cmcBorrow);
+
+    /**
+     * 批量删除cmc借款申请
+     * 
+     * @param borrowJds 需要删除的cmc借款申请主键集合
+     * @return 结果
+     */
+    public int deleteCmcBorrowByBorrowJds(String[] borrowJds);
+
+    /**
+     * 删除cmc借款申请信息
+     * 
+     * @param borrowJd cmc借款申请主键
+     * @return 结果
+     */
+    public int deleteCmcBorrowByBorrowJd(String borrowJd);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBorrowDetailServiceImpl.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.CmcBorrowDetailMapper;
+import com.ruoyi.oa.domain.CmcBorrowDetail;
+import com.ruoyi.oa.service.ICmcBorrowDetailService;
+
+/**
+ * cmc借款明细Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+@Service
+public class CmcBorrowDetailServiceImpl implements ICmcBorrowDetailService 
+{
+    @Autowired
+    private CmcBorrowDetailMapper cmcBorrowDetailMapper;
+
+    /**
+     * 查询cmc借款明细
+     * 
+     * @param borrowDetailId cmc借款明细主键
+     * @return cmc借款明细
+     */
+    @Override
+    public CmcBorrowDetail selectCmcBorrowDetailByBorrowDetailId(String borrowDetailId)
+    {
+        return cmcBorrowDetailMapper.selectCmcBorrowDetailByBorrowDetailId(borrowDetailId);
+    }
+
+    /**
+     * 查询cmc借款明细列表
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return cmc借款明细
+     */
+    @Override
+    public List<CmcBorrowDetail> selectCmcBorrowDetailList(CmcBorrowDetail cmcBorrowDetail)
+    {
+        return cmcBorrowDetailMapper.selectCmcBorrowDetailList(cmcBorrowDetail);
+    }
+
+    /**
+     * 新增cmc借款明细
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBorrowDetail(CmcBorrowDetail cmcBorrowDetail)
+    {
+        return cmcBorrowDetailMapper.insertCmcBorrowDetail(cmcBorrowDetail);
+    }
+
+    /**
+     * 修改cmc借款明细
+     * 
+     * @param cmcBorrowDetail cmc借款明细
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBorrowDetail(CmcBorrowDetail cmcBorrowDetail)
+    {
+        return cmcBorrowDetailMapper.updateCmcBorrowDetail(cmcBorrowDetail);
+    }
+
+    /**
+     * 批量删除cmc借款明细
+     * 
+     * @param borrowDetailIds 需要删除的cmc借款明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBorrowDetailByBorrowDetailIds(String[] borrowDetailIds)
+    {
+        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowDetailIds(borrowDetailIds);
+    }
+
+    /**
+     * 删除cmc借款明细信息
+     * 
+     * @param borrowDetailId cmc借款明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBorrowDetailByBorrowDetailId(String borrowDetailId)
+    {
+        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowDetailId(borrowDetailId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcBorrowServiceImpl.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.CmcBorrowMapper;
+import com.ruoyi.oa.domain.CmcBorrow;
+import com.ruoyi.oa.service.ICmcBorrowService;
+
+/**
+ * cmc借款申请Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-04-07
+ */
+@Service
+public class CmcBorrowServiceImpl implements ICmcBorrowService 
+{
+    @Autowired
+    private CmcBorrowMapper cmcBorrowMapper;
+
+    /**
+     * 查询cmc借款申请
+     * 
+     * @param borrowJd cmc借款申请主键
+     * @return cmc借款申请
+     */
+    @Override
+    public CmcBorrow selectCmcBorrowByBorrowJd(String borrowJd)
+    {
+        return cmcBorrowMapper.selectCmcBorrowByBorrowJd(borrowJd);
+    }
+
+    /**
+     * 查询cmc借款申请列表
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return cmc借款申请
+     */
+    @Override
+    public List<CmcBorrow> selectCmcBorrowList(CmcBorrow cmcBorrow)
+    {
+        return cmcBorrowMapper.selectCmcBorrowList(cmcBorrow);
+    }
+
+    /**
+     * 新增cmc借款申请
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return 结果
+     */
+    @Override
+    public int insertCmcBorrow(CmcBorrow cmcBorrow)
+    {
+        return cmcBorrowMapper.insertCmcBorrow(cmcBorrow);
+    }
+
+    /**
+     * 修改cmc借款申请
+     * 
+     * @param cmcBorrow cmc借款申请
+     * @return 结果
+     */
+    @Override
+    public int updateCmcBorrow(CmcBorrow cmcBorrow)
+    {
+        return cmcBorrowMapper.updateCmcBorrow(cmcBorrow);
+    }
+
+    /**
+     * 批量删除cmc借款申请
+     * 
+     * @param borrowJds 需要删除的cmc借款申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBorrowByBorrowJds(String[] borrowJds)
+    {
+        return cmcBorrowMapper.deleteCmcBorrowByBorrowJds(borrowJds);
+    }
+
+    /**
+     * 删除cmc借款申请信息
+     * 
+     * @param borrowJd cmc借款申请主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcBorrowByBorrowJd(String borrowJd)
+    {
+        return cmcBorrowMapper.deleteCmcBorrowByBorrowJd(borrowJd);
+    }
+}

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

@@ -0,0 +1,93 @@
+<?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.CmcBorrowDetailMapper">
+    
+    <resultMap type="CmcBorrowDetail" id="CmcBorrowDetailResult">
+        <result property="borrowDetailId"    column="borrow_detail_id"    />
+        <result property="borrowId"    column="borrow_id"    />
+        <result property="borrowItem"    column="borrow_item"    />
+        <result property="unit"    column="unit"    />
+        <result property="price"    column="price"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="applyAmount"    column="apply_amount"    />
+        <result property="xmAmount"    column="xm_amount"    />
+        <result property="managerAmount"    column="manager_amount"    />
+    </resultMap>
+
+    <sql id="selectCmcBorrowDetailVo">
+        select borrow_detail_id, borrow_id, borrow_item, unit, price, quantity, apply_amount, xm_amount, manager_amount from cmc_borrow_detail
+    </sql>
+
+    <select id="selectCmcBorrowDetailList" parameterType="CmcBorrowDetail" resultMap="CmcBorrowDetailResult">
+        <include refid="selectCmcBorrowDetailVo"/>
+        <where>  
+            <if test="borrowId != null  and borrowId != ''"> and borrow_id = #{borrowId}</if>
+            <if test="borrowItem != null  and borrowItem != ''"> and borrow_item = #{borrowItem}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="applyAmount != null "> and apply_amount = #{applyAmount}</if>
+            <if test="xmAmount != null "> and xm_amount = #{xmAmount}</if>
+            <if test="managerAmount != null "> and manager_amount = #{managerAmount}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBorrowDetailByBorrowDetailId" parameterType="String" resultMap="CmcBorrowDetailResult">
+        <include refid="selectCmcBorrowDetailVo"/>
+        where borrow_detail_id = #{borrowDetailId}
+    </select>
+        
+    <insert id="insertCmcBorrowDetail" parameterType="CmcBorrowDetail">
+        insert into cmc_borrow_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="borrowDetailId != null">borrow_detail_id,</if>
+            <if test="borrowId != null">borrow_id,</if>
+            <if test="borrowItem != null">borrow_item,</if>
+            <if test="unit != null">unit,</if>
+            <if test="price != null">price,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="applyAmount != null">apply_amount,</if>
+            <if test="xmAmount != null">xm_amount,</if>
+            <if test="managerAmount != null">manager_amount,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="borrowDetailId != null">#{borrowDetailId},</if>
+            <if test="borrowId != null">#{borrowId},</if>
+            <if test="borrowItem != null">#{borrowItem},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="price != null">#{price},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="applyAmount != null">#{applyAmount},</if>
+            <if test="xmAmount != null">#{xmAmount},</if>
+            <if test="managerAmount != null">#{managerAmount},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBorrowDetail" parameterType="CmcBorrowDetail">
+        update cmc_borrow_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="borrowId != null">borrow_id = #{borrowId},</if>
+            <if test="borrowItem != null">borrow_item = #{borrowItem},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="applyAmount != null">apply_amount = #{applyAmount},</if>
+            <if test="xmAmount != null">xm_amount = #{xmAmount},</if>
+            <if test="managerAmount != null">manager_amount = #{managerAmount},</if>
+        </trim>
+        where borrow_detail_id = #{borrowDetailId}
+    </update>
+
+    <delete id="deleteCmcBorrowDetailByBorrowDetailId" parameterType="String">
+        delete from cmc_borrow_detail where borrow_detail_id = #{borrowDetailId}
+    </delete>
+
+    <delete id="deleteCmcBorrowDetailByBorrowDetailIds" parameterType="String">
+        delete from cmc_borrow_detail where borrow_detail_id in 
+        <foreach item="borrowDetailId" collection="array" open="(" separator="," close=")">
+            #{borrowDetailId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -0,0 +1,163 @@
+<?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.CmcBorrowMapper">
+    
+    <resultMap type="CmcBorrow" id="CmcBorrowResult">
+        <result property="borrowJd"    column="borrow_jd"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="borrowType"    column="borrow_type"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyDate"    column="apply_date"    />
+        <result property="applyAmount"    column="apply_amount"    />
+        <result property="managerAmount"    column="manager_amount"    />
+        <result property="deptComment"    column="dept_comment"    />
+        <result property="deptUserId"    column="dept_user_id"    />
+        <result property="xmUserId"    column="xm_user_id"    />
+        <result property="xmComment"    column="xm_comment"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="zjlUserId"    column="zjl_user_id"    />
+        <result property="zjlComment"    column="zjl_comment"    />
+        <result property="cwUserId"    column="cw_user_id"    />
+        <result property="cwComment"    column="cw_comment"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="xmTime"    column="xm_time"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="zjlTime"    column="zjl_time"    />
+        <result property="lendTime"    column="lend_time"    />
+    </resultMap>
+
+    <sql id="selectCmcBorrowVo">
+        select borrow_jd, project_id, borrow_type, apply_reason, applier, apply_date, apply_amount, manager_amount, dept_comment, dept_user_id, xm_user_id, xm_comment, manager_comment, manager_user_id, zjl_user_id, zjl_comment, cw_user_id, cw_comment, dept_time, xm_time, manager_time, zjl_time, lend_time from cmc_borrow
+    </sql>
+
+    <select id="selectCmcBorrowList" parameterType="CmcBorrow" resultMap="CmcBorrowResult">
+        <include refid="selectCmcBorrowVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="borrowType != null  and borrowType != ''"> and borrow_type = #{borrowType}</if>
+            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
+            <if test="applier != null "> and applier = #{applier}</if>
+            <if test="applyDate != null "> and apply_date = #{applyDate}</if>
+            <if test="applyAmount != null "> and apply_amount = #{applyAmount}</if>
+            <if test="managerAmount != null "> and manager_amount = #{managerAmount}</if>
+            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
+            <if test="deptUserId != null "> and dept_user_id = #{deptUserId}</if>
+            <if test="xmUserId != null "> and xm_user_id = #{xmUserId}</if>
+            <if test="xmComment != null  and xmComment != ''"> and xm_comment = #{xmComment}</if>
+            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
+            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
+            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
+            <if test="cwUserId != null "> and cw_user_id = #{cwUserId}</if>
+            <if test="cwComment != null  and cwComment != ''"> and cw_comment = #{cwComment}</if>
+            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
+            <if test="xmTime != null "> and xm_time = #{xmTime}</if>
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
+            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
+            <if test="lendTime != null "> and lend_time = #{lendTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcBorrowByBorrowJd" parameterType="String" resultMap="CmcBorrowResult">
+        <include refid="selectCmcBorrowVo"/>
+        where borrow_jd = #{borrowJd}
+    </select>
+        
+    <insert id="insertCmcBorrow" parameterType="CmcBorrow">
+        insert into cmc_borrow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="borrowJd != null">borrow_jd,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="borrowType != null">borrow_type,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyDate != null">apply_date,</if>
+            <if test="applyAmount != null">apply_amount,</if>
+            <if test="managerAmount != null">manager_amount,</if>
+            <if test="deptComment != null">dept_comment,</if>
+            <if test="deptUserId != null">dept_user_id,</if>
+            <if test="xmUserId != null">xm_user_id,</if>
+            <if test="xmComment != null">xm_comment,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="zjlUserId != null">zjl_user_id,</if>
+            <if test="zjlComment != null">zjl_comment,</if>
+            <if test="cwUserId != null">cw_user_id,</if>
+            <if test="cwComment != null">cw_comment,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="xmTime != null">xm_time,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="zjlTime != null">zjl_time,</if>
+            <if test="lendTime != null">lend_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="borrowJd != null">#{borrowJd},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="borrowType != null">#{borrowType},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyDate != null">#{applyDate},</if>
+            <if test="applyAmount != null">#{applyAmount},</if>
+            <if test="managerAmount != null">#{managerAmount},</if>
+            <if test="deptComment != null">#{deptComment},</if>
+            <if test="deptUserId != null">#{deptUserId},</if>
+            <if test="xmUserId != null">#{xmUserId},</if>
+            <if test="xmComment != null">#{xmComment},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="zjlUserId != null">#{zjlUserId},</if>
+            <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="cwUserId != null">#{cwUserId},</if>
+            <if test="cwComment != null">#{cwComment},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="xmTime != null">#{xmTime},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="zjlTime != null">#{zjlTime},</if>
+            <if test="lendTime != null">#{lendTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcBorrow" parameterType="CmcBorrow">
+        update cmc_borrow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="borrowType != null">borrow_type = #{borrowType},</if>
+            <if test="applyReason != null">apply_reason = #{applyReason},</if>
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyDate != null">apply_date = #{applyDate},</if>
+            <if test="applyAmount != null">apply_amount = #{applyAmount},</if>
+            <if test="managerAmount != null">manager_amount = #{managerAmount},</if>
+            <if test="deptComment != null">dept_comment = #{deptComment},</if>
+            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
+            <if test="xmUserId != null">xm_user_id = #{xmUserId},</if>
+            <if test="xmComment != null">xm_comment = #{xmComment},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
+            <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
+            <if test="cwComment != null">cw_comment = #{cwComment},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="xmTime != null">xm_time = #{xmTime},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+            <if test="lendTime != null">lend_time = #{lendTime},</if>
+        </trim>
+        where borrow_jd = #{borrowJd}
+    </update>
+
+    <delete id="deleteCmcBorrowByBorrowJd" parameterType="String">
+        delete from cmc_borrow where borrow_jd = #{borrowJd}
+    </delete>
+
+    <delete id="deleteCmcBorrowByBorrowJds" parameterType="String">
+        delete from cmc_borrow where borrow_jd in 
+        <foreach item="borrowJd" collection="array" open="(" separator="," close=")">
+            #{borrowJd}
+        </foreach>
+    </delete>
+</mapper>

oa-back/sql/sql.sql

@@ -3863,6 +3863,63 @@ create table `cmc_safe`  (
 -- 初始化-安全交底表数据
 -- ----------------------------
 
+-- ----------------------------
+-- 45、cmc借款申请表
+-- ----------------------------
+drop table if exists `cmc_borrow`;
+create table `cmc_borrow`  (
+  `borrow_jd` 		char(19)		not null 	comment '借款申请id',
+  `project_id` 		char(19)  		default null comment '项目id',
+  `borrow_type` 	char(1)  		default null comment '借款类型',
+  `apply_reason` 	varchar(255)  	default null comment '借款事由',
+  `applier` 		bigint 			default null comment '借款人',
+  `apply_date` 		datetime 		default null comment '借款日期',
+  `apply_amount` 	decimal(10, 2) 	default null comment '申请金额',
+  `manager_amount` 	decimal(10, 2) 	default null comment '核准金额',
+  `dept_comment` 	varchar(255)  	default null comment '部门意见',
+  `dept_user_id` 	bigint 			default null comment '部门审批人',
+  `xm_user_id` 		bigint 			default null comment '项目部审批人',
+  `xm_comment` 		varchar(255)  	default null comment '项目部审批意见',
+  `manager_comment` varchar(255)  	default null comment '分管审批意见',
+  `manager_user_id` bigint 			default null comment '分管审批人',
+  `zjl_user_id` 	bigint 			default null comment '总经理审批人',
+  `zjl_comment` 	varchar(255)  	default null comment '总经理审批意见',
+  `cw_user_id` 		bigint 			default null comment '财务部经办人',
+  `cw_comment` 		varchar(255)  	default null comment '财务部支付备注',
+  `dept_time` 		datetime 		default null comment '部门审批时间',
+  `xm_time` 		datetime 		default null comment '项目部审批时间',
+  `manager_time` 	datetime 		default null comment '分管审批时间',
+  `zjl_time` 		datetime 		default null comment '总经理审批时间',
+  `lend_time` 		datetime 		default null comment '借款支付时间',
+  primary key (`borrow_jd`)
+) engine = innodb comment = 'cmc借款申请表';
+
+-- ----------------------------
+-- 初始化-借款申请表数据
+-- ----------------------------
+
+-- ----------------------------
+-- 46、cmc借款明细表
+-- ----------------------------
+drop table if exists `cmc_borrow_detail`;
+create table `cmc_borrow_detail`  (
+  `borrow_detail_id`	char(19)  		not null 	comment '借款明细id',
+  `borrow_id` 			char(19)  		default null comment '借款id',
+  `borrow_item` 		varchar(50)  	default null comment '开支项',
+  `unit` 				varchar(10)  	default null comment '单位',
+  `price` 				decimal(10, 2) 	default null comment '单价',
+  `quantity` 			int 			default null comment '数量',
+  `apply_amount` 		decimal(10, 2) 	default null comment '申请金额',
+  `xm_amount` 			decimal(10, 2) 	default null comment '项目部校核金额',
+  `manager_amount` 		decimal(10, 2) 	default null comment '分管审核金额',
+  primary key (`borrow_detail_id`)
+) engine = innodb comment = 'cmc借款明细表';
+
+-- ----------------------------
+-- 初始化-借款明细表数据
+-- ----------------------------
+
+
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 

oa-ui/src/api/oa/borrow/borrow.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc借款申请列表
+export function listBorrow(query) {
+  return request({
+    url: '/oa/borrow/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc借款申请详细
+export function getBorrow(borrowJd) {
+  return request({
+    url: '/oa/borrow/' + borrowJd,
+    method: 'get'
+  })
+}
+
+// 新增cmc借款申请
+export function addBorrow(data) {
+  return request({
+    url: '/oa/borrow',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc借款申请
+export function updateBorrow(data) {
+  return request({
+    url: '/oa/borrow',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc借款申请
+export function delBorrow(borrowJd) {
+  return request({
+    url: '/oa/borrow/' + borrowJd,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/borrow/borrowDetail.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc借款明细列表
+export function listBorrowDetail(query) {
+  return request({
+    url: '/oa/borrowDetail/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc借款明细详细
+export function getBorrowDetail(borrowDetailId) {
+  return request({
+    url: '/oa/borrowDetail/' + borrowDetailId,
+    method: 'get'
+  })
+}
+
+// 新增cmc借款明细
+export function addBorrowDetail(data) {
+  return request({
+    url: '/oa/borrowDetail',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc借款明细
+export function updateBorrowDetail(data) {
+  return request({
+    url: '/oa/borrowDetail',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc借款明细
+export function delBorrowDetail(borrowDetailId) {
+  return request({
+    url: '/oa/borrowDetail/' + borrowDetailId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,343 @@
+<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="借款id" prop="borrowId">
+        <el-input
+          v-model="queryParams.borrowId"
+          placeholder="请输入借款id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="开支项" prop="borrowItem">
+        <el-input
+          v-model="queryParams.borrowItem"
+          placeholder="请输入开支项"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input
+          v-model="queryParams.unit"
+          placeholder="请输入单位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单价" prop="price">
+        <el-input
+          v-model="queryParams.price"
+          placeholder="请输入单价"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="数量" prop="quantity">
+        <el-input
+          v-model="queryParams.quantity"
+          placeholder="请输入数量"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请金额" prop="applyAmount">
+        <el-input
+          v-model="queryParams.applyAmount"
+          placeholder="请输入申请金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目部校核金额" prop="xmAmount">
+        <el-input
+          v-model="queryParams.xmAmount"
+          placeholder="请输入项目部校核金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管审核金额" prop="managerAmount">
+        <el-input
+          v-model="queryParams.managerAmount"
+          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:borrowDetail: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:borrowDetail: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:borrowDetail: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:borrowDetail:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="borrowDetailList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="借款明细id" align="center" prop="borrowDetailId" />
+      <el-table-column label="借款id" align="center" prop="borrowId" />
+      <el-table-column label="开支项" align="center" prop="borrowItem" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="单价" align="center" prop="price" />
+      <el-table-column label="数量" align="center" prop="quantity" />
+      <el-table-column label="申请金额" align="center" prop="applyAmount" />
+      <el-table-column label="项目部校核金额" align="center" prop="xmAmount" />
+      <el-table-column label="分管审核金额" align="center" prop="managerAmount" />
+      <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:borrowDetail:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:borrowDetail: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"
+    />
+
+    <!-- 添加或修改cmc借款明细对话框 -->
+    <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="借款id" prop="borrowId">
+          <el-input v-model="form.borrowId" placeholder="请输入借款id" />
+        </el-form-item>
+        <el-form-item label="开支项" prop="borrowItem">
+          <el-input v-model="form.borrowItem" placeholder="请输入开支项" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="form.price" placeholder="请输入单价" />
+        </el-form-item>
+        <el-form-item label="数量" prop="quantity">
+          <el-input v-model="form.quantity" placeholder="请输入数量" />
+        </el-form-item>
+        <el-form-item label="申请金额" prop="applyAmount">
+          <el-input v-model="form.applyAmount" placeholder="请输入申请金额" />
+        </el-form-item>
+        <el-form-item label="项目部校核金额" prop="xmAmount">
+          <el-input v-model="form.xmAmount" placeholder="请输入项目部校核金额" />
+        </el-form-item>
+        <el-form-item label="分管审核金额" prop="managerAmount">
+          <el-input v-model="form.managerAmount" 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 { listBorrowDetail, getBorrowDetail, delBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
+
+export default {
+  name: "BorrowDetail",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc借款明细表格数据
+      borrowDetailList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        borrowId: null,
+        borrowItem: null,
+        unit: null,
+        price: null,
+        quantity: null,
+        applyAmount: null,
+        xmAmount: null,
+        managerAmount: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc借款明细列表 */
+    getList() {
+      this.loading = true;
+      listBorrowDetail(this.queryParams).then(response => {
+        this.borrowDetailList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        borrowDetailId: null,
+        borrowId: null,
+        borrowItem: null,
+        unit: null,
+        price: null,
+        quantity: null,
+        applyAmount: null,
+        xmAmount: null,
+        managerAmount: 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.borrowDetailId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc借款明细";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const borrowDetailId = row.borrowDetailId || this.ids
+      getBorrowDetail(borrowDetailId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc借款明细";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.borrowDetailId != null) {
+            updateBorrowDetail(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBorrowDetail(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const borrowDetailIds = row.borrowDetailId || this.ids;
+      this.$modal.confirm('是否确认删除cmc借款明细编号为"' + borrowDetailIds + '"的数据项？').then(function() {
+        return delBorrowDetail(borrowDetailIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/borrowDetail/export', {
+        ...this.queryParams
+      }, `borrowDetail_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

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

@@ -0,0 +1,582 @@
+<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="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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="applyDate">
+        <el-date-picker clearable
+          v-model="queryParams.applyDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择借款日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="申请金额" prop="applyAmount">
+        <el-input
+          v-model="queryParams.applyAmount"
+          placeholder="请输入申请金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="核准金额" prop="managerAmount">
+        <el-input
+          v-model="queryParams.managerAmount"
+          placeholder="请输入核准金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门意见" prop="deptComment">
+        <el-input
+          v-model="queryParams.deptComment"
+          placeholder="请输入部门意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批人" prop="deptUserId">
+        <el-input
+          v-model="queryParams.deptUserId"
+          placeholder="请输入部门审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目部审批人" prop="xmUserId">
+        <el-input
+          v-model="queryParams.xmUserId"
+          placeholder="请输入项目部审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目部审批意见" prop="xmComment">
+        <el-input
+          v-model="queryParams.xmComment"
+          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="managerUserId">
+        <el-input
+          v-model="queryParams.managerUserId"
+          placeholder="请输入分管审批人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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="cwUserId">
+        <el-input
+          v-model="queryParams.cwUserId"
+          placeholder="请输入财务部经办人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="财务部支付备注" prop="cwComment">
+        <el-input
+          v-model="queryParams.cwComment"
+          placeholder="请输入财务部支付备注"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批时间" prop="deptTime">
+        <el-date-picker clearable
+          v-model="queryParams.deptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="项目部审批时间" prop="xmTime">
+        <el-date-picker clearable
+          v-model="queryParams.xmTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择项目部审批时间">
+        </el-date-picker>
+      </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="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="lendTime">
+        <el-date-picker clearable
+          v-model="queryParams.lendTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择借款支付时间">
+        </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
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:borrow: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:borrow: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:borrow: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:borrow:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="borrowList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="借款申请id" align="center" prop="borrowJd" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="借款类型" align="center" prop="borrowType" />
+      <el-table-column label="借款事由" align="center" prop="applyReason" />
+      <el-table-column label="借款人" align="center" prop="applier" />
+      <el-table-column label="借款日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请金额" align="center" prop="applyAmount" />
+      <el-table-column label="核准金额" align="center" prop="managerAmount" />
+      <el-table-column label="部门意见" align="center" prop="deptComment" />
+      <el-table-column label="部门审批人" align="center" prop="deptUserId" />
+      <el-table-column label="项目部审批人" align="center" prop="xmUserId" />
+      <el-table-column label="项目部审批意见" align="center" prop="xmComment" />
+      <el-table-column label="分管审批意见" align="center" prop="managerComment" />
+      <el-table-column label="分管审批人" align="center" prop="managerUserId" />
+      <el-table-column label="总经理审批人" align="center" prop="zjlUserId" />
+      <el-table-column label="总经理审批意见" align="center" prop="zjlComment" />
+      <el-table-column label="财务部经办人" align="center" prop="cwUserId" />
+      <el-table-column label="财务部支付备注" align="center" prop="cwComment" />
+      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目部审批时间" align="center" prop="xmTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.xmTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <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="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="lendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.lendTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:borrow:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:borrow: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"
+    />
+
+    <!-- 添加或修改cmc借款申请对话框 -->
+    <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="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <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="applyDate">
+          <el-date-picker clearable
+            v-model="form.applyDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择借款日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="申请金额" prop="applyAmount">
+          <el-input v-model="form.applyAmount" placeholder="请输入申请金额" />
+        </el-form-item>
+        <el-form-item label="核准金额" prop="managerAmount">
+          <el-input v-model="form.managerAmount" placeholder="请输入核准金额" />
+        </el-form-item>
+        <el-form-item label="部门意见" prop="deptComment">
+          <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
+        </el-form-item>
+        <el-form-item label="部门审批人" prop="deptUserId">
+          <el-input v-model="form.deptUserId" placeholder="请输入部门审批人" />
+        </el-form-item>
+        <el-form-item label="项目部审批人" prop="xmUserId">
+          <el-input v-model="form.xmUserId" placeholder="请输入项目部审批人" />
+        </el-form-item>
+        <el-form-item label="项目部审批意见" prop="xmComment">
+          <el-input v-model="form.xmComment" 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="managerUserId">
+          <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
+        </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="cwUserId">
+          <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
+        </el-form-item>
+        <el-form-item label="财务部支付备注" prop="cwComment">
+          <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
+        </el-form-item>
+        <el-form-item label="部门审批时间" prop="deptTime">
+          <el-date-picker clearable
+            v-model="form.deptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择部门审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="项目部审批时间" prop="xmTime">
+          <el-date-picker clearable
+            v-model="form.xmTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择项目部审批时间">
+          </el-date-picker>
+        </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="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="lendTime">
+          <el-date-picker clearable
+            v-model="form.lendTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择借款支付时间">
+          </el-date-picker>
+        </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 { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+
+export default {
+  name: "Borrow",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc借款申请表格数据
+      borrowList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        projectId: null,
+        borrowType: null,
+        applyReason: null,
+        applier: null,
+        applyDate: null,
+        applyAmount: null,
+        managerAmount: null,
+        deptComment: null,
+        deptUserId: null,
+        xmUserId: null,
+        xmComment: null,
+        managerComment: null,
+        managerUserId: null,
+        zjlUserId: null,
+        zjlComment: null,
+        cwUserId: null,
+        cwComment: null,
+        deptTime: null,
+        xmTime: null,
+        managerTime: null,
+        zjlTime: null,
+        lendTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc借款申请列表 */
+    getList() {
+      this.loading = true;
+      listBorrow(this.queryParams).then(response => {
+        this.borrowList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        borrowJd: null,
+        projectId: null,
+        borrowType: null,
+        applyReason: null,
+        applier: null,
+        applyDate: null,
+        applyAmount: null,
+        managerAmount: null,
+        deptComment: null,
+        deptUserId: null,
+        xmUserId: null,
+        xmComment: null,
+        managerComment: null,
+        managerUserId: null,
+        zjlUserId: null,
+        zjlComment: null,
+        cwUserId: null,
+        cwComment: null,
+        deptTime: null,
+        xmTime: null,
+        managerTime: null,
+        zjlTime: null,
+        lendTime: 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.borrowJd)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc借款申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const borrowJd = row.borrowJd || this.ids
+      getBorrow(borrowJd).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc借款申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.borrowJd != null) {
+            updateBorrow(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBorrow(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const borrowJds = row.borrowJd || this.ids;
+      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowJds + '"的数据项？').then(function() {
+        return delBorrow(borrowJds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/borrow/export', {
+        ...this.queryParams
+      }, `borrow_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>