1.更改项目内容接口；

2.借款申请录入明细

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -59,10 +60,10 @@ public class CmcBorrowController extends BaseController
     /**
      * 获取cmc借款申请详细信息
      */
-    @GetMapping(value = "/{borrowJd}")
-    public AjaxResult getInfo(@PathVariable("borrowJd") String borrowJd)
+    @GetMapping(value = "/{borrowId}")
+    public AjaxResult getInfo(@PathVariable("borrowId") String borrowId)
     {
-        return success(cmcBorrowService.selectCmcBorrowByBorrowJd(borrowJd));
+        return success(cmcBorrowService.selectCmcBorrowByBorrowId(borrowId));
     }
 
     /**
@@ -72,6 +73,7 @@ public class CmcBorrowController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcBorrow cmcBorrow)
     {
+        cmcBorrow.setApplyDept(getLoginUser().getDeptId());
         return toAjax(cmcBorrowService.insertCmcBorrow(cmcBorrow));
     }
 
@@ -82,6 +84,25 @@ public class CmcBorrowController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBorrow cmcBorrow)
     {
+        if (cmcBorrow.getDeptComment() != null && cmcBorrow.getXmComment() == null) {
+            cmcBorrow.setDeptUserId(getLoginUser().getUserId());
+            cmcBorrow.setDeptTime(new Date());
+        }
+        if (cmcBorrow.getXmComment() != null && cmcBorrow.getManagerComment() == null) {
+            cmcBorrow.setXmUserId(getLoginUser().getUserId());
+            cmcBorrow.setXmTime(new Date());
+        }
+        if (cmcBorrow.getManagerComment() != null && cmcBorrow.getZjlComment() == null) {
+            cmcBorrow.setManagerUserId(getLoginUser().getUserId());
+            cmcBorrow.setManagerTime(new Date());
+        }
+        if (cmcBorrow.getZjlComment() != null && cmcBorrow.getCwComment() == null) {
+            cmcBorrow.setZjlUserId(getLoginUser().getUserId());
+            cmcBorrow.setZjlTime(new Date());
+        }
+        if (cmcBorrow.getLendTime() != null) {
+            cmcBorrow.setCwUserId(getLoginUser().getUserId());
+        }
         return toAjax(cmcBorrowService.updateCmcBorrow(cmcBorrow));
     }
 
@@ -89,9 +110,9 @@ public class CmcBorrowController extends BaseController
      * 删除cmc借款申请
      */
     @Log(title = "cmc借款申请", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{borrowJds}")
-    public AjaxResult remove(@PathVariable String[] borrowJds)
+	@DeleteMapping("/{borrowIds}")
+    public AjaxResult remove(@PathVariable String[] borrowIds)
     {
-        return toAjax(cmcBorrowService.deleteCmcBorrowByBorrowJds(borrowJds));
+        return toAjax(cmcBorrowService.deleteCmcBorrowByBorrowIds(borrowIds));
     }
 }

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

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -59,10 +61,10 @@ public class CmcBorrowDetailController extends BaseController
     /**
      * 获取cmc借款明细详细信息
      */
-    @GetMapping(value = "/{borrowDetailId}")
-    public AjaxResult getInfo(@PathVariable("borrowDetailId") String borrowDetailId)
+    @GetMapping(value = "/{borrowId}")
+    public AjaxResult getInfo(@PathVariable("borrowId") String borrowId)
     {
-        return success(cmcBorrowDetailService.selectCmcBorrowDetailByBorrowDetailId(borrowDetailId));
+        return success(cmcBorrowDetailService.selectCmcBorrowDetailByBorrowId(borrowId));
     }
 
     /**
@@ -72,6 +74,7 @@ public class CmcBorrowDetailController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcBorrowDetail cmcBorrowDetail)
     {
+        cmcBorrowDetail.setBorrowDetailId(new SnowFlake().generateId());
         return toAjax(cmcBorrowDetailService.insertCmcBorrowDetail(cmcBorrowDetail));
     }
 
@@ -89,9 +92,9 @@ public class CmcBorrowDetailController extends BaseController
      * 删除cmc借款明细
      */
     @Log(title = "cmc借款明细", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{borrowDetailIds}")
-    public AjaxResult remove(@PathVariable String[] borrowDetailIds)
+	@DeleteMapping("/{borrowIds}")
+    public AjaxResult remove(@PathVariable String[] borrowIds)
     {
-        return toAjax(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowDetailIds(borrowDetailIds));
+        return toAjax(cmcBorrowDetailService.deleteCmcBorrowDetailByBorrowIds(borrowIds));
     }
 }

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

@@ -130,6 +130,7 @@ public class CmcDeviceApprovalController extends BaseController
             cmcDeviceApproval.setManagerTime(new Date());
         }
         if (formDataJson.getDate("returnDate") != null) {
+            cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
             cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
         }
         if (formDataJson.getString("dispatchComment") != null) {

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -95,68 +96,9 @@ public class CmcProjectController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProject cmcProject)
     {
-        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
-    }
-
-    /**
-     * 新增cmc项目
-     */
-    @Log(title = "cmc项目", businessType = BusinessType.INSERT)
-    @PostMapping( "/submit")
-    public AjaxResult submit(@RequestParam("form")String formData)
-    {
-        JSONObject formDataJson = JSONObject.parse(formData);
-        CmcProject cmcProject = new CmcProject();
-        cmcProject.setProjectId(formDataJson.getString("projectId"));
-        cmcProject.setProjectName(formDataJson.getString("projectName"));
-        cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
-        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
-        cmcProject.setIsFinished(formDataJson.getString("isFinished"));
-        cmcProject.setProjectSource(formDataJson.getString("projectSource"));
-        cmcProject.setPartyA(formDataJson.getString("partyA"));
-        cmcProject.setContactPerson(formDataJson.getString("contactPerson"));
-        cmcProject.setTelephone(formDataJson.getString("telephone"));
-        cmcProject.setProjectType(formDataJson.getString("projectType"));
-        cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
-        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
-        cmcProject.setCreateTime(DateUtils.getNowDate());
+        cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
-        cmcProject.setRemark(formDataJson.getString("remark"));
-        cmcProjectService.insertCmcProject(cmcProject);
-        String workList = formDataJson.getString("workList");
-        workList = workList.substring(1, workList.length() - 1);
-        if (workList.split("}").length > 1) {
-            for (int i = 0; i < workList.split("}").length; i++) {
-                String workArri = workList.split("}")[i] + "}";
-                if (i > 0)
-                    workArri = workArri.substring(1);
-                JSONObject workArrObject = JSONObject.parse(workArri);
-                CmcProjectWork cmcProjectWork = new CmcProjectWork();
-                cmcProjectWork.setWorkId(new SnowFlake().generateId());
-                cmcProjectWork.setProjectId(cmcProject.getProjectId());
-                cmcProjectWork.setContent(workArrObject.getString("content"));
-                cmcProjectWork.setScale(workArrObject.getString("scale"));
-                cmcProjectWork.setUnit(workArrObject.getString("unit"));
-                cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-                cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
-                cmcProjectWork.setRemark(workArrObject.getString("remark"));
-                cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
-            }
-        }
-        else {
-            JSONObject workArrObject = JSONObject.parse(workList);
-            CmcProjectWork cmcProjectWork = new CmcProjectWork();
-            cmcProjectWork.setWorkId(new SnowFlake().generateId());
-            cmcProjectWork.setProjectId(cmcProject.getProjectId());
-            cmcProjectWork.setContent(workArrObject.getString("content"));
-            cmcProjectWork.setScale(workArrObject.getString("scale"));
-            cmcProjectWork.setUnit(workArrObject.getString("unit"));
-            cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-            cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
-            cmcProjectWork.setRemark(workArrObject.getString("remark"));
-            cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
-        }
-        return success("新增成功");
+        return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 
     /**
@@ -169,71 +111,6 @@ public class CmcProjectController extends BaseController
         return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
 
-    /**
-     * 修改cmc项目
-     */
-    @Log(title = "cmc项目", businessType = BusinessType.UPDATE)
-    @PutMapping( "/modify")
-    public AjaxResult modify(@RequestParam("form") String formData)
-    {
-        JSONObject formDataJson = JSONObject.parse(formData);
-        CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(formDataJson.getString("projectId"));
-        cmcProject.setProjectName(formDataJson.getString("projectName"));
-        cmcProject.setProjectNumber(formDataJson.getString("projectNumber"));
-        cmcProject.setProjectLeader(formDataJson.getLong("projectLeader"));
-        cmcProject.setIsFinished(formDataJson.getString("isFinished"));
-        cmcProject.setProjectSource(formDataJson.getString("projectSource"));
-        cmcProject.setPartyA(formDataJson.getString("partyA"));
-        cmcProject.setContactPerson(formDataJson.getString("contactPerson"));
-        cmcProject.setTelephone(formDataJson.getString("telephone"));
-        cmcProject.setProjectType(formDataJson.getString("projectType"));
-        cmcProject.setProjectLevel(formDataJson.getString("projectLevel"));
-        cmcProject.setProjectRegistrant(formDataJson.getLong("projectRegistrant"));
-        cmcProject.setSiteLeader(formDataJson.getLong("siteLeader"));
-        cmcProject.setUndertakingDept(formDataJson.getString("undertakingDept"));
-        cmcProject.setCreateTime(DateUtils.getNowDate());
-        cmcProject.setIsFinished("0");
-        cmcProject.setRemark(formDataJson.getString("remark"));
-        String workList = formDataJson.getString("workList");
-        if (workList != null) {
-            workList = workList.substring(1, workList.length() - 1);
-            if (workList.split("}").length > 1) {
-                cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
-                for (int i = 0; i < workList.split("}").length; i++) {
-                    String workArri = workList.split("}")[i] + "}";
-                    if (i > 0)
-                        workArri = workArri.substring(1);
-                    JSONObject workArrObject = JSONObject.parse(workArri);
-                    CmcProjectWork cmcProjectWork = new CmcProjectWork();
-                    cmcProjectWork.setWorkId(new SnowFlake().generateId());
-                    cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
-                    cmcProjectWork.setContent(workArrObject.getString("content"));
-                    cmcProjectWork.setScale(workArrObject.getString("scale"));
-                    cmcProjectWork.setUnit(workArrObject.getString("unit"));
-                    cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-                    cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
-                    cmcProjectWork.setRemark(workArrObject.getString("remark"));
-                    cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
-                }
-            }
-            else {
-                JSONObject workArrObject = JSONObject.parse(workList);
-                cmcProjectWorkService.deleteCmcProjectWorkByProjectId(formDataJson.getString("projectId"));
-                CmcProjectWork cmcProjectWork = new CmcProjectWork();
-                cmcProjectWork.setWorkId(new SnowFlake().generateId());
-                cmcProjectWork.setProjectId(formDataJson.getString("projectId"));
-                cmcProjectWork.setContent(workArrObject.getString("content"));
-                cmcProjectWork.setScale(workArrObject.getString("scale"));
-                cmcProjectWork.setUnit(workArrObject.getString("unit"));
-                cmcProjectWork.setWorkload(workArrObject.getString("workload"));
-                cmcProjectWork.setDeadline(workArrObject.getString("deadline") != null ? DateUtils.dateTime("yyyy-MM-dd", workArrObject.getString("deadline")) : null);
-                cmcProjectWork.setRemark(workArrObject.getString("remark"));
-                cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork);
-            }
-        }
-        return toAjax(cmcProjectService.updateCmcProject(cmcProject));
-    }
-
     /**
      * 删除cmc项目
      */

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

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,7 @@ public class CmcProjectProgressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
     {
+        cmcProjectProgress.setProgressId(new SnowFlake().generateId());
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
     }
 

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

@@ -2,6 +2,8 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SnowFlake;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -72,6 +74,7 @@ public class CmcProjectWorkController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectWork cmcProjectWork)
     {
+        cmcProjectWork.setWorkId(new SnowFlake().generateId());
         return toAjax(cmcProjectWorkService.insertCmcProjectWork(cmcProjectWork));
     }
 

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

@@ -73,6 +73,7 @@ public class CmcTechnicalController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcTechnical cmcTechnical)
     {
+        cmcTechnical.setTechnicalTime(new Date());
         return toAjax(cmcTechnicalService.insertCmcTechnical(cmcTechnical));
     }
 

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

@@ -3,6 +3,7 @@ package com.ruoyi.oa.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -20,7 +21,7 @@ public class CmcBorrow extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 借款申请id */
-    private String borrowJd;
+    private String borrowId;
 
     /** 项目id */
     @Excel(name = "项目id")
@@ -28,17 +29,15 @@ public class CmcBorrow extends BaseEntity
 
     private CmcProject project;
 
-    /** 借款类型 */
-    @Excel(name = "借款类型")
-    private String borrowType;
-
     /** 借款事由 */
     @Excel(name = "借款事由")
     private String applyReason;
 
     /** 借款部门 */
     @Excel(name = "借款部门")
-    private String applyDept;
+    private Long applyDept;
+
+    private SysDept dept;
 
     /** 借款人 */
     @Excel(name = "借款人")
@@ -46,6 +45,16 @@ public class CmcBorrow extends BaseEntity
 
     private SysUser applierUser;
 
+    private SysUser deptUser;
+
+    private SysUser xmUser;
+
+    private SysUser managerUser;
+
+    private SysUser zjlUser;
+
+    private SysUser cwUser;
+
     /** 借款日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "借款日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -124,14 +133,14 @@ public class CmcBorrow extends BaseEntity
     @Excel(name = "借款支付时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date lendTime;
 
-    public void setBorrowJd(String borrowJd) 
+    public void setBorrowId(String borrowId) 
     {
-        this.borrowJd = borrowJd;
+        this.borrowId = borrowId;
     }
 
-    public String getBorrowJd() 
+    public String getBorrowId() 
     {
-        return borrowJd;
+        return borrowId;
     }
     public void setProjectId(String projectId) 
     {
@@ -151,15 +160,6 @@ public class CmcBorrow extends BaseEntity
     {
         return project;
     }
-    public void setBorrowType(String borrowType) 
-    {
-        this.borrowType = borrowType;
-    }
-
-    public String getBorrowType() 
-    {
-        return borrowType;
-    }
     public void setApplyReason(String applyReason) 
     {
         this.applyReason = applyReason;
@@ -169,15 +169,24 @@ public class CmcBorrow extends BaseEntity
     {
         return applyReason;
     }
-    public void setApplyDept(String applyDept)
+    public void setApplyDept(Long applyDept)
     {
         this.applyDept = applyDept;
     }
 
-    public String getApplyDept()
+    public Long getApplyDept()
     {
         return applyDept;
     }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
     public void setApplier(Long applier) 
     {
         this.applier = applier;
@@ -196,6 +205,51 @@ public class CmcBorrow extends BaseEntity
     {
         return applierUser;
     }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    public void setXmUser(SysUser xmUser)
+    {
+        this.xmUser = xmUser;
+    }
+
+    public SysUser getXmUser()
+    {
+        return xmUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
+    public void setZjlUser(SysUser zjlUser)
+    {
+        this.zjlUser = zjlUser;
+    }
+
+    public SysUser getZjlUser()
+    {
+        return zjlUser;
+    }
+    public void setCwUser(SysUser cwUser)
+    {
+        this.cwUser = cwUser;
+    }
+
+    public SysUser getCwUser()
+    {
+        return cwUser;
+    }
     public void setApplyDate(Date applyDate) 
     {
         this.applyDate = applyDate;
@@ -362,9 +416,8 @@ public class CmcBorrow extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("borrowJd", getBorrowJd())
+            .append("borrowId", getBorrowId())
             .append("projectId", getProjectId())
-            .append("borrowType", getBorrowType())
             .append("applyReason", getApplyReason())
             .append("applier", getApplier())
             .append("applyDept", getApplyDept())

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

@@ -92,6 +92,11 @@ public class CmcProject extends BaseEntity
     @Excel(name = "组织交底文档")
     private String organizeDocument;
 
+    /** 项目登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "项目登记日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date registerTime;
+
     /** 项目安排日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "项目安排日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -282,6 +287,15 @@ public class CmcProject extends BaseEntity
     {
         return siteLeader;
     }
+    public void setRegisterTime(Date registerTime)
+    {
+        this.registerTime = registerTime;
+    }
+
+    public Date getRegisterTime()
+    {
+        return registerTime;
+    }
     public void setPlanTime(Date planTime)
     {
         this.planTime = planTime;

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

@@ -14,10 +14,10 @@ public interface CmcBorrowDetailMapper
     /**
      * 查询cmc借款明细
      * 
-     * @param borrowDetailId cmc借款明细主键
+     * @param borrowId cmc借款明细主键
      * @return cmc借款明细
      */
-    public CmcBorrowDetail selectCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+    public List<CmcBorrowDetail> selectCmcBorrowDetailByBorrowId(String borrowId);
 
     /**
      * 查询cmc借款明细列表
@@ -46,16 +46,16 @@ public interface CmcBorrowDetailMapper
     /**
      * 删除cmc借款明细
      * 
-     * @param borrowDetailId cmc借款明细主键
+     * @param borrowId cmc借款明细主键
      * @return 结果
      */
-    public int deleteCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+    public int deleteCmcBorrowDetailByBorrowId(String borrowId);
 
     /**
      * 批量删除cmc借款明细
      * 
-     * @param borrowDetailIds 需要删除的数据主键集合
+     * @param borrowIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBorrowDetailByBorrowDetailIds(String[] borrowDetailIds);
+    public int deleteCmcBorrowDetailByBorrowIds(String[] borrowIds);
 }

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

@@ -14,10 +14,10 @@ public interface CmcBorrowMapper
     /**
      * 查询cmc借款申请
      * 
-     * @param borrowJd cmc借款申请主键
+     * @param borrowId cmc借款申请主键
      * @return cmc借款申请
      */
-    public CmcBorrow selectCmcBorrowByBorrowJd(String borrowJd);
+    public CmcBorrow selectCmcBorrowByBorrowId(String borrowId);
 
     /**
      * 查询cmc借款申请列表
@@ -46,16 +46,16 @@ public interface CmcBorrowMapper
     /**
      * 删除cmc借款申请
      * 
-     * @param borrowJd cmc借款申请主键
+     * @param borrowId cmc借款申请主键
      * @return 结果
      */
-    public int deleteCmcBorrowByBorrowJd(String borrowJd);
+    public int deleteCmcBorrowByBorrowId(String borrowId);
 
     /**
      * 批量删除cmc借款申请
      * 
-     * @param borrowJds 需要删除的数据主键集合
+     * @param borrowIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcBorrowByBorrowJds(String[] borrowJds);
+    public int deleteCmcBorrowByBorrowIds(String[] borrowIds);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcBorrowDetailService
     /**
      * 查询cmc借款明细
      * 
-     * @param borrowDetailId cmc借款明细主键
+     * @param borrowId cmc借款明细主键
      * @return cmc借款明细
      */
-    public CmcBorrowDetail selectCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+    public List<CmcBorrowDetail> selectCmcBorrowDetailByBorrowId(String borrowId);
 
     /**
      * 查询cmc借款明细列表
@@ -46,16 +46,16 @@ public interface ICmcBorrowDetailService
     /**
      * 批量删除cmc借款明细
      * 
-     * @param borrowDetailIds 需要删除的cmc借款明细主键集合
+     * @param borrowIds 需要删除的cmc借款明细主键集合
      * @return 结果
      */
-    public int deleteCmcBorrowDetailByBorrowDetailIds(String[] borrowDetailIds);
+    public int deleteCmcBorrowDetailByBorrowIds(String[] borrowIds);
 
     /**
      * 删除cmc借款明细信息
      * 
-     * @param borrowDetailId cmc借款明细主键
+     * @param borrowId cmc借款明细主键
      * @return 结果
      */
-    public int deleteCmcBorrowDetailByBorrowDetailId(String borrowDetailId);
+    public int deleteCmcBorrowDetailByBorrowId(String borrowId);
 }

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

@@ -14,10 +14,10 @@ public interface ICmcBorrowService
     /**
      * 查询cmc借款申请
      * 
-     * @param borrowJd cmc借款申请主键
+     * @param borrowId cmc借款申请主键
      * @return cmc借款申请
      */
-    public CmcBorrow selectCmcBorrowByBorrowJd(String borrowJd);
+    public CmcBorrow selectCmcBorrowByBorrowId(String borrowId);
 
     /**
      * 查询cmc借款申请列表
@@ -46,16 +46,16 @@ public interface ICmcBorrowService
     /**
      * 批量删除cmc借款申请
      * 
-     * @param borrowJds 需要删除的cmc借款申请主键集合
+     * @param borrowIds 需要删除的cmc借款申请主键集合
      * @return 结果
      */
-    public int deleteCmcBorrowByBorrowJds(String[] borrowJds);
+    public int deleteCmcBorrowByBorrowIds(String[] borrowIds);
 
     /**
      * 删除cmc借款申请信息
      * 
-     * @param borrowJd cmc借款申请主键
+     * @param borrowId cmc借款申请主键
      * @return 结果
      */
-    public int deleteCmcBorrowByBorrowJd(String borrowJd);
+    public int deleteCmcBorrowByBorrowId(String borrowId);
 }

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

@@ -22,13 +22,13 @@ public class CmcBorrowDetailServiceImpl implements ICmcBorrowDetailService
     /**
      * 查询cmc借款明细
      * 
-     * @param borrowDetailId cmc借款明细主键
+     * @param borrowId cmc借款明细主键
      * @return cmc借款明细
      */
     @Override
-    public CmcBorrowDetail selectCmcBorrowDetailByBorrowDetailId(String borrowDetailId)
+    public List<CmcBorrowDetail> selectCmcBorrowDetailByBorrowId(String borrowId)
     {
-        return cmcBorrowDetailMapper.selectCmcBorrowDetailByBorrowDetailId(borrowDetailId);
+        return cmcBorrowDetailMapper.selectCmcBorrowDetailByBorrowId(borrowId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcBorrowDetailServiceImpl implements ICmcBorrowDetailService
     /**
      * 批量删除cmc借款明细
      * 
-     * @param borrowDetailIds 需要删除的cmc借款明细主键
+     * @param borrowIds 需要删除的cmc借款明细主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBorrowDetailByBorrowDetailIds(String[] borrowDetailIds)
+    public int deleteCmcBorrowDetailByBorrowIds(String[] borrowIds)
     {
-        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowDetailIds(borrowDetailIds);
+        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowIds(borrowIds);
     }
 
     /**
      * 删除cmc借款明细信息
      * 
-     * @param borrowDetailId cmc借款明细主键
+     * @param borrowId cmc借款明细主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBorrowDetailByBorrowDetailId(String borrowDetailId)
+    public int deleteCmcBorrowDetailByBorrowId(String borrowId)
     {
-        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowDetailId(borrowDetailId);
+        return cmcBorrowDetailMapper.deleteCmcBorrowDetailByBorrowId(borrowId);
     }
 }

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

@@ -22,13 +22,13 @@ public class CmcBorrowServiceImpl implements ICmcBorrowService
     /**
      * 查询cmc借款申请
      * 
-     * @param borrowJd cmc借款申请主键
+     * @param borrowId cmc借款申请主键
      * @return cmc借款申请
      */
     @Override
-    public CmcBorrow selectCmcBorrowByBorrowJd(String borrowJd)
+    public CmcBorrow selectCmcBorrowByBorrowId(String borrowId)
     {
-        return cmcBorrowMapper.selectCmcBorrowByBorrowJd(borrowJd);
+        return cmcBorrowMapper.selectCmcBorrowByBorrowId(borrowId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcBorrowServiceImpl implements ICmcBorrowService
     /**
      * 批量删除cmc借款申请
      * 
-     * @param borrowJds 需要删除的cmc借款申请主键
+     * @param borrowIds 需要删除的cmc借款申请主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBorrowByBorrowJds(String[] borrowJds)
+    public int deleteCmcBorrowByBorrowIds(String[] borrowIds)
     {
-        return cmcBorrowMapper.deleteCmcBorrowByBorrowJds(borrowJds);
+        return cmcBorrowMapper.deleteCmcBorrowByBorrowIds(borrowIds);
     }
 
     /**
      * 删除cmc借款申请信息
      * 
-     * @param borrowJd cmc借款申请主键
+     * @param borrowId cmc借款申请主键
      * @return 结果
      */
     @Override
-    public int deleteCmcBorrowByBorrowJd(String borrowJd)
+    public int deleteCmcBorrowByBorrowId(String borrowId)
     {
-        return cmcBorrowMapper.deleteCmcBorrowByBorrowJd(borrowJd);
+        return cmcBorrowMapper.deleteCmcBorrowByBorrowId(borrowId);
     }
 }

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

@@ -34,9 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcBorrowDetailByBorrowDetailId" parameterType="String" resultMap="CmcBorrowDetailResult">
+    <select id="selectCmcBorrowDetailByBorrowId" parameterType="String" resultMap="CmcBorrowDetailResult">
         <include refid="selectCmcBorrowDetailVo"/>
-        where borrow_detail_id = #{borrowDetailId}
+        where borrow_id = #{borrowId}
     </select>
         
     <insert id="insertCmcBorrowDetail" parameterType="CmcBorrowDetail">
@@ -80,14 +80,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where borrow_detail_id = #{borrowDetailId}
     </update>
 
-    <delete id="deleteCmcBorrowDetailByBorrowDetailId" parameterType="String">
-        delete from cmc_borrow_detail where borrow_detail_id = #{borrowDetailId}
+    <delete id="deleteCmcBorrowDetailByBorrowId" parameterType="String">
+        delete from cmc_borrow_detail where borrow_id = #{borrowId}
     </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}
+    <delete id="deleteCmcBorrowDetailByBorrowIds" parameterType="String">
+        delete from cmc_borrow_detail where borrow_id in
+        <foreach item="borrowId" collection="array" open="(" separator="," close=")">
+            #{borrowId}
         </foreach>
     </delete>
 </mapper>

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

@@ -5,9 +5,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.oa.mapper.CmcBorrowMapper">
     
     <resultMap type="CmcBorrow" id="CmcBorrowResult">
-        <result property="borrowJd"    column="borrow_jd"    />
+        <result property="borrowId"    column="borrow_id"    />
         <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="applyDept"    column="apply_dept"    />
@@ -29,14 +28,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="managerTime"    column="manager_time"    />
         <result property="zjlTime"    column="zjl_time"    />
         <result property="lendTime"    column="lend_time"    />
-        <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="xmUser"    javaType="SysUser"         resultMap="XmUserResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="SysUser" id="ApplierUserResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="nick_name"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="XmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="xm_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZjlUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="CwUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="cw_nick_name"    />
     </resultMap>
 
     <resultMap type="SysDept" id="SysDeptResult">
@@ -51,8 +80,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBorrowVo">
-        select b.borrow_jd, b.project_id, p.project_number, p.project_name, b.borrow_type, b.apply_reason, b.applier, u.nick_name, d.dept_name, b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, b.xm_user_id, b.xm_comment, b.manager_comment, b.manager_user_id, b.zjl_user_id, b.zjl_comment, b.cw_user_id, b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time from cmc_borrow as b
+        select b.borrow_id, b.project_id, p.project_number, p.project_name, b.apply_reason, b.applier, u.nick_name as applier_nick_name, d.dept_name, b.apply_dept,
+               b.apply_date, b.apply_amount, b.manager_amount, b.dept_comment, b.dept_user_id, u1.nick_name as dept_nick_name, b.xm_user_id, u2.nick_name as xm_nick_name, b.xm_comment,
+               b.manager_comment, b.manager_user_id, u3.nick_name as manager_nick_name, b.zjl_user_id, u4.nick_name as zjl_nick_name, b.zjl_comment, b.cw_user_id, u5.nick_name as cw_nick_name,
+               b.cw_comment, b.dept_time, b.xm_time, b.manager_time, b.zjl_time, b.lend_time from cmc_borrow as b
         left join sys_user as u on u.user_id = b.applier
+        left join sys_user as u1 on u1.user_id = b.dept_user_id
+        left join sys_user as u2 on u2.user_id = b.xm_user_id
+        left join sys_user as u3 on u3.user_id = b.manager_user_id
+        left join sys_user as u4 on u4.user_id = b.zjl_user_id
+        left join sys_user as u5 on u5.user_id = b.cw_user_id
         left join sys_dept as d on d.dept_id = b.apply_dept
         left join cmc_project as p on b.project_id = p.project_id
     </sql>
@@ -61,7 +98,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCmcBorrowVo"/>
         <where>  
             <if test="projectId != null  and projectId != ''"> and b.project_id = #{projectId}</if>
-            <if test="borrowType != null  and borrowType != ''"> and b.borrow_type = #{borrowType}</if>
             <if test="applyReason != null  and applyReason != ''"> and b.apply_reason = #{applyReason}</if>
             <if test="applyDept != null  and applyDept != ''"> and b.apply_dept = #{applyDept}</if>
             <if test="applier != null "> and b.applier = #{applier}</if>
@@ -86,17 +122,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcBorrowByBorrowJd" parameterType="String" resultMap="CmcBorrowResult">
+    <select id="selectCmcBorrowByBorrowId" parameterType="String" resultMap="CmcBorrowResult">
         <include refid="selectCmcBorrowVo"/>
-        where b.borrow_jd = #{borrowJd}
+        where b.borrow_id = #{borrowId}
     </select>
         
     <insert id="insertCmcBorrow" parameterType="CmcBorrow">
         insert into cmc_borrow
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="borrowJd != null">borrow_jd,</if>
+            <if test="borrowId != null">borrow_id,</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="applyDept != null">apply_dept,</if>
@@ -120,9 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lendTime != null">lend_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="borrowJd != null">#{borrowJd},</if>
+            <if test="borrowId != null">#{borrowId},</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="applyDept != null">#{applyDept},</if>
@@ -151,7 +185,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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="applyDept != null">apply_dept = #{applyDept},</if>
@@ -174,17 +207,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
             <if test="lendTime != null">lend_time = #{lendTime},</if>
         </trim>
-        where borrow_jd = #{borrowJd}
+        where borrow_id = #{borrowId}
     </update>
 
-    <delete id="deleteCmcBorrowByBorrowJd" parameterType="String">
-        delete from cmc_borrow where borrow_jd = #{borrowJd}
+    <delete id="deleteCmcBorrowByBorrowId" parameterType="String">
+        delete from cmc_borrow where borrow_id = #{borrowId}
     </delete>
 
-    <delete id="deleteCmcBorrowByBorrowJds" parameterType="String">
-        delete from cmc_borrow where borrow_jd in 
-        <foreach item="borrowJd" collection="array" open="(" separator="," close=")">
-            #{borrowJd}
+    <delete id="deleteCmcBorrowByBorrowIds" parameterType="String">
+        delete from cmc_borrow where borrow_id in 
+        <foreach item="borrowId" collection="array" open="(" separator="," close=")">
+            #{borrowId}
         </foreach>
     </delete>
 </mapper>

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

@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="deptTime"    column="dept_time"    />
         <result property="managerTime"    column="manager_time"    />
+        <result property="dispatchTime"    column="dispatch_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
@@ -70,7 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectCmcDeviceApprovalVo">
         select da.device_apply_id, da.applier, u.nick_name as applier_nick_name, da.use_dept, d.dept_name, da.devices, da.project_id, p.project_number, p.project_name,
                da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.begin_halfday, da.end_date, da.end_halfday, da.days, da.dept_user_id, u1.nick_name as dept_nick_name,
-               da.dept_comment, da.manager_user_id, u2.nick_name as manager_nick_name, da.manager_comment, da.dispatcher, u3.nick_name as dispatch_nick_name, da.dispatch_comment, da.estimate_cost, da.remark from cmc_device_approval as da
+               da.dept_comment, da.manager_user_id, u2.nick_name as manager_nick_name, da.manager_comment, da.dispatcher, u3.nick_name as dispatch_nick_name, da.dispatch_comment,
+               da.estimate_cost, da.remark, da.dept_time, da.manager_time, da.dispatch_time from cmc_device_approval as da
             left join sys_user as u on u.user_id = da.applier
             left join sys_user as u1 on u1.user_id = da.dept_user_id
             left join sys_user as u2 on u2.user_id = da.manager_user_id
@@ -101,6 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatcher != null "> and da.dispatcher = #{dispatcher}</if>
             <if test="dispatchComment != null  and dispatchComment != ''"> and da.dispatch_comment = #{dispatchComment}</if>
             <if test="estimateCost != null "> and da.estimate_cost = #{estimateCost}</if>
+            <if test="deptTime != null "> and da.dept_time = #{deptTime}</if>
+            <if test="managerTime != null "> and da.manager_time = #{managerTime}</if>
+            <if test="dispatchTime != null "> and da.dispatch_time = #{dispatchTime}</if>
         </where>
     </select>
     
@@ -133,6 +138,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatchComment != null">dispatch_comment,</if>
             <if test="estimateCost != null">estimate_cost,</if>
             <if test="remark != null">remark,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="dispatchTime != null">dispatch_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
@@ -156,6 +164,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatchComment != null">#{dispatchComment},</if>
             <if test="estimateCost != null">#{estimateCost},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="dispatchTime != null">#{dispatchTime},</if>
          </trim>
     </insert>
 
@@ -182,6 +193,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="dispatchTime != null">dispatch_time = #{dispatchTime},</if>
         </trim>
         where device_apply_id = #{deviceApplyId}
     </update>

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

@@ -21,7 +21,7 @@
         <result property="undertakingDept"    column="undertaking_dept"    />
         <result property="projectPlanner"    column="project_planner"    />
         <result property="siteLeader"    column="site_leader"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="registerTime"    column="register_time"    />
         <result property="planTime"    column="plan_time"    />
         <result property="entryTime"    column="entry_time"    />
         <result property="exitTime"    column="exit_time"    />
@@ -43,7 +43,7 @@
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.contract_id, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.create_time, p.plan_time, p.entry_time, p.exit_time, p.remark, p.budget_id, p.technical_id from cmc_project as p
+        select p.project_id, p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a, p.contact_person, p.telephone, p.contract_id, p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, p.budget_id, p.technical_id from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
     </sql>
@@ -98,7 +98,7 @@
             <if test="undertakingDept != null">undertaking_dept,</if>
             <if test="projectPlanner != null">project_planner,</if>
             <if test="siteLeader != null">site_leader,</if>
-            <if test="createTime != null">create_time,</if>
+            <if test="registerTime != null">register_time,</if>
             <if test="planTime != null">plan_time,</if>
             <if test="entryTime != null">entry_time,</if>
             <if test="exitTime != null">exit_time,</if>
@@ -123,7 +123,7 @@
             <if test="undertakingDept != null">#{undertakingDept},</if>
             <if test="projectPlanner != null">#{projectPlanner},</if>
             <if test="siteLeader != null">#{siteLeader},</if>
-            <if test="createTime != null">#{createTime},</if>
+            <if test="registerTime != null">#{registerTime},</if>
             <if test="planTime != null">#{planTime},</if>
             <if test="entryTime != null">#{entryTime},</if>
             <if test="exitTime != null">#{exitTime},</if>
@@ -151,7 +151,7 @@
             <if test="undertakingDept != null">undertaking_dept = #{undertakingDept},</if>
             <if test="projectPlanner != null">project_planner = #{projectPlanner},</if>
             <if test="siteLeader != null">site_leader = #{siteLeader},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="registerTime != null">register_time = #{registerTime},</if>
             <if test="planTime != null">plan_time = #{planTime},</if>
             <if test="entryTime != null">entry_time = #{entryTime},</if>
             <if test="exitTime != null">exit_time = #{exitTime},</if>

oa-back/sql/sql.sql

@@ -1373,7 +1373,7 @@ create table cmc_project  (
   project_planner		bigint					default null		comment '项目安排人',
   site_leader			bigint					default null		comment '现场负责人',
   organize_document		varchar(255)			default null		comment '组织交底文档',
-  create_time			datetime				default null		comment '项目登记时间',
+  register_time			datetime				default null		comment '项目登记时间',
   organize_time			datetime				default null		comment '组织交底时间',
   plan_time				datetime				default null		comment '项目安排时间',
   entry_time			datetime				default null		comment '进场时间',
@@ -3750,9 +3750,8 @@ create table `cmc_safe`  (
 -- ----------------------------
 drop table if exists `cmc_borrow`;
 create table `cmc_borrow`  (
-  `borrow_jd` 		char(19)		not null 	comment '借款申请id',
+  `borrow_id` 		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_dept`		bigint			default null comment '申请部门',
@@ -3774,7 +3773,7 @@ create table `cmc_borrow`  (
   `manager_time` 	datetime 		default null comment '分管审批时间',
   `zjl_time` 		datetime 		default null comment '总经理审批时间',
   `lend_time` 		datetime 		default null comment '借款支付时间',
-  primary key (`borrow_jd`)
+  primary key (`borrow_id`)
 ) engine = innodb comment = 'cmc借款申请表';
 
 -- ----------------------------
@@ -5349,12 +5348,12 @@ INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID
 INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('3021', '财务部考核', 'assess', NULL, '', '2024-02-21 10:13:27.359', NULL, NULL, '3021', NULL);
 INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('4001', '用车审批', 'car', NULL, '', '2024-02-23 14:13:15.003', NULL, NULL, '4001', NULL);
 INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('5001', '设备审批', 'device', NULL, '', '2024-03-06 09:32:51.728', NULL, NULL, '5001', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6001', '合同评审', 'contract', NULL, '', '2024-04-02 14:34:45.390', NULL, NULL, '6001', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6005', '项目流转', 'project', NULL, '', '2024-04-02 13:23:32.390', NULL, NULL, '6005', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6009', '安全交底', 'project', NULL, '', '2024-04-02 11:42:24.390', NULL, NULL, '6009', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6013', '技术交底', 'project', NULL, '', '2024-04-02 11:32:12.390', NULL, NULL, '6013', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6017', '项目预算', 'project', NULL, '', '2024-04-02 10:02:23.390', NULL, NULL, '6017', NULL);
-INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('7001', '借款审批', 'borrow', NULL, '', '2024-04-15 09:19:36.390', NULL, NULL, '7001', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6001', '合同评审', 'contract', NULL, '', '2024-03-15 14:34:45.390', NULL, NULL, '6001', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6005', '项目流转', 'project', NULL, '', '2024-03-22 13:23:32.390', NULL, NULL, '6005', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6009', '安全交底', 'project', NULL, '', '2024-03-22 11:42:24.390', NULL, NULL, '6009', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6013', '技术交底', 'project', NULL, '', '2024-03-22 11:32:12.390', NULL, NULL, '6013', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('6017', '项目预算', 'project', NULL, '', '2024-03-22 10:02:23.390', NULL, NULL, '6017', NULL);
+INSERT INTO `ACT_RE_DEPLOYMENT` (`ID_`, `NAME_`, `CATEGORY_`, `KEY_`, `TENANT_ID_`, `DEPLOY_TIME_`, `DERIVED_FROM_`, `DERIVED_FROM_ROOT_`, `PARENT_DEPLOYMENT_ID_`, `ENGINE_VERSION_`) VALUES ('7001', '借款审批', 'borrow', NULL, '', '2024-04-07 09:19:36.390', NULL, NULL, '7001', NULL);
 COMMIT;
 
 -- ----------------------------

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

@@ -10,9 +10,9 @@ export function listBorrow(query) {
 }
 
 // 查询cmc借款申请详细
-export function getBorrow(borrowJd) {
+export function getBorrow(borrowId) {
   return request({
-    url: '/oa/borrow/' + borrowJd,
+    url: '/oa/borrow/' + borrowId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateBorrow(data) {
 }
 
 // 删除cmc借款申请
-export function delBorrow(borrowJd) {
+export function delBorrow(borrowId) {
   return request({
-    url: '/oa/borrow/' + borrowJd,
+    url: '/oa/borrow/' + borrowId,
     method: 'delete'
   })
 }

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

@@ -10,9 +10,9 @@ export function listBorrowDetail(query) {
 }
 
 // 查询cmc借款明细详细
-export function getBorrowDetail(borrowDetailId) {
+export function getBorrowDetail(borrowId) {
   return request({
-    url: '/oa/borrowDetail/' + borrowDetailId,
+    url: '/oa/borrowDetail/' + borrowId,
     method: 'get'
   })
 }
@@ -36,9 +36,9 @@ export function updateBorrowDetail(data) {
 }
 
 // 删除cmc借款明细
-export function delBorrowDetail(borrowDetailId) {
+export function delBorrowDetail(borrowId) {
   return request({
-    url: '/oa/borrowDetail/' + borrowDetailId,
+    url: '/oa/borrowDetail/' + borrowId,
     method: 'delete'
   })
 }

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

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-27 16:28:08
+ * @LastEditTime: 2024-04-16 16:05:21
  */
 /*
  * @Author: wrh
@@ -47,15 +47,6 @@ export function addProject(data) {
   })
 }
 
-// 提交cmc考核
-export function submitProject(data) {
-  return request({
-    url: '/oa/project/submit',
-    method: 'post',
-    data: data
-  })
-}
-
 // 修改cmc项目
 export function updateProject(data) {
   return request({
@@ -65,15 +56,6 @@ export function updateProject(data) {
   })
 }
 
-// 修改cmc项目
-export function modifyProject(data) {
-  return request({
-    url: '/oa/project/modify',
-    method: 'put',
-    data: data
-  })
-}
-
 // 删除cmc项目
 export function delProject(projectId) {
   return request({

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

@@ -1,8 +1,27 @@
 <template>
   <div class="app-container">
-    <el-row>
+    <el-row :gutter="20">
       <el-col :span="18" :xs="24">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+          <el-row :gutter="20">
+            <el-col :span="6" :xs="24">
+              <el-form-item label="申请人" prop="user.nickName">
+                {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="申请部门" prop="dept.deptName">
+                {{ form.dept.deptName }}
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="申请时间：" prop="date">
+                <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
+                  placeholder="选择日期" :disabled="taskName != '借款申请'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '借款审批'">
             <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
               :disabled="taskName != '借款申请'" clearable>
@@ -25,29 +44,72 @@
               }}</el-descriptions-item>
             </el-descriptions>
           </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 label="借款明细：">
+            <table border="1">
+              <tr>
+                <td>序号</td>
+                <td style="width:200px">开支项目</td>
+                <td>单位</td>
+                <td>单价</td>
+                <td>数量</td>
+                <td>申请金额</td>
+                <td>项目管理部校核金额</td>
+                <td>分管领导审核金额</td>
+              </tr>
+              <tr v-for="(detail, index) in detailList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="detail.borrowItem"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="detail.unit"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="detail.price" @change="calculateAmount(detail)"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="detail.quantity" @change="calculateAmount(detail)"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="detail.applyAmount"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="detail.xmAmount" :disabled="taskName != '项目部审核'"
+                    @change="calculateXmAmount(detail)"></el-input>
+                </td>
+                <td>
+                  <el-input v-model="detail.managerAmount" :disabled="taskName != '分管审核'"
+                    @change="calculateManagerAmount(detail)"></el-input>
+                </td>
+                <td>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle
+                    @click="deleDetailItem(index)"></el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addDetailList()" type="primary" plain></el-button>
           </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="6" :xs="24">
+              <el-form-item label="申请金额" prop="applyAmount">
+                <el-input v-model="form.applyAmount" placeholder="请输入申请金额" :disabled="taskName != '借款申请'" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="核准金额" prop="managerAmount">
+                <el-input v-model="form.managerAmount" placeholder="请输入核准金额" :disabled="taskName != '分管审核'" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="申请人说明" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入申请人说明" />
-          </el-form-item>
-          <el-form-item label="申请人" prop="user.nickName">
-            {{ form.applierUser ? form.applierUser.nickName : form.user.nickName }}
-          </el-form-item>
-          <el-form-item label="申请部门" prop="dept.deptName">
-            {{ form.dept.deptName }}
-          </el-form-item>
-          <el-form-item label="申请时间：" prop="date">
-            <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
-              placeholder="选择日期" :disabled="taskName != '借款申请'">
-            </el-date-picker>
+            <el-input type="textarea" v-model="form.applyReason" placeholder="请输入申请人说明" :disabled="taskName != '借款申请'" />
           </el-form-item>
           <el-divider></el-divider>
-          <el-form-item label="部门意见" prop="deptComment">
-            <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
+          <el-form-item label="部门负责人意见" prop="deptComment">
+            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入部门负责人意见"
+              :disabled="taskName != '部门审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -56,59 +118,77 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
-                <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
-                  :disabled="true">
-                </el-date-picker>
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('部门审核')">
+                <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="项目部审批意见" prop="xmComment">
-            <el-input v-model="form.xmComment" 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="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="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 label="项目部校核意见" prop="xmComment">
+            <el-input type="textarea" v-model="form.xmComment" placeholder="请输入项目部校核意见" :disabled="taskName != '项目部审核'" />
           </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-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('项目部审核')">
+                <span class="auditor"> {{ form.xmUser ? form.xmUser.nickName : xmUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('项目部审核')">
+                <span> {{ form.xmTime ? form.xmTime : xmTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="分管领导审核意见" prop="managerComment">
+            <el-input type="textarea" v-model="form.managerComment" placeholder="请输入分管领导审核意见"
+              :disabled="taskName != '分管审核'" />
           </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
+                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('分管审核')">
+                <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="总经理审批意见" prop="zjlComment">
-            <el-input v-model="form.zjlComment" 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="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="cwUserId">
-            <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
-          </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-input type="textarea" v-model="form.zjlComment" placeholder="请输入总经理审批意见"
+              :disabled="taskName != '总经理审核'" />
           </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核')">
+                <span class="auditor"> {{ form.zjlUser ? form.zjlUser.nickName : zjlUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核')">
+                <span> {{ form.zjlTime ? form.zjlTime : zjlTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="财务部支付备注" prop="cwComment">
-            <el-input v-model="form.cwComment" placeholder="请输入财务部支付备注" />
+            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" />
           </el-form-item>
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="经办人：" label-width="120px" v-if="showFormItem('财务处理')">
+                <span class="auditor"> {{ form.cwUser ? form.cwUser.nickName : cwUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="支付日期：" style="margin-left:20px" prop="lendTime" v-if="showFormItem('财务处理')">
+                <el-date-picker style="width:160px;" v-model="form.lendTime" value-format="yyyy-MM-dd" type="date"
+                  placeholder="选择日期" :disabled="taskName != '财务处理'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
-        <div slot="footer" class="dialog-footer">
+        <div style="text-align: center;">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
         </div>
@@ -126,10 +206,14 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
+import { getBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listProject, getProject } from "@/api/oa/project/project";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
+import { complete, getNextFlowNode } from "@/api/flowable/todo";
 
 export default {
   components: {
@@ -148,6 +232,16 @@ export default {
   },
   data() {
     return {
+      deptUser: '',
+      xmUser: '',
+      managerUser: '',
+      zjlUser: '',
+      cwUser: '',
+      deptTime: '',
+      xmTime: '',
+      managerTime: '',
+      zjlTime: '',
+      lendTime: '',
       // 遮罩层
       loading: true,
       // 选中数组
@@ -171,7 +265,6 @@ export default {
         pageNum: 1,
         pageSize: 10,
         projectId: null,
-        borrowType: null,
         applyReason: null,
         applier: null,
         applyDate: null,
@@ -193,6 +286,8 @@ export default {
         zjlTime: null,
         lendTime: null
       },
+      detail: {},
+      detailList: [],
       projectList: [],
       chooseProject: {},
       isSelect: false,
@@ -209,10 +304,31 @@ export default {
       // 表单校验
       rules: {
       },
+      formTotal: 0,
       flowData: {}
     };
   },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptUser = this.$store.getters.name;
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '分管审核') {
+      this.managerUser = this.$store.getters.name;
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '项目部审核') {
+      this.xmUser = this.$store.getters.name;
+      this.xmTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '总经理审核') {
+      this.zjlUser = this.$store.getters.name;
+      this.zjlTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '财务处理') {
+      this.cwUser = this.$store.getters.name;
+      this.lendTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.form.applyDate = new Date();
     this.form.user.nickName = this.$store.getters.name;
     this.form.dept.deptName = this.$store.getters.deptName;
@@ -222,7 +338,25 @@ export default {
       this.flowData = res.data;
     })
   },
+  mounted() {
+    this.initForm();
+  },
   methods: {
+    initForm() {
+      getBorrowDetail(this.taskForm.formId).then(res => {
+        this.detailList = res.data;
+      });
+      getBorrow(this.taskForm.formId).then(res => {
+        if (this.isEmptyObject(res.data)) {
+          this.formTotal = 0;
+          this.form.applier = this.$store.getters.userId;
+        }
+        else {
+          this.formTotal = 1;
+          this.form = res.data;
+        }
+      })
+    },
     /** 查询cmc借款申请列表 */
     getList() {
       this.loading = true;
@@ -258,12 +392,39 @@ export default {
       this.open = false;
       this.reset();
     },
+    isEmptyObject(obj) {
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+      return true;
+    },
+    deleDetailItem(index) {
+      let arr = this.detailList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    addDetailList() {
+      this.detailList.push({
+        borrowItem: '',
+        unit: '',
+        price: '',
+        quantity: '',
+        applyAmount: '',
+        xmAmount: '',
+        managerAmount: '',
+      });
+    },
     // 表单重置
     reset() {
       this.form = {
-        borrowJd: null,
+        borrowId: null,
         projectId: null,
-        borrowType: null,
         applyReason: null,
         applier: null,
         applyDate: null,
@@ -299,7 +460,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.borrowJd)
+      this.ids = selection.map(item => item.borrowId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -312,8 +473,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const borrowJd = row.borrowJd || this.ids
-      getBorrow(borrowJd).then(response => {
+      const borrowId = row.borrowId || this.ids
+      getBorrow(borrowId).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "修改cmc借款申请";
@@ -323,27 +484,92 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.borrowJd != null) {
+          if (this.formTotal != 0) {
+            for (let detail of this.detailList) {
+              updateBorrowDetail(detail);
+            }
             updateBorrow(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              if (this.taskName == '部门审核') {
+                getUsersDeptLeaderByDept({ deptId: 107 }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                });
+              }
+              else if (this.taskName == '项目部审核') {
+                getUsersManageLeaderByDept({ deptId: this.form.applyDept }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                });
+              }
+              else if (this.taskName == '分管审核') {
+                this.$set(this.taskForm.variables, "approval", 2);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+              else if (this.taskName == '总经理审核') {
+                getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
+                  let userId = res.data.userId;
+                  this.$set(this.taskForm.variables, "approval", userId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                });
+              }
+              else if (this.taskName == '财务处理') {
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+            })
           } else {
+            for (let detail of this.detailList) {
+              detail.borrowId = this.taskForm.formId;
+              addBorrowDetail(detail);
+            }
+            this.form.borrowId = this.taskForm.formId;
             addBorrow(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+                let userId = res.data.userId;
+                this.$set(this.taskForm.variables, "approval", userId);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              })
+            })
           }
         }
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const borrowJds = row.borrowJd || this.ids;
-      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowJds + '"的数据项？').then(function () {
-        return delBorrow(borrowJds);
+      const borrowIds = row.borrowId || this.ids;
+      this.$modal.confirm('是否确认删除cmc借款申请编号为"' + borrowIds + '"的数据项？').then(function () {
+        return delBorrow(borrowIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -360,9 +586,42 @@ export default {
       if (name == '借款申请')
         isShow = true;
       else if (name == '部门审核')
-        isShow = true;
+        isShow = (this.taskName != '借款申请');
+      else if (name == '项目部审核')
+        isShow = (this.taskName != '借款申请' && this.taskName != '部门审核');
+      else if (name == '分管审核')
+        isShow = (this.taskName != '借款申请' && this.taskName != '部门审核' && this.taskName != '项目部审核');
+      else if (name == '总经理审核')
+        isShow = (this.taskName == '总经理审核' || this.taskName == '财务处理');
+      else if (name == '财务处理')
+        isShow = (this.taskName == '财务处理');
       return isShow;
     },
+    calculateAmount(detail) {
+      let total = Number(detail.price) * Number(detail.quantity);
+      this.$set(detail, "applyAmount", total.toFixed(2));
+      this.getTotal("applyAmount", "applyAmount", this.detailList);
+    },
+    calculateXmAmount(detail) {
+      this.getTotal("xmAmount", "managerAmount", this.detailList);
+    },
+    calculateManagerAmount(detail) {
+      this.getTotal("managerAmount", "managerAmount", this.detailList);
+    },
+    getTotal(name1, name2, list) {
+      let sum = 0;
+      for (let user of list) {
+        sum = sum + Number(user[name1]);
+      }
+      this.form[name2] = sum.toFixed(2);
+    },
   }
 };
 </script>
+
+<style>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-11 14:52:03
+ * @LastEditTime: 2024-04-16 09:58:53
 -->
 
 <template>
@@ -107,15 +107,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核签名')">
                     <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
-                    <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('部门审核签名')">
+                    <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -127,15 +125,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核签名')">
                     <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="managerTime" label-width="120px" v-if="showFormItem('分管审核')">
-                    <el-date-picker style="width:170px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('分管审核签名')">
+                    <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -147,15 +143,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('工会审核')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('工会审核签名')">
                     <span class="auditor"> {{ form.unionUser ? form.unionUser.nickName : unionUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="unionTime" label-width="120px" v-if="showFormItem('工会审核')">
-                    <el-date-picker style="width:170px;" v-model="form.unionTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('工会审核签名')">
+                    <span> {{ form.unionTime ? form.unionTime : unionTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -167,15 +161,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核签名')">
                     <span class="auditor"> {{ form.gmUser ? form.gmUser.nickName : gmUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="gmTime" label-width="120px" v-if="showFormItem('总经理审核')">
-                    <el-date-picker style="width:170px;" v-model="form.gmTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总经理审核签名')">
+                    <span> {{ form.gmTime ? form.gmTime : gmTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -193,11 +185,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="dispatchTime" label-width="120px"
-                    v-if="taskName == '安排用车' || taskName == '申请确认'">
-                    <el-date-picker style="width:170px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="taskName == '安排用车' || taskName == '申请确认'">
+                    <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -242,6 +231,7 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar, getCar } from "@/api/oa/car/car";
 import { listCarApproval, getCarApproval, updateCarApproval, addCarApproval, modifyCarApproval } from '@/api/oa/car/carApproval'
@@ -267,16 +257,26 @@ export default {
     }
   },
   created() {
-    if (this.taskName == '部门审核')
+    if (this.taskName == '部门审核') {
       this.deptUser = this.$store.getters.name;
-    if (this.taskName == '分管审核')
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
-    if (this.taskName == '工会审核')
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '工会审核') {
       this.unionUser = this.$store.getters.name;
-    if (this.taskName == '总经理审核')
+      this.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '总经理审核') {
       this.gmUser = this.$store.getters.name;
-    if (this.taskName == '安排用车')
+      this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '安排用车') {
       this.dispatchUser = this.$store.getters.name;
+      this.dispatchTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.dept = this.$store.getters.deptId;
     this.getProjectList();
     this.getCarList();
@@ -292,6 +292,11 @@ export default {
       unionUser: '',
       gmUser: '',
       dispatchUser: '',
+      deptTime: undefined,
+      managerTime: undefined,
+      unionTime: undefined,
+      gmTime: undefined,
+      dispatchTime: undefined,
       form: {
         carUsage: '0',
         days: '',
@@ -537,6 +542,14 @@ export default {
         isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '工会审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
       else if (name == '总经理审核')
         isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
+      else if (name == '部门审核签名')
+        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
+      else if (name == '分管审核签名')
+        isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
+      else if (name == '工会审核签名')
+        isShow = this.taskName == '工会审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
+      else if (name == '总经理审核签名')
+        isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
       return isShow;
     },
   },

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-11 17:04:54
+ * @LastEditTime: 2024-04-16 10:20:19
 -->
 
 <template>
@@ -94,15 +94,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核签名')">
                     <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
-                    <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('部门审核签名')">
+                    <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -114,15 +112,13 @@
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核签名')">
                     <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="managerTime" label-width="120px" v-if="showFormItem('分管审核')">
-                    <el-date-picker style="width:170px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('分管审核签名')">
+                    <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -140,17 +136,14 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" prop="dispatchTime" label-width="120px"
-                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
-                    <el-date-picker style="width:170px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
-                      :disabled="true">
-                    </el-date-picker>
+                  <el-form-item label="日期：" label-width="120px" v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
+                    <span> {{ form.dispatchTime ? form.dispatchTime : dispatchTime }} </span>
                   </el-form-item>
                 </el-col>
               </el-row>
               <!-- 设备安排 -->
               <el-form-item label-width="120px" label="设备选择：">
-                <el-select v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice"
+                <el-select style="width: 300px;" v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice"
                   clearable :disabled="taskName != '安排设备'">
                   <el-option v-for="item in deviceList" :key="item.deviceId"
                     :label="item.brand + item.series + item.name + item.code" :value="item.deviceId">
@@ -206,6 +199,7 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listDevice, getDevice } from "@/api/oa/device/device";
 import { listDeviceApproval, getDeviceApproval, updateDeviceApproval, submitDeviceApproval, modifyDeviceApproval } from '@/api/oa/device/deviceApproval'
@@ -230,12 +224,18 @@ export default {
     }
   },
   created() {
-    if (this.taskName == '部门审核')
+    if (this.taskName == '部门审核') {
       this.deptUser = this.$store.getters.name;
-    if (this.taskName == '分管审核')
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '分管审核') {
       this.managerUser = this.$store.getters.name;
-    if (this.taskName == '安排设备')
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '安排设备') {
       this.dispatchUser = this.$store.getters.name;
+      this.dispatchTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.form.user.nickName = this.$store.getters.name;
     this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
@@ -249,6 +249,9 @@ export default {
       deptUser: '',
       managerUser: '',
       dispatchUser: '',
+      deptTime: undefined,
+      managerTime: undefined,
+      dispatchTime: undefined,
       form: {
         user: {
           nickName: '',
@@ -463,6 +466,10 @@ export default {
         isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.deptUserId != null);
       else if (name == '分管审核')
         isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
+      else if (name == '部门审核签名')
+        isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.deptUserId != null);
+      else if (name == '分管审核签名')
+        isShow = this.taskName == '分管审核' || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
       return isShow;
     },
   },

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-11 14:13:45
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-16 17:03:17
 -->
 
 <template>
@@ -50,7 +50,8 @@
           </tr>
           <tr v-for="(work, index) in workList" :key="index">
             <td>
-              <el-input v-model="work.content" type="textarea"  clearable :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+              <el-input v-model="work.content" type="textarea" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
             </td>
             <td>
               <el-input v-model="work.scale" clearable></el-input>
@@ -67,24 +68,32 @@
               </el-date-picker>
             </td>
             <td>
-              <el-input v-model="work.remark" type="textarea"  clearable :autosize="{ minRows: 4, maxRows: 10}"></el-input>
+              <el-input v-model="work.remark" type="textarea" clearable
+                :autosize="{ minRows: 4, maxRows: 10 }"></el-input>
             </td>
             <td>
-              <el-button type="danger" icon="el-icon-minus" size="mini" circle
-                @click="deletWorkItem(index)"></el-button>
+              <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletWorkItem(index)"></el-button>
             </td>
           </tr>
         </table>
 
         <el-button icon="el-icon-plus" size="mini" @click="addWorkList"></el-button>
       </el-form-item>
-      <el-form-item label="项目登记人：" prop="projectRegistrantUser.nickName">
-        <el-tag>{{ addForm.projectRegistrantUser.nickName }}</el-tag>
-        <!-- <el-input v-model="addForm.projectRegistrant"></el-input> -->
-      </el-form-item>
       <el-form-item label="备注：" prop="remark">
         <el-input v-model="addForm.remark" type="textarea" rows="3"></el-input>
       </el-form-item>
+      <el-row>
+        <el-col :span="6" :xs="24" :offset="12">
+          <el-form-item label="项目登记人：" prop="registrantUser">
+            <span class="auditor"> {{ addForm.projectRegistrantUser ? addForm.projectRegistrantUser.nickName : registrantUser }} </span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="登记日期：" label-width="120px">
+            <span> {{ addForm.registerTime ? addForm.registerTime : registerTime }} </span>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="text-align: center">
       <el-button type="primary" @click="confirmAddForm" :disabled="disabled">确 定</el-button>
@@ -94,27 +103,13 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
 import { mapGetters } from "vuex";
-import {
-  listProject,
-  getProject,
-  addProject,
-  updateProject,
-  delProject,
-  submitProject,
-} from "@/api/oa/project/project";
+import { listProject, getProject, addProject, delProject } from "@/api/oa/project/project";
 import { getUser } from "@/api/system/user";
 import { getUsersDeptLeaderByDept } from "@/api/system/post";
-import {
-  complete,
-  rejectTask,
-  returnList,
-  returnTask,
-  getNextFlowNode,
-  delegate,
-  flowTaskForm,
-} from "@/api/flowable/todo";
-import { getProjectWork } from "@/api/oa/project/projectWork";
+import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
+import { getProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 export default {
   props: {
     disabled: {
@@ -131,6 +126,7 @@ export default {
   },
   data() {
     return {
+      registerTime: undefined,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -145,10 +141,8 @@ export default {
       loading: true,
       modifyOpen: false,
       addForm: {
+        registerTime: undefined,
         projectRegistrant: "",
-        projectRegistrantUser: {
-          nickName: ''
-        }
       },
       rules: {
         projectNumber: [{ required: true, message: "请输入项目编号", trigger: "blur" }],
@@ -160,7 +154,7 @@ export default {
           scale: "",
           unit: "",
           workload: "",
-          deadline: "",
+          deadline: undefined,
           remark: "",
         },
       ],
@@ -168,12 +162,13 @@ export default {
     };
   },
   created() {
+    this.registerTime = parseTime(new Date(), '{y}-{m}-{d}')
     if (this.$route.query.taskName != '项目登记') {
       this.getProjectInfo();
       this.getProjectWorkList();
     } else {
       this.addForm.projectRegistrant = this.userId;
-      this.addForm.projectRegistrantUser.nickName = this.name;
+      this.registrantUser = this.name;
     }
     // this.getList();
   },
@@ -208,10 +203,12 @@ export default {
     },
     confirmAddForm() {
       this.addForm.projectId = this.taskForm.formId;
-      this.addForm.workList = this.workList;
-      let forms = new FormData();
-      forms.append("form", JSON.stringify(this.addForm));
-      submitProject(forms).then(response => {
+      console.log(this.addForm);
+      for (let work of this.workList) {
+        work.projectId = this.taskForm.formId;
+        addProjectWork(work);
+      }
+      addProject(this.addForm).then(response => {
         this.$modal.msgSuccess("新增成功");
         this.getList();
       });
@@ -237,7 +234,7 @@ export default {
         scale: "",
         unit: "",
         workload: "",
-        deadline: "",
+        deadline: undefined,
         remark: "",
       });
     },
@@ -316,4 +313,9 @@ table {
 .el-radio__input.is-disabled.is-checked .el-radio__inner {
   border-color: var(--current-color);
 }
+
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
 </style>

oa-ui/src/views/flowable/form/projectProcess/arrangeProject.vue

@@ -1,54 +1,65 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-19 09:24:06
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-11 16:24:28
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-16 17:01:08
 -->
 <template>
   <div class="app-container">
     <h2 style="text-align: center;">项目安排</h2>
     <el-form :model="form" :rules="rules" label-width="100px" :disabled="disabled">
-      <el-form-item label="承担部门：" prop="undertakingDept">
-        <el-select v-model="form.deptId" multiple clearable style="width:500px" @change="getDeptLeader">
-          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
-            v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="部门负责人" prop="deptLeader">
-        <el-select v-model="form.deptLeader" multiple clearable style="width:500px">
-          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="项目负责人" prop="projectLeader">
-        <el-tag effect="plain" type="warning" style="margin-right: 10px;"
-          v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
-      form.projectLeaderName }}</el-tag>
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
-      </el-form-item>
-      <el-form-item label="现场负责人" prop="siteLeader">
-        <el-select v-model="form.siteLeader" filterable clearable style="width:500px">
-          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
-            v-if="item.nickName != 'admin'">
-          </el-option>
-        </el-select>
-      </el-form-item>
+      <el-row>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="承担部门：" prop="undertakingDept">
+            <el-select v-model="form.deptId" multiple clearable style="width:400px" @change="getDeptLeader">
+              <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
+                v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="部门负责人" prop="deptLeader">
+            <el-select v-model="form.deptLeader" multiple clearable style="width:400px">
+              <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="项目负责人" prop="projectLeader">
+            <el-tag effect="plain" type="warning" style="margin-right: 10px;"
+              v-if="form.projectLeader != '' && form.projectLeader != undefined">{{
+                form.projectLeaderName }}</el-tag>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="choosePeople">选择</el-button>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :xs="24">
+          <el-form-item label="现场负责人" prop="siteLeader">
+            <el-select v-model="form.siteLeader" filterable clearable style="width:400px">
+              <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"
+                v-if="item.nickName != 'admin'">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <!-- 人员选择对话框 -->
     <el-dialog width="320px" title="选择项目负责人" :visible.sync="peopleVisible" append-to-body>
       <el-form>
         <el-form-item label="部门：">
           <el-select v-model="peopleForm.deptId" @change="handleChangeDept">
-            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName"
-              :value="item.deptId" v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
+            <el-option v-for="item in peopleForm.deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId"
+              v-if="item.deptName != '四川中水成勘院测绘工程有限责任公司'">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="人员：">
           <el-select v-model="peopleForm.userId">
-            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName"
-              :value="item.userId">
+            <el-option v-for="item in peopleForm.userList" :key="item.userId" :label="item.nickName" :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -185,10 +196,8 @@ export default {
       this.peopleVisible = false;
     },
     confirmPlanForm() {
-      this.form.undertakingDept = this.form.deptId.join(',')
-      let formData = new FormData();
-      formData.append("form", JSON.stringify(this.form));
-      modifyProject(formData)
+      this.form.undertakingDept = this.form.deptId.join(',');
+      updateProject(this.form)
       const params = { taskId: this.taskForm.taskId };
       // 获取下一个流程节点
       getNextFlowNode(params).then(res => {

oa-ui/src/views/flowable/form/projectProcess/scConfirm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-15 10:33:51
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-16 14:04:51
 -->
 <template>
   <div class="app-container">
@@ -16,7 +16,7 @@
         <span class="auditor">{{ form.scApproverName }}</span>
         <el-button @click.once="sign" type="primary" size="mini" v-if="taskName == '生产确认'">签名</el-button>
       </el-form-item>
-      <el-form-item label="审核时间：">
+      <el-form-item label="确认时间：">
         {{ form.scApprovalTime }}
       </el-form-item>
       <el-form-item>

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

@@ -62,10 +62,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期" prop="technicalTime" v-if="showFormItem('技术安排')">
-                <el-date-picker style="width:170px;" clearable v-model="form.technicalTime" type="date"
-                  value-format="yyyy-MM-dd" placeholder="请选择技术安排时间" :disabled="taskName != '技术安排'">
-                </el-date-picker>
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('技术安排')">
+                <span> {{ form.technicalTime ? form.technicalTime : technicalTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -84,10 +82,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期" prop="technicalUploadTime" v-if="showFormItem('方案上传')">
-                <el-date-picker style="width:170px;" clearable v-model="form.technicalUploadTime" type="date"
-                  value-format="yyyy-MM-dd" placeholder="请选择方案上传时间" :disabled="taskName != '方案上传'">
-                </el-date-picker>
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('方案上传')">
+                <span> {{ form.technicalUploadTime ? form.technicalUploadTime : technicalUploadTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -103,10 +99,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期" prop="techApprovalTime" v-if="showFormItem('技术审核')">
-                <el-date-picker style="width:170px;" clearable v-model="form.techApprovalTime" type="date"
-                  value-format="yyyy-MM-dd" placeholder="请选择技术审核时间" :disabled="taskName != '技术审核'">
-                </el-date-picker>
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('技术审核')">
+                <span> {{ form.techApprovalTime ? form.techApprovalTime : techApprovalTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -121,10 +115,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="日期" prop="manageApprovalTime" v-if="showFormItem('总工审核')">
-                <el-date-picker style="width:170px;" clearable v-model="form.manageApprovalTime" type="date"
-                  value-format="yyyy-MM-dd" placeholder="请选择总工审核时间" :disabled="taskName != '总工审核'">
-                </el-date-picker>
+              <el-form-item label="日期：" label-width="120px" v-if="showFormItem('总工审核')">
+                <span> {{ form.manageApprovalTime ? form.manageApprovalTime : manageApprovalTime }} </span>
               </el-form-item>
             </el-col>
           </el-row>
@@ -147,6 +139,7 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
 import { listTechnical, getTechnical, delTechnical, addTechnical, updateTechnical } from "@/api/oa/technical/technical";
 import { getProject } from "@/api/oa/project/project";
 import { listUser } from '@/api/system/user';
@@ -175,6 +168,10 @@ export default {
       planUser: '',
       managerUser: '',
       designUser: '',
+      technicalTime: undefined,
+      technicalUploadTime: undefined,
+      techApprovalTime: undefined,
+      manageApprovalTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -229,14 +226,22 @@ export default {
     };
   },
   created() {
-    if (this.taskName == '技术安排')
+    if (this.taskName == '技术安排') {
       this.planUser = this.$store.getters.name;
-    if (this.taskName == '方案上传')
+      this.technicalTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '方案上传') {
       this.designUser = this.$store.getters.name;
-    if (this.taskName == '技术审核')
+      this.technicalUploadTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '技术审核') {
       this.planUser = this.$store.getters.name;
-    if (this.taskName == '总工审核')
+      this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    if (this.taskName == '总工审核') {
       this.managerUser = this.$store.getters.name;
+      this.manageApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getProjectById();
     this.getUserList();
     this.getList();
@@ -253,7 +258,6 @@ export default {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.technicalPlanner = this.$store.getters.userId;
-          this.form.technicalTime = new Date();
         }
         else {
           this.formTotal = 1;
@@ -269,7 +273,6 @@ export default {
             data.qualityInspector = arr
           }
           this.form = data;
-          console.log(this.form);
         }
       })
     },
@@ -367,7 +370,6 @@ export default {
         if (valid) {
           if (this.formTotal != 0) {
             this.form.qualityInspector = this.form.qualityInspector.join(',');
-            console.log(this.form);
             updateTechnical(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -456,5 +458,4 @@ export default {
 .auditor {
   font-family: '华文行楷';
   font-size: 20px;
-}
-</style>
+}</style>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -30,10 +30,14 @@
             @goBack="goBack"></device-form>
           <project-process :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"
             @goBack="goBack"></project-process>
-          <budget-index :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'" @goBack="goBack"></budget-index>
-          <borrow-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '借款审批'" @goBack="goBack"></borrow-form>
-          <safe-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'" @goBack="goBack"></safe-form>
-          <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'" @goBack="goBack"></technical-form>
+          <budget-index :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目预算'"
+            @goBack="goBack"></budget-index>
+          <borrow-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '借款审批'"
+            @goBack="goBack"></borrow-form>
+          <safe-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"
+            @goBack="goBack"></safe-form>
+          <technical-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"
+            @goBack="goBack"></technical-form>
           <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
@@ -565,9 +569,8 @@ export default {
     },
     // 是否显示审批通过
     isShowApprove() {
-      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批'
-       || this.taskForm.procDefName == '用车审批（工会）' || this.taskForm.procDefName == '设备审批'|| this.taskForm.procDefName == '项目流转'
-       || this.taskForm.procDefName == '项目预算' || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' || this.taskForm.procDefName == '技术交底') {
+      if (this.taskName == '员工填报' || this.taskForm.procDefName == '用车审批' || this.taskForm.procDefName == '设备审批' || this.taskForm.procDefName == '项目流转'
+        || this.taskForm.procDefName == '项目预算' || this.taskForm.procDefName == '借款审批' || this.taskForm.procDefName == '安全交底' || this.taskForm.procDefName == '技术交底') {
         return false
       } else {
         return true
@@ -605,5 +608,4 @@ export default {
 
 .my-label {
   background: #E1F3D8;
-}
-</style>
+}</style>

oa-ui/src/views/oa/budget/addBudget.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-25 15:05:59
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-11 10:25:37
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-04-16 17:25:30
 -->
 <template>
   <div>
@@ -105,7 +105,7 @@
               {{ projectForm.projectRegistrantUser.nickName }}
             </el-form-item>
             <el-form-item label="登记时间：">
-              {{ projectForm.createTime }}
+              {{ projectForm.registerTime }}
             </el-form-item>
             <el-form-item label="备注：">
               {{ projectForm.remark }}
@@ -149,8 +149,9 @@
                 <tr>
                   <td style="width: 80px">姓名</td>
                   <td style="width: 100px">部门</td>
+                  <td style="width: 100px">基础工资</td>
                   <td style="width: 100px">岗位工资</td>
-                  <td style="width: 110px">人员成本(天)</td>
+                  <td style="width: 110px">人员成本(元/天)</td>
                   <!-- <td style="width: 100px">进出场单价</td> -->
                   <td style="width: 100px">预算天数</td>
                   <td style="width: 100px">总额</td>
@@ -158,8 +159,9 @@
                 <tr v-for="user in chooseUser" :key="user.userId">
                   <td>{{ user.nickName }}</td>
                   <td>{{ user.dept.deptName }}</td>
+                  <td>{{ 1780 }}</td>
                   <td>{{ user.salary.salary }}</td>
-                  <td>{{ parseFloat(user.salary.salary / 31).toFixed(2) }}</td>
+                  <td>{{ parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) }}</td>
                   <!-- <td>
                     <el-input
                       v-model="user.inOutPrice"
@@ -182,6 +184,8 @@
                 </tr>
               </table>
             </el-form-item>
+            
+        <div style="color:red">tips:人员成本=(基础工资+岗位工资)/21.75，固定工资中的年功工资暂忽略不计，绩效工资计入直接成本，津贴补贴、五险一金扣除暂未考虑</div>
             <!-- 选择车辆 -->
             <el-form-item label="选择车辆：">
               <span v-if="chooseCar.length != 0">
@@ -664,7 +668,7 @@ export default {
     },
     // 计算单个人员的成本
     calculateUserTotal(user) {
-      let total =parseFloat(user.salary.salary / 31).toFixed(2) * Number(user.days);
+      let total =parseFloat((user.salary.salary + 1780) / 21.75).toFixed(2) * Number(user.days);
       this.$set(user, "staffCost", total.toFixed(2));
       this.getCost("staffCost", "staffCost", this.chooseUser);
       this.getFixCost();

oa-ui/src/views/oa/budget/components/chooseMoney.vue

@@ -110,11 +110,11 @@
       </el-form-item>
       <el-form-item label="进出场费用：">
         <el-input v-numeric v-model="inOutPrice" style="width:200px;" @change="getInoutpriceSum">
-          <template slot="append">人天</template>
+          <template slot="append">单价</template>
         </el-input>
         ×
         <el-input v-numeric v-model="peopleNumber" style="width:200px;" @change="getInoutpriceSum">
-          <template slot="append">数量</template>
+          <template slot="append">人天</template>
         </el-input>
         = {{ inOutPriceSum }}
       </el-form-item>