品牌项目支付、保证金申请、成果归档流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcArchiveController.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;
@@ -82,6 +83,22 @@ public class CmcArchiveController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcArchive cmcArchive)
     {
+        if (cmcArchive.getProduceComment() != null && cmcArchive.getQualityComment() == null) {
+            cmcArchive.setProduceInspector(getLoginUser().getUserId());
+            cmcArchive.setProduceTime(new Date());
+        }
+        else if (cmcArchive.getQualityComment() != null && cmcArchive.getDeptComment() == null) {
+            cmcArchive.setQualityInspector(getLoginUser().getUserId());
+            cmcArchive.setQualityTime(new Date());
+        }
+        else if (cmcArchive.getDeptComment() != null && cmcArchive.getArchiveComment() == null) {
+            cmcArchive.setDeptLeader(getLoginUser().getUserId());
+            cmcArchive.setDeptTime(new Date());
+        }
+        else if (cmcArchive.getArchiveComment() != null) {
+            cmcArchive.setArchiver(getLoginUser().getUserId());
+            cmcArchive.setArchiveTime(new Date());
+        }
         return toAjax(cmcArchiveService.updateCmcArchive(cmcArchive));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBrandController.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;
@@ -82,6 +83,8 @@ public class CmcBrandController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcBrand cmcBrand)
     {
+        cmcBrand.setCwUserId(getLoginUser().getUserId());
+        cmcBrand.setCwTime(new Date());
         return toAjax(cmcBrandService.updateCmcBrand(cmcBrand));
     }
 

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcBrandPaymentController.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;
@@ -70,8 +72,9 @@ public class CmcBrandPaymentController extends BaseController
      */
     @Log(title = "cmc品牌项目支付记录", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CmcBrandPayment cmcBrandPayment)
-    {
+    public AjaxResult add(@RequestBody CmcBrandPayment cmcBrandPayment) throws InterruptedException {
+        Thread.sleep(1);
+        cmcBrandPayment.setBrandPaymentId(new SnowFlake().generateId());
         return toAjax(cmcBrandPaymentService.insertCmcBrandPayment(cmcBrandPayment));
     }
 

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

@@ -1,7 +1,10 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import liquibase.pro.packaged.D;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -82,6 +85,14 @@ public class CmcDepositController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcDeposit cmcDeposit)
     {
+        if (cmcDeposit.getManagerComment() != null && cmcDeposit.getRemitTime() == null) {
+            cmcDeposit.setManagerUserId(getLoginUser().getUserId());
+            cmcDeposit.setManagerTime(new Date());
+        }
+        if (cmcDeposit.getRemitTime() != null) {
+            cmcDeposit.setCwUserId(getLoginUser().getUserId());
+            cmcDeposit.setCwTime(new Date());
+        }
         return toAjax(cmcDepositService.updateCmcDeposit(cmcDeposit));
     }
 

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

@@ -84,7 +84,7 @@ public class CmcTechnicalController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcTechnical cmcTechnical)
     {
-        if (cmcTechnical.getDesignDescription() != null) {
+        if (cmcTechnical.getTechnicalDocument() != null) {
             cmcTechnical.setTechnicalUploadTime(new Date());
         }
         if (cmcTechnical.getTechnicalComment() != null) {

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

@@ -78,6 +78,16 @@ public class SysPostController extends BaseController
         return success(deptLeader);
     }
 
+    /**
+     * 获取部门副主任
+     */
+    @GetMapping("/deptViceLeader")
+    public AjaxResult getViceDeptLeader(String userId)
+    {
+        SysUser deptLeader = postService.selectViceDeptLeaderByUserId(userId);
+        return success(deptLeader);
+    }
+
     /**
      * 通过deptId获取部门主任
      */
@@ -90,6 +100,16 @@ public class SysPostController extends BaseController
         return success(deptLeader);
     }
 
+    /**
+     * 通过deptId获取部门副主任
+     */
+    @GetMapping("/deptViceLeaderByDept")
+    public AjaxResult getViceDeptLeaderByDeptId(String deptId)
+    {
+        SysUser deptLeader = postService.selectViceDeptLeaderByDeptId(deptId);
+        return success(deptLeader);
+    }
+
     /**
      * 通过userId获取分管领导
      */

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -57,6 +58,14 @@ public class CmcArchive extends BaseEntity
     @Excel(name = "归档人")
     private Long archiver;
 
+    private SysUser produceUser;
+
+    private SysUser qualityUser;
+
+    private SysUser deptUser;
+
+    private SysUser archiveUser;
+
     /** 资料接收时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "资料接收时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -269,6 +278,43 @@ public class CmcArchive extends BaseEntity
     {
         return archiveComment;
     }
+    public void setProduceUser(SysUser produceUser)
+    {
+        this.produceUser = produceUser;
+    }
+
+    public SysUser getProduceUser()
+    {
+        return produceUser;
+    }
+    public void setQualityUser(SysUser qualityUser)
+    {
+        this.qualityUser = qualityUser;
+    }
+
+    public SysUser getQualityUser()
+    {
+        return qualityUser;
+    }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    public void setArchiveUser(SysUser archiveUser)
+    {
+        this.archiveUser = archiveUser;
+    }
+
+    public SysUser getArchiveUser()
+    {
+        return archiveUser;
+    }
+
 
     @Override
     public String toString() {

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

@@ -44,6 +44,11 @@ public class CmcBrand extends BaseEntity
     @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyTime;
 
+    /** 反馈时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "反馈时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date cwTime;
+
     /** 财务部经办人 */
     @Excel(name = "财务部经办人")
     private Long cwUserId;
@@ -113,6 +118,15 @@ public class CmcBrand extends BaseEntity
     {
         return applyTime;
     }
+    public void setCwTime(Date cwTime)
+    {
+        this.cwTime = cwTime;
+    }
+
+    public Date getCwTime()
+    {
+        return cwTime;
+    }
     public void setCwUserId(Long cwUserId) 
     {
         this.cwUserId = cwUserId;

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

@@ -33,6 +33,9 @@ public class CmcContract extends BaseEntity
     /** 投标项目 */
     private String tenderId;
 
+    /** 投标项目 */
+    private CmcTender tender;
+
     /** 合同金额 */
     @Excel(name = "合同金额")
     private BigDecimal amount;
@@ -124,7 +127,15 @@ public class CmcContract extends BaseEntity
     {
         return tenderId;
     }
+    public void setTender(CmcTender tender)
+    {
+        this.tender = tender;
+    }
 
+    public CmcTender getTender()
+    {
+        return tender;
+    }
     public void setAmount(BigDecimal amount)
     {
         this.amount = amount;

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

@@ -2,6 +2,7 @@ package com.ruoyi.oa.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -57,6 +58,13 @@ public class CmcDeposit extends BaseEntity
     @Excel(name = "申请人")
     private Long applier;
 
+
+    private SysUser applierUser;
+
+    private SysUser managerUser;
+
+    private SysUser cwUser;
+
     /** 申请日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -70,6 +78,10 @@ public class CmcDeposit extends BaseEntity
     @Excel(name = "相关附件")
     private String applyDocument;
 
+    /** 分管审批意见 */
+    @Excel(name = "分管审批意见")
+    private String managerComment;
+
     /** 分管审批时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -192,6 +204,15 @@ public class CmcDeposit extends BaseEntity
     {
         return applier;
     }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
     public void setApplyTime(Date applyTime) 
     {
         this.applyTime = applyTime;
@@ -219,6 +240,15 @@ public class CmcDeposit extends BaseEntity
     {
         return applyDocument;
     }
+    public void setManagerComment(String managerComment)
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment()
+    {
+        return managerComment;
+    }
     public void setManagerTime(Date managerTime) 
     {
         this.managerTime = managerTime;
@@ -237,6 +267,15 @@ public class CmcDeposit extends BaseEntity
     {
         return managerUserId;
     }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
     public void setRemitTime(Date remitTime) 
     {
         this.remitTime = remitTime;
@@ -282,6 +321,15 @@ public class CmcDeposit extends BaseEntity
     {
         return cwUserId;
     }
+    public void setCwUser(SysUser cwUser)
+    {
+        this.cwUser = cwUser;
+    }
+
+    public SysUser getCwUser()
+    {
+        return cwUser;
+    }
 
     @Override
     public String toString() {

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

@@ -35,6 +35,10 @@ public class CmcProject extends BaseEntity
 
     private SysUser projectLeaderUser;
 
+    private SysUser technicalDirectorUser;
+
+    private SysUser qualityInspectorUser;
+
     /** 项目状态（0进行中、1已结束） */
     @Excel(name = "项目状态", readConverterExp = "0=进行中、1已结束")
     private String isFinished;
@@ -329,6 +333,24 @@ public class CmcProject extends BaseEntity
     {
         return projectRegistrantUser;
     }
+    public void setTechnicalDirectorUser(SysUser technicalDirectorUser)
+    {
+        this.technicalDirectorUser = technicalDirectorUser;
+    }
+
+    public SysUser getTechnicalDirectorUser()
+    {
+        return technicalDirectorUser;
+    }
+    public void setQualityInspectorUser(SysUser qualityInspectorUser)
+    {
+        this.qualityInspectorUser = qualityInspectorUser;
+    }
+
+    public SysUser getQualityInspectorUser()
+    {
+        return qualityInspectorUser;
+    }
 
     @Override
     public String toString() {

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

@@ -27,18 +27,14 @@ public class CmcSettleSummary extends BaseEntity
     @Excel(name = "结算内容")
     private String content;
 
+    /** 表格编号 */
+    @Excel(name = "表格编号")
+    private String tableNumber;
+
     /** 结算金额 */
     @Excel(name = "结算金额")
     private BigDecimal amount;
 
-    /** 结算金额（项目部） */
-    @Excel(name = "结算金额", readConverterExp = "项=目部")
-    private BigDecimal amountXm;
-
-    /** 结算金额（分管） */
-    @Excel(name = "结算金额", readConverterExp = "分=管")
-    private BigDecimal amountManager;
-
     public void setSummaryId(String summaryId) 
     {
         this.summaryId = summaryId;
@@ -75,23 +71,14 @@ public class CmcSettleSummary extends BaseEntity
     {
         return amount;
     }
-    public void setAmountXm(BigDecimal amountXm) 
-    {
-        this.amountXm = amountXm;
-    }
-
-    public BigDecimal getAmountXm() 
-    {
-        return amountXm;
-    }
-    public void setAmountManager(BigDecimal amountManager) 
+    public void setTableNumber(String tableNumber)
     {
-        this.amountManager = amountManager;
+        this.tableNumber = tableNumber;
     }
 
-    public BigDecimal getAmountManager() 
+    public String getTableNumber()
     {
-        return amountManager;
+        return tableNumber;
     }
 
     @Override
@@ -101,8 +88,6 @@ public class CmcSettleSummary extends BaseEntity
             .append("settleId", getSettleId())
             .append("content", getContent())
             .append("amount", getAmount())
-            .append("amountXm", getAmountXm())
-            .append("amountManager", getAmountManager())
             .append("remark", getRemark())
             .toString();
     }

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

@@ -24,39 +24,69 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qualityComment"    column="quality_comment"    />
         <result property="deptComment"    column="dept_comment"    />
         <result property="archiveComment"    column="archive_comment"    />
+        <association property="produceUser"    javaType="SysUser"         resultMap="ProduceUserResult" />
+        <association property="qualityUser"    javaType="SysUser"         resultMap="QualityUserResult" />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="archiveUser"    javaType="SysUser"         resultMap="ArchiveUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ProduceUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="produce_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="QualityUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="quality_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="ArchiveUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="archive_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcArchiveVo">
-        select archive_id, project_id, submit_time, submit_situation, location_lng, location_lat, produce_inspector, quality_inspector, dept_leader, archiver, receive_time, quality_time, produce_time, dept_time, archive_time, produce_comment, quality_comment, dept_comment, archive_comment from cmc_archive
+        select a.archive_id, a.project_id, a.submit_time, a.submit_situation, a.location_lng, a.location_lat, a.produce_inspector, u.nick_name as produce_nick_name, a.quality_inspector,
+               u1.nick_name as quality_nick_name, a.dept_leader, u2.nick_name as dept_nick_name, a.archiver, u3.nick_name as archive_nick_name, a.receive_time, a.quality_time, a.produce_time,
+               a.dept_time, a.archive_time, a.produce_comment, a.quality_comment, a.dept_comment, a.archive_comment from cmc_archive as a
+        left join sys_user as u on u.user_id = a.produce_inspector
+        left join sys_user as u1 on u1.user_id = a.quality_inspector
+        left join sys_user as u2 on u2.user_id = a.dept_leader
+        left join sys_user as u3 on u3.user_id = a.archiver
     </sql>
 
     <select id="selectCmcArchiveList" parameterType="CmcArchive" resultMap="CmcArchiveResult">
         <include refid="selectCmcArchiveVo"/>
         <where>  
-            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
-            <if test="submitTime != null "> and submit_time = #{submitTime}</if>
-            <if test="submitSituation != null  and submitSituation != ''"> and submit_situation = #{submitSituation}</if>
-            <if test="locationLng != null  and locationLng != ''"> and location_lng = #{locationLng}</if>
-            <if test="locationLat != null  and locationLat != ''"> and location_lat = #{locationLat}</if>
-            <if test="produceInspector != null "> and produce_inspector = #{produceInspector}</if>
-            <if test="qualityInspector != null "> and quality_inspector = #{qualityInspector}</if>
-            <if test="deptLeader != null "> and dept_leader = #{deptLeader}</if>
-            <if test="archiver != null "> and archiver = #{archiver}</if>
-            <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
-            <if test="qualityTime != null "> and quality_time = #{qualityTime}</if>
-            <if test="produceTime != null "> and produce_time = #{produceTime}</if>
-            <if test="deptTime != null "> and dept_time = #{deptTime}</if>
-            <if test="archiveTime != null "> and archive_time = #{archiveTime}</if>
-            <if test="produceComment != null  and produceComment != ''"> and produce_comment = #{produceComment}</if>
-            <if test="qualityComment != null  and qualityComment != ''"> and quality_comment = #{qualityComment}</if>
-            <if test="deptComment != null  and deptComment != ''"> and dept_comment = #{deptComment}</if>
-            <if test="archiveComment != null  and archiveComment != ''"> and archive_comment = #{archiveComment}</if>
+            <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
+            <if test="submitTime != null "> and a.submit_time = #{submitTime}</if>
+            <if test="submitSituation != null  and submitSituation != ''"> and a.submit_situation = #{submitSituation}</if>
+            <if test="locationLng != null  and locationLng != ''"> and a.location_lng = #{locationLng}</if>
+            <if test="locationLat != null  and locationLat != ''"> and a.location_lat = #{locationLat}</if>
+            <if test="produceInspector != null "> and a.produce_inspector = #{produceInspector}</if>
+            <if test="qualityInspector != null "> and a.quality_inspector = #{qualityInspector}</if>
+            <if test="deptLeader != null "> and a.dept_leader = #{deptLeader}</if>
+            <if test="archiver != null "> and a.archiver = #{archiver}</if>
+            <if test="receiveTime != null "> and a.receive_time = #{receiveTime}</if>
+            <if test="qualityTime != null "> and a.quality_time = #{qualityTime}</if>
+            <if test="produceTime != null "> and a.produce_time = #{produceTime}</if>
+            <if test="deptTime != null "> and a.dept_time = #{deptTime}</if>
+            <if test="archiveTime != null "> and a.archive_time = #{archiveTime}</if>
+            <if test="produceComment != null  and produceComment != ''"> and a.produce_comment = #{produceComment}</if>
+            <if test="qualityComment != null  and qualityComment != ''"> and a.quality_comment = #{qualityComment}</if>
+            <if test="deptComment != null  and deptComment != ''"> and a.dept_comment = #{deptComment}</if>
+            <if test="archiveComment != null  and archiveComment != ''"> and a.archive_comment = #{archiveComment}</if>
         </where>
     </select>
     
     <select id="selectCmcArchiveByArchiveId" parameterType="String" resultMap="CmcArchiveResult">
         <include refid="selectCmcArchiveVo"/>
-        where archive_id = #{archiveId}
+        where a.archive_id = #{archiveId}
     </select>
         
     <insert id="insertCmcArchive" parameterType="CmcArchive">

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approvalDocument"    column="approval_document"    />
         <result property="applier"    column="applier"    />
         <result property="applyTime"    column="apply_time"    />
+        <result property="cwTime"    column="cw_time"    />
         <result property="cwUserId"    column="cw_user_id"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcBrandVo">
-        select b.brand_id, b.project_id, b.apply_reason, b.approval_document, b.applier, u.nick_name as applier_nick_name, b.apply_time, b.cw_user_id, u1.nick_name as cw_nick_name from cmc_brand as b
+        select b.brand_id, b.project_id, b.apply_reason, b.approval_document, b.applier, u.nick_name as applier_nick_name, b.apply_time, b.cw_time, b.cw_user_id, u1.nick_name as cw_nick_name from cmc_brand 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.cw_user_id
     </sql>
@@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalDocument != null  and approvalDocument != ''"> and b.approval_document = #{approvalDocument}</if>
             <if test="applier != null "> and b.applier = #{applier}</if>
             <if test="applyTime != null "> and b.apply_time = #{applyTime}</if>
+            <if test="cwTime != null "> and b.cw_time = #{cwTime}</if>
             <if test="cwUserId != null "> and b.cw_user_id = #{cwUserId}</if>
         </where>
     </select>
@@ -58,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalDocument != null">approval_document,</if>
             <if test="applier != null">applier,</if>
             <if test="applyTime != null">apply_time,</if>
+            <if test="cwTime != null">cw_time,</if>
             <if test="cwUserId != null">cw_user_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -67,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalDocument != null">#{approvalDocument},</if>
             <if test="applier != null">#{applier},</if>
             <if test="applyTime != null">#{applyTime},</if>
+            <if test="cwTime != null">#{cwTime},</if>
             <if test="cwUserId != null">#{cwUserId},</if>
          </trim>
     </insert>
@@ -79,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approvalDocument != null">approval_document = #{approvalDocument},</if>
             <if test="applier != null">applier = #{applier},</if>
             <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="cwTime != null">cw_time = #{cwTime},</if>
             <if test="cwUserId != null">cw_user_id = #{cwUserId},</if>
         </trim>
         where brand_id = #{brandId}

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

@@ -24,6 +24,18 @@
         <result property="managerTime"    column="manager_time"    />
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="tender"    javaType="CmcTender"         resultMap="CmcTenderResult" />
+    </resultMap>
+
+    <resultMap type="CmcTender" id="CmcTenderResult">
+        <result property="tenderId"    column="tender_id"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="partyA"    column="party_a"    />
+        <result property="aPerson"    column="a_person"    />
+        <result property="aPhone"    column="a_phone"    />
+        <result property="agent"    column="agent"    />
+        <result property="agentPerson"    column="agent_person"    />
+        <result property="agentPhone"    column="agent_phone"    />
     </resultMap>
 
     <resultMap type="SysUser" id="DraftUserResult">
@@ -37,10 +49,13 @@
     </resultMap>
 
     <sql id="selectCmcContractVo">
-        select c.contract_id, c.contract_code, c.contract_number, c.tender_id, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark,
-               c.sign_scan, c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time from cmc_contract as c
+        select c.contract_id, c.contract_code, c.contract_number, c.tender_id, t.project_name as project_name, t.party_a as party_a, t.a_person as a_person,
+               t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person, t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document,
+               c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan, c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name,
+               c.manager_time from cmc_contract as c
         left join sys_user as u on u.user_id = c.drafter
         left join sys_user as u1 on u1.user_id = c.manager_user_id
+        left join cmc_tender as t on t.tender_id = c.tender_id
     </sql>
 
     <select id="selectCmcContractList" parameterType="CmcContract" resultMap="CmcContractResult">

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

@@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyTime"    column="apply_time"    />
         <result property="applyReason"    column="apply_reason"    />
         <result property="applyDocument"    column="apply_document"    />
+        <result property="managerComment"    column="manager_comment"    />
         <result property="managerTime"    column="manager_time"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="remitTime"    column="remit_time"    />
@@ -25,40 +26,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="backTime"    column="back_time"    />
         <result property="cwComment"    column="cw_comment"    />
         <result property="cwUserId"    column="cw_user_id"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="cwUser"    javaType="SysUser"         resultMap="CwUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplierUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="applier_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="CwUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="cw_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcDepositVo">
-        select deposit_id, deposit_type, tender_id, contract_id, return_time, account_name, account_bank, card_number, deposit_way, applier, apply_time, apply_reason, apply_document, manager_time, manager_user_id, remit_time, cw_time, back_time, cw_comment, cw_user_id from cmc_deposit
+        select d.deposit_id, d.deposit_type, d.tender_id, d.contract_id, d.return_time, d.account_name, d.account_bank, d.card_number, d.deposit_way, d.applier, u.nick_name as applier_nick_name,
+               d.apply_time, d.apply_reason, d.apply_document, d.manager_time, d.manager_comment, d.manager_user_id, u1.nick_name as manager_nick_name, d.remit_time, d.cw_time, d.back_time, d.cw_comment,
+               d.cw_user_id, u2.nick_name as cw_nick_name from cmc_deposit as d
+         left join sys_user as u on u.user_id = d.applier
+         left join sys_user as u1 on u1.user_id = d.manager_user_id
+         left join sys_user as u2 on u2.user_id = d.cw_user_id
     </sql>
 
     <select id="selectCmcDepositList" parameterType="CmcDeposit" resultMap="CmcDepositResult">
         <include refid="selectCmcDepositVo"/>
         <where>  
-            <if test="depositType != null  and depositType != ''"> and deposit_type = #{depositType}</if>
-            <if test="tenderId != null  and tenderId != ''"> and tender_id = #{tenderId}</if>
-            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
-            <if test="returnTime != null "> and return_time = #{returnTime}</if>
-            <if test="accountName != null  and accountName != ''"> and account_name like concat('%', #{accountName}, '%')</if>
-            <if test="accountBank != null  and accountBank != ''"> and account_bank = #{accountBank}</if>
-            <if test="cardNumber != null  and cardNumber != ''"> and card_number = #{cardNumber}</if>
-            <if test="depositWay != null  and depositWay != ''"> and deposit_way = #{depositWay}</if>
-            <if test="applier != null "> and applier = #{applier}</if>
-            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
-            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
-            <if test="applyDocument != null  and applyDocument != ''"> and apply_document = #{applyDocument}</if>
-            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
-            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
-            <if test="remitTime != null "> and remit_time = #{remitTime}</if>
-            <if test="cwTime != null "> and cw_time = #{cwTime}</if>
-            <if test="backTime != null "> and back_time = #{backTime}</if>
-            <if test="cwComment != null  and cwComment != ''"> and cw_comment = #{cwComment}</if>
-            <if test="cwUserId != null "> and cw_user_id = #{cwUserId}</if>
+            <if test="depositType != null  and depositType != ''"> and d.deposit_type = #{depositType}</if>
+            <if test="tenderId != null  and tenderId != ''"> and d.tender_id = #{tenderId}</if>
+            <if test="contractId != null  and contractId != ''"> and d.contract_id = #{contractId}</if>
+            <if test="returnTime != null "> and d.return_time = #{returnTime}</if>
+            <if test="accountName != null  and accountName != ''"> and d.account_name like concat('%', #{accountName}, '%')</if>
+            <if test="accountBank != null  and accountBank != ''"> and d.account_bank = #{accountBank}</if>
+            <if test="cardNumber != null  and cardNumber != ''"> and d.card_number = #{cardNumber}</if>
+            <if test="depositWay != null  and depositWay != ''"> and d.deposit_way = #{depositWay}</if>
+            <if test="applier != null "> and d.applier = #{applier}</if>
+            <if test="applyTime != null "> and d.apply_time = #{applyTime}</if>
+            <if test="applyReason != null  and applyReason != ''"> and d.apply_reason = #{applyReason}</if>
+            <if test="applyDocument != null  and applyDocument != ''"> and d.apply_document = #{applyDocument}</if>
+            <if test="managerTime != null "> and d.manager_time = #{managerTime}</if>
+            <if test="managerUserId != null "> and d.manager_user_id = #{managerUserId}</if>
+            <if test="remitTime != null "> and d.remit_time = #{remitTime}</if>
+            <if test="cwTime != null "> and d.cw_time = #{cwTime}</if>
+            <if test="backTime != null "> and d.back_time = #{backTime}</if>
+            <if test="cwComment != null  and cwComment != ''"> and d.cw_comment = #{cwComment}</if>
+            <if test="cwUserId != null "> and d.cw_user_id = #{cwUserId}</if>
         </where>
     </select>
     
     <select id="selectCmcDepositByDepositId" parameterType="String" resultMap="CmcDepositResult">
         <include refid="selectCmcDepositVo"/>
-        where deposit_id = #{depositId}
+        where d.deposit_id = #{depositId}
     </select>
         
     <insert id="insertCmcDeposit" parameterType="CmcDeposit">
@@ -77,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTime != null">apply_time,</if>
             <if test="applyReason != null">apply_reason,</if>
             <if test="applyDocument != null">apply_document,</if>
+            <if test="managerComment != null">manager_comment,</if>
             <if test="managerTime != null">manager_time,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="remitTime != null">remit_time,</if>
@@ -99,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTime != null">#{applyTime},</if>
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applyDocument != null">#{applyDocument},</if>
+            <if test="managerComment != null">#{managerComment},</if>
             <if test="managerTime != null">#{managerTime},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="remitTime != null">#{remitTime},</if>
@@ -124,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyTime != null">apply_time = #{applyTime},</if>
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applyDocument != null">apply_document = #{applyDocument},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="remitTime != null">remit_time = #{remitTime},</if>

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

@@ -27,6 +27,8 @@
         <result property="remark"    column="remark"    />
         <association property="projectLeaderUser"    javaType="SysUser"         resultMap="ProjectLeaderResult" />
         <association property="projectRegistrantUser"    javaType="SysUser"         resultMap="ProjectRegistrantResult" />
+        <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
+        <association property="qualityInspectorUser"    javaType="SysUser"         resultMap="QualityInspectorResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProjectLeaderResult">
@@ -39,10 +41,25 @@
         <result property="nickName"    column="registrant_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="TechnicalDirectorResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="director_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="QualityInspectorResult">
+        <result property="userId"    column="inspector_user_id"    />
+        <result property="nickName"    column="inspector_nick_name"    />
+    </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.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 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.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, c.technical_director, u2.nick_name as director_nick_name, c.quality_inspector, u3.nick_name as inspector_nick_name, u3.user_id as inspector_user_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
+        left join cmc_technical as c on c.project_id = p.project_id
+        left join sys_user as u2 on u2.user_id = c.technical_director
+        left join sys_user as u3 on u3.user_id = c.quality_inspector
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">

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

@@ -9,13 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="settleId"    column="settle_id"    />
         <result property="content"    column="content"    />
         <result property="amount"    column="amount"    />
-        <result property="amountXm"    column="amount_xm"    />
-        <result property="amountManager"    column="amount_manager"    />
         <result property="remark"    column="remark"    />
+        <result property="tableNumber"    column="table_number"    />
     </resultMap>
 
     <sql id="selectCmcSettleSummaryVo">
-        select summary_id, settle_id, content, amount, amount_xm, amount_manager, remark from cmc_settle_summary
+        select summary_id, settle_id, content, amount, table_number, remark from cmc_settle_summary
     </sql>
 
     <select id="selectCmcSettleSummaryList" parameterType="CmcSettleSummary" resultMap="CmcSettleSummaryResult">
@@ -24,8 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleId != null  and settleId != ''"> and settle_id = #{settleId}</if>
             <if test="content != null  and content != ''"> and content = #{content}</if>
             <if test="amount != null "> and amount = #{amount}</if>
-            <if test="amountXm != null "> and amount_xm = #{amountXm}</if>
-            <if test="amountManager != null "> and amount_manager = #{amountManager}</if>
+            <if test="tableNumber != null  and tableNumber != ''"> and table_number = #{tableNumber}</if>
         </where>
         order by #{summaryId} asc
     </select>
@@ -42,8 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleId != null">settle_id,</if>
             <if test="content != null">content,</if>
             <if test="amount != null">amount,</if>
-            <if test="amountXm != null">amount_xm,</if>
-            <if test="amountManager != null">amount_manager,</if>
+            <if test="tableNumber != null">table_number,</if>
             <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -51,8 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleId != null">#{settleId},</if>
             <if test="content != null">#{content},</if>
             <if test="amount != null">#{amount},</if>
-            <if test="amountXm != null">#{amountXm},</if>
-            <if test="amountManager != null">#{amountManager},</if>
+            <if test="tableNumber != null">#{tableNumber},</if>
             <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
@@ -63,8 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="settleId != null">settle_id = #{settleId},</if>
             <if test="content != null">content = #{content},</if>
             <if test="amount != null">amount = #{amount},</if>
-            <if test="amountXm != null">amount_xm = #{amountXm},</if>
-            <if test="amountManager != null">amount_manager = #{amountManager},</if>
+            <if test="tableNumber != null">table_number = #{tableNumber},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where summary_id = #{summaryId}

oa-ui/src/api/system/post.js

@@ -76,6 +76,24 @@ export function getUsersDeptLeaderByDept(query) {
   })
 }
 
+// 查询当前用户的部门负责人
+export function getUsersViceDeptLeader(query) {
+  return request({
+    url: '/system/post/deptViceLeader',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前部门的部门负责人
+export function getUsersViceDeptLeaderByDept(query) {
+  return request({
+    url: '/system/post/deptViceLeaderByDept',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询当前用户的分管领导
 export function getUsersManageLeader(query) {
   return request({

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

@@ -11,79 +11,119 @@
               <el-option v-for="item in projectList" :key="item.value" :label="item.projectName" :value="item.projectId">
               </el-option>
             </el-select>
-            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+            <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="2" direction="vertical">
+              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
               }}</el-descriptions-item>
-              <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseProject.partyA
+              }}</el-descriptions-item>
+              <el-descriptions-item label="合同编码" label-class-name="my-label">{{ contractCode
               }}</el-descriptions-item>
-              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                chooseProject.projectLeaderUser.nickName : ''
+              <el-descriptions-item label="承担部门" label-class-name="my-label">{{
+                chooseProject.undertakingDeptName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser
+                ? chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
+              <el-descriptions-item label="技术负责人" label-class-name="my-label">{{
+                chooseProject.technicalDirectorUser ? chooseProject.technicalDirectorUser.nickName :
+                '' }}</el-descriptions-item>
+              <el-descriptions-item label="质检审核员" label-class-name="my-label">{{
+                chooseProject.qualityInspectorUser ? chooseProject.qualityInspectorUser.nickName : ''
               }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
-          <el-form-item label="成果汇交日期" prop="submitTime">
+          <el-form-item label="成果提交日期" prop="submitTime">
             <el-date-picker clearable v-model="form.submitTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择成果汇交日期">
+              placeholder="请选择成果提交日期" :disabled="taskName != '成果上传'">
             </el-date-picker>
           </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12" :xs="24">
+              <el-form-item label="坐标经度" prop="locationLng">
+                <el-input v-model="form.locationLng" placeholder="请输入坐标经度" :disabled="taskName != '成果上传'" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="坐标纬度" prop="locationLat">
+                <el-input v-model="form.locationLat" placeholder="请输入坐标纬度" :disabled="taskName != '成果上传'" />
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="备注说明" prop="submitSituation">
-            <el-input v-model="form.submitSituation" placeholder="请输入备注说明" />
-          </el-form-item>
-          <el-form-item label="坐标经度" prop="locationLng">
-            <el-input v-model="form.locationLng" placeholder="请输入坐标经度" />
+            <el-input v-model="form.submitSituation" placeholder="请输入备注说明" :disabled="taskName != '成果上传'" />
           </el-form-item>
-          <el-form-item label="坐标纬度" prop="locationLat">
-            <el-input v-model="form.locationLat" placeholder="请输入坐标纬度" />
-          </el-form-item>
-          <el-form-item label="生产部门检查员" prop="produceInspector">
-            <el-input v-model="form.produceInspector" placeholder="请输入生产部门检查员" />
-          </el-form-item>
-          <el-form-item label="质量检查员" prop="qualityInspector">
-            <el-input v-model="form.qualityInspector" placeholder="请输入质量检查员" />
-          </el-form-item>
-          <el-form-item label="技术部负责人" prop="deptLeader">
-            <el-input v-model="form.deptLeader" placeholder="请输入技术部负责人" />
-          </el-form-item>
-          <el-form-item label="归档人" prop="archiver">
-            <el-input v-model="form.archiver" placeholder="请输入归档人" />
+          <el-divider></el-divider>
+          <el-form-item label="部门检查员检查" prop="produceComment">
+            <el-input v-model="form.produceComment" 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="taskName != '成果上传'">
+                <span class="auditor"> {{ form.produceUser ? form.produceUser.nickName : produceUser }}
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '成果上传'">
+                <span> {{ form.produceTime ? form.produceTime : produceTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="资料接收时间" prop="receiveTime">
             <el-date-picker clearable v-model="form.receiveTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择资料接收时间">
+              placeholder="请选择资料接收时间" :disabled="taskName != '质检审核'">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="质量检查时间" prop="qualityTime">
-            <el-date-picker clearable v-model="form.qualityTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择质量检查时间">
-            </el-date-picker>
+          <el-form-item label="质量检查员审核" prop="qualityComment">
+            <el-input v-model="form.qualityComment" placeholder="请输入质量检查员审核意见" :disabled="taskName != '质检审核'" />
           </el-form-item>
-          <el-form-item label="生产部门检查时间" prop="produceTime">
-            <el-date-picker clearable v-model="form.produceTime" 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="taskName != '成果上传' && taskName != '部门检查'">
+                <span class="auditor"> {{ form.qualityUser ? form.qualityUser.nickName : qualityUser }}
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName != '成果上传' && taskName != '部门检查'">
+                <span> {{ form.qualityTime ? form.qualityTime : qualityTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="技术质量部负责人审核" prop="deptComment">
+            <el-input v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见" :disabled="taskName != '技术部审核'" />
           </el-form-item>
-          <el-form-item label="技术部审核时间" prop="deptTime">
-            <el-date-picker clearable v-model="form.deptTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择技术部审核时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="归档时间" prop="archiveTime">
-            <el-date-picker clearable v-model="form.archiveTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择归档时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="生产部门意见" prop="produceComment">
-            <el-input v-model="form.produceComment" placeholder="请输入生产部门意见" />
-          </el-form-item>
-          <el-form-item label="质量检查意见" prop="qualityComment">
-            <el-input v-model="form.qualityComment" placeholder="请输入质量检查意见" />
-          </el-form-item>
-          <el-form-item label="技术部审核意见" prop="deptComment">
-            <el-input v-model="form.deptComment" placeholder="请输入技术部审核意见" />
-          </el-form-item>
-          <el-form-item label="归档审核意见" prop="archiveComment">
-            <el-input v-model="form.archiveComment" placeholder="请输入归档审核意见" />
+          <el-row>
+            <el-col :span="6" :xs="24" :offset="12">
+              <el-form-item label="签名：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档'">
+                <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }}
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px" v-if="taskName == '技术部审核' || taskName == '成果归档'">
+                <span> {{ form.deptTime ? form.deptTime : deptTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="技术质量部归档" prop="archiveComment">
+            <el-input v-model="form.archiveComment" 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="taskName == '成果归档'">
+                <span class="auditor"> {{ form.archiveUser ? form.archiveUser.nickName : archiveUser }}
+                </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="归档日期：" label-width="120px" v-if="taskName == '成果归档'">
+                <span> {{ form.archiveTime ? form.archiveTime : archiveTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div style="text-align: center;">
           <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -106,6 +146,9 @@
 import { parseTime } from "@/utils/ruoyi";
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listArchive, getArchive, delArchive, addArchive, updateArchive } from "@/api/oa/archive/archive";
+import { listProjectContract } from "@/api/oa/contract/projectContract";
+import { getContract } from "@/api/oa/contract/contract";
+import { getUsersDeptLeaderByDept } from '@/api/system/post'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -127,6 +170,14 @@ export default {
   name: "Archive",
   data() {
     return {
+      produceUser: '',
+      qualityUser: '',
+      deptUser: '',
+      archiveUser: '',
+      produceTime: undefined,
+      qualityTime: undefined,
+      deptTime: undefined,
+      archiveTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -178,9 +229,29 @@ export default {
       formTotal: 0,
       flowData: {},
       projectList: [],
+      contractCode: '',
     };
   },
+  mounted() {
+    this.initForm();
+  },
   created() {
+    if (this.taskName == '部门检查') {
+      this.produceUser = this.$store.getters.name;
+      this.produceTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    else if (this.taskName == '质检审核') {
+      this.qualityUser = this.$store.getters.name;
+      this.qualityTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    else if (this.taskName == '技术部审核') {
+      this.deptUser = this.$store.getters.name;
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
+    else if (this.taskName == '成果归档') {
+      this.archiveUser = this.$store.getters.name;
+      this.archiveTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getProjectList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
@@ -194,15 +265,32 @@ export default {
         if (this.isEmptyObject(res.data)) {
           this.formTotal = 0;
           this.form.applier = this.$store.getters.userId;
-          this.form.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
+          this.form.submitTime = new Date();
         }
         else {
           this.formTotal = 1;
           this.form = res.data;
           if (res.data.projectId) {
-            getProject(data.projectId).then(response => {
+            getProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
-              this.isSelect = true
+              this.isSelect = true;
+              listProjectContract({ projectId: response.data.projectId }).then(res => {
+                if (res.rows.length > 0) {
+                  for (let row of res.rows) {
+                    getContract(row.contractId).then(res => {
+                      if (res.data) {
+                        if (this.contractCode != '') {
+                          this.contractCode = this.contractCode + '、' + res.data.contractCode;
+                        } else {
+                          this.contractCode = res.data.contractCode;
+                        }
+                      }
+                    })
+                  }
+                }
+                else
+                  this.contractCode = '';
+              })
             })
           }
           this.loading = false
@@ -236,9 +324,26 @@ export default {
     // 选择项目
     handleSelectProject(val) {
       if (val != "" && val != undefined && val != null) {
-        getProject(val).then(res => {
-          this.chooseProject = res.data;
+        getProject(val).then(response => {
+          this.chooseProject = response.data;
           this.isSelect = true;
+          listProjectContract({ projectId: response.data.projectId }).then(res => {
+            if (res.rows.length > 0) {
+              for (let row of res.rows) {
+                getContract(row.contractId).then(res => {
+                  if (res.data) {
+                    if (this.contractCode != '') {
+                      this.contractCode = this.contractCode + '、' + res.data.contractCode;
+                    } else {
+                      this.contractCode = res.data.contractCode;
+                    }
+                  }
+                })
+              }
+            }
+            else
+              this.contractCode = '';
+          })
         })
       } else {
         this.isSelect = false
@@ -319,12 +424,54 @@ export default {
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              if (this.taskName == '部门检查') {
+                this.$set(this.taskForm.variables, "approval", this.chooseProject.qualityInspectorUser.userId);
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }              
+              if (this.taskName == '质检审核') {
+                getUsersDeptLeaderByDept({ deptId: 110 }).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')
+                  });
+                });
+              }              
+              if (this.taskName == '技术部审核') {
+                this.$set(this.taskForm.variables, "approval", '57');
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }              
+              if (this.taskName == '成果归档') {
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
+            })
           } else {
+            this.form.archiveId = this.taskForm.formId;
             addArchive(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              this.$set(this.taskForm.variables, "approval", '46');
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              });
+            })
           }
         }
       });

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

@@ -44,17 +44,17 @@
             </el-select>
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
               <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
               <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-    chooseProject.projectLeaderUser.nickName : ''
-                }}</el-descriptions-item>
+                chooseProject.projectLeaderUser.nickName : ''
+              }}</el-descriptions-item>
               <el-descriptions-item label="承担部门" label-class-name="my-label">
                 <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
               </el-descriptions-item>
               <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                }}</el-descriptions-item>
+              }}</el-descriptions-item>
             </el-descriptions>
           </el-form-item>
           <el-form-item label="借款明细">
@@ -213,8 +213,7 @@
 
 
           <el-form-item label="财务部支付备注" prop="cwComment">
-            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注"
-              :disabled="taskName != '财务处理'" />
+            <el-input type="textarea" v-model="form.cwComment" placeholder="请输入财务部支付备注" :disabled="taskName != '财务处理'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -250,7 +249,7 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
-import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept, getUsersManageLeaderByDept } from '@/api/system/post.js'
 import { listBorrow, getBorrow, delBorrow, addBorrow, updateBorrow } from "@/api/oa/borrow/borrow";
 import { listBorrowDetail, addBorrowDetail, updateBorrowDetail } from "@/api/oa/borrow/borrowDetail";
 import { listProject, getProject } from "@/api/oa/project/project";
@@ -356,13 +355,13 @@ export default {
     this.deptId = this.$store.getters.deptId;
     this.getProjectList();
     if (this.$route.query.projectId) {
-      getProject(this.$route.query.projectId).then(res=>{
-        if(res.data){
+      getProject(this.$route.query.projectId).then(res => {
+        if (res.data) {
           this.form.projectId = res.data.projectId;
           this.handleSelectProject(res.data.projectId)
         }
       })
-    }else{
+    } else {
       this.handleSelectProject(this.form.projectId)
     }
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
@@ -374,7 +373,7 @@ export default {
   },
   methods: {
     initForm() {
-      listBorrowDetail({borrowId: this.taskForm.formId}).then(res => {
+      listBorrowDetail({ borrowId: this.taskForm.formId }).then(res => {
         if (res.rows.length != 0) {
           this.detailList = res.rows
         }
@@ -499,19 +498,31 @@ export default {
                 });
               }
               else if (this.taskName == '总经理审核') {
+                let approvalList = [];
                 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')
-                  });
+                  approvalList.push(res.data.userId);
+                  getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
+                    approvalList.push(res1.data.userId);
+                    this.$set(this.taskForm.variables, "approvalList", approvalList);
+                    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')
+                let approvalList = [];
+                getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
+                  approvalList.push(res.data.userId);
+                  getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
+                    approvalList.push(res1.data.userId);
+                    this.$set(this.taskForm.variables, "approvalList", approvalList);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    })
+                  })
                 });
               }
               else if (this.taskName == '财务处理') {

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

@@ -22,10 +22,10 @@
             </el-descriptions>
           </el-form-item>
           <el-form-item label="申请支付说明" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" />
+            <el-input v-model="form.applyReason" placeholder="请输入申请支付说明" :disabled="taskName != '支付申请'" />
           </el-form-item>
           <el-form-item label="审核文件" prop="approvalDocument">
-            <el-input v-model="form.approvalDocument" placeholder="请输入审核文件" />
+            <el-input v-model="form.approvalDocument" placeholder="请输入审核文件" :disabled="taskName != '支付申请'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
@@ -39,13 +39,53 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="财务部经办人" prop="cwUserId">
-            <el-input v-model="form.cwUserId" placeholder="请输入财务部经办人" />
+          <el-divider></el-divider>
+          <el-form-item label="财务反馈：">
+            <table border="1">
+              <tr>
+                <td>序号</td>
+                <td>到账情况</td>
+                <td>到账时间</td>
+              </tr>
+              <tr v-for="(payment, index) in paymentList" :key="index">
+                <td>
+                  {{ index + 1 }}
+                </td>
+                <td>
+                  <el-input v-model="payment.cwComment" placeholder="请输入到账情况" :disabled="taskName != '财务反馈'" />
+                </td>
+                <td>
+                  <el-date-picker clearable v-model="payment.paymentTime" type="date" value-format="yyyy-MM-dd"
+                    placeholder="请选择到账时间" :disabled="taskName != '财务反馈'">
+                  </el-date-picker>
+                </td>
+                <td>
+                  <el-button type="danger" icon="el-icon-minus" size="mini" circle @click="deletPaymentItem(index)"
+                    :disabled="taskName != '财务反馈'"></el-button>
+                </td>
+              </tr>
+            </table>
+            <el-button icon="el-icon-plus" size="mini" @click="addPaymentList()" type="primary" plain
+              :disabled="taskName != '财务反馈'"></el-button>
+            <el-row>
+              <el-col :span="6" :xs="24" :offset="12">
+                <el-form-item label="签名：" label-width="120px" v-if="taskName == '财务反馈'">
+                  <span class="auditor"> {{ form.cwUser ? form.cwUser.nickName : cwUser }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="日期：" label-width="120px" v-if="taskName == '财务反馈'">
+                  <span> {{ form.cwTime ? form.cwTime : cwTime }} </span>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form-item>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm" v-if="taskName == '支付申请'">确 定</el-button>
+          <el-button @click="cancel" v-if="taskName == '支付申请'">取 消</el-button>
+          <el-button @click="preserve()" type="warning" v-if="taskName == '财务反馈'">保 存</el-button>
+          <el-button @click="submitForm" type="danger" v-if="taskName == '财务反馈'">保存并结束</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">
@@ -62,7 +102,9 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
+import { getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept } from '@/api/system/post.js'
 import { listBrandProject, getBrandProject } from "@/api/oa/brand/brandProject";
+import { listBrandPayment, addBrandPayment, delBrandPayment } from "@/api/oa/brand/brandPayment";
 import { listBrand, getBrand, delBrand, addBrand, updateBrand } from "@/api/oa/brand/brand";
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import flow from '@/views/flowable/task/todo/detail/flow'
@@ -85,6 +127,10 @@ export default {
   name: "Brand",
   data() {
     return {
+      applierUser: '',
+      applyTime: undefined,
+      cwUser: '',
+      cwTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -112,10 +158,17 @@ export default {
         approvalDocument: null,
         applier: null,
         applyTime: null,
+        cwTime: null,
         cwUserId: null
       },
       // 表单参数
       form: {},
+      paymentList: [
+        {
+          cwComment: '',
+          paymentTime: undefined
+        }
+      ],
       // 表单校验
       rules: {
       },
@@ -134,6 +187,10 @@ export default {
       this.applierUser = this.$store.getters.name;
       this.applyTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    if (this.taskName == '财务反馈') {
+      this.cwUser = this.$store.getters.name;
+      this.cwTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getProjectList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
@@ -152,8 +209,13 @@ export default {
         else {
           this.formTotal = 1;
           this.form = res.data;
+          listBrandPayment({ brandId: this.taskForm.formId }).then(res => {
+            this.oldPaymentList = res.rows;
+            if (res.rows.length > 0)
+              this.paymentList = res.rows;
+          });
           if (res.data.projectId) {
-            getProject(data.projectId).then(response => {
+            getBrandProject(res.data.projectId).then(response => {
               this.chooseProject = response.data;
               this.isSelect = true
             })
@@ -205,6 +267,43 @@ export default {
       }
       return true;
     },
+    addPaymentList() {
+      this.paymentList.push({
+        paymentCondition: "",
+        paymentPercentage: "",
+        paymentAmount: "",
+        paymentTime: undefined,
+        remark: "",
+      });
+    },
+    deletPaymentItem(index) {
+      let arr = this.paymentList;
+      if (arr.length == 1) {
+        return;
+      }
+      if (index >= 0 && index < arr.length) {
+        arr.splice(index, 1);
+      }
+    },
+    // 暂存数据
+    preserve() {
+      if (this.oldPaymentList.length != 0) {
+        delBrandPayment([this.taskForm.formId]).then(res => {
+          for (let payment of this.paymentList) {
+            payment.brandId = this.taskForm.formId;
+            addBrandPayment(payment);
+          }
+        });
+      } else {
+        for (let payment of this.paymentList) {
+          payment.brandId = this.taskForm.formId;
+          addBrandPayment(payment);
+        }
+      }
+      updateBrand(this.form).then(res => {
+        this.$message.success("保存成功");
+      });
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -214,6 +313,7 @@ export default {
         approvalDocument: null,
         applier: null,
         applyTime: null,
+        cwTime: null,
         cwUserId: null
       };
       this.resetForm("form");
@@ -260,12 +360,35 @@ export default {
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              complete(this.taskForm).then(response => {
+                this.$modal.msgSuccess(response.msg);
+                this.$emit('goBack')
+              })
+            })
           } else {
+            this.form.brandId = this.taskForm.formId;
             addBrand(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              let approvalList = [];
+              getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
+                approvalList.push(res.data.userId);
+                getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
+                  approvalList.push(res1.data.userId);
+                  this.$set(this.taskForm.variables, "approvalList", approvalList);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  })
+                })
+              });
+            })
           }
         }
       });
@@ -289,3 +412,15 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+table {
+  /*居中*/
+  margin: 0 auto;
+  /*边框*/
+  /* border: 1px solid black; */
+  text-align: center;
+  border-collapse: collapse;
+  /*设置背景颜色*/
+  /* background-color: #bfa; */
+}
+</style>

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

@@ -818,7 +818,6 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              updateContract(this.form);
               if (this.taskName == '分管审核') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);

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

@@ -5,78 +5,156 @@
         <h2 class="text-center">保证金审批表</h2>
         <el-divider></el-divider>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-          <el-form-item label="投标项目id" prop="tenderId">
+          <el-row :gutter="20">
+            <el-col :span="12" :xs="24">
+              <el-form-item label="保证金类型" prop="depositType">
+                <el-radio-group v-model="form.depositType" @change="changeDepositType" :disabled="taskName != '保证金申请'">
+                  <el-radio :label="'0'">投标保证金</el-radio>
+                  <el-radio :label="'1'">合同履约保证金</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="预计退还日期" prop="returnTime">
+                <el-date-picker clearable v-model="form.returnTime" type="date" value-format="yyyy-MM-dd"
+                  placeholder="请选择预计退还日期" :disabled="taskName != '保证金申请'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="投标项目名称" prop="tenderId" v-if="tenderOpen">
             <el-select v-model="form.tenderId" filterable placeholder="请选择" @change="handleSelectTender"
               :disabled="taskName != '保证金申请'" clearable>
               <el-option v-for="item in tenderList" :key="item.value" :label="item.projectName" :value="item.tenderId">
               </el-option>
             </el-select>
+            <el-descriptions border v-if="isTenderSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="投标保证金" label-class-name="my-label">{{ chooseTender.deposit
+              }}</el-descriptions-item>
+              <el-descriptions-item label="招标代理人" label-class-name="my-label">{{ chooseTender.agent
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系人及电话" label-class-name="my-label">{{ chooseTender.agentPerson +
+                chooseTender.agentPhone
+              }}</el-descriptions-item>
+            </el-descriptions>
           </el-form-item>
-          <el-form-item label="合同id" prop="contractId">
-            <el-input v-model="form.contractId" placeholder="请输入合同id" />
-          </el-form-item>
-          <el-form-item label="预计退还日期" prop="returnTime">
-            <el-date-picker clearable v-model="form.returnTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择预计退还日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="开户名称" prop="accountName">
-            <el-input v-model="form.accountName" placeholder="请输入开户名称" />
-          </el-form-item>
-          <el-form-item label="开户银行" prop="accountBank">
-            <el-input v-model="form.accountBank" placeholder="请输入开户银行" />
-          </el-form-item>
-          <el-form-item label="银行卡号" prop="cardNumber">
-            <el-input v-model="form.cardNumber" placeholder="请输入银行卡号" />
-          </el-form-item>
-          <el-form-item label="保证金形式" prop="depositWay">
-            <el-input v-model="form.depositWay" placeholder="请输入保证金形式" />
-          </el-form-item>
-          <el-form-item label="申请人" prop="applier">
-            <el-input v-model="form.applier" placeholder="请输入申请人" />
-          </el-form-item>
-          <el-form-item label="申请日期" prop="applyTime">
-            <el-date-picker clearable v-model="form.applyTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择申请日期">
-            </el-date-picker>
+          <el-form-item label="合同名称" prop="contractId" v-if="contractOpen">
+            <el-select v-model="form.contractId" filterable placeholder="请选择" @change="handleSelectContract"
+              :disabled="taskName != '保证金申请'" clearable>
+              <el-option v-for="item in contractList" :key="item.value" :label="item.tender.projectName"
+                :value="item.contractId">
+              </el-option>
+            </el-select>
+            <el-descriptions border v-if="isContractSelect" style="margin-top: 10px;" :column="1">
+              <el-descriptions-item label="履约保证金" label-class-name="my-label">{{ chooseContract.deposit
+              }}</el-descriptions-item>
+              <el-descriptions-item label="甲方单位" label-class-name="my-label">{{ chooseContract.tender.aPerson
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系人及电话" label-class-name="my-label">{{ chooseContract.tender.aPerson +
+                chooseContract.tender.aPhone
+              }}</el-descriptions-item>
+            </el-descriptions>
           </el-form-item>
+          <el-row>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="开户名称" prop="accountName">
+                <el-input v-model="form.accountName" placeholder="请输入开户名称" :disabled="taskName != '保证金申请'" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="开户银行" prop="accountBank">
+                <el-input v-model="form.accountBank" placeholder="请输入开户银行" :disabled="taskName != '保证金申请'" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="银行卡号" prop="cardNumber">
+                <el-input v-model="form.cardNumber" placeholder="请输入银行卡号" :disabled="taskName != '保证金申请'" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="保证金形式" prop="depositWay">
+                <el-select v-model="form.depositWay" filterable placeholder="请选择" :disabled="taskName != '保证金申请'"
+                  clearable>
+                  <el-option v-for="item in depositWayList" :key="item.value" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-form-item label="申请说明" prop="applyReason">
-            <el-input v-model="form.applyReason" placeholder="请输入申请说明" />
+            <el-input v-model="form.applyReason" placeholder="请输入申请说明" :disabled="taskName != '保证金申请'" />
           </el-form-item>
           <el-form-item label="相关附件" prop="applyDocument">
-            <el-input v-model="form.applyDocument" placeholder="请输入相关附件" />
-          </el-form-item>
-          <el-form-item label="分管审批时间" prop="managerTime">
-            <el-date-picker clearable v-model="form.managerTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择分管审批时间">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="分管审批人" prop="managerUserId">
-            <el-input v-model="form.managerUserId" placeholder="请输入分管审批人" />
-          </el-form-item>
-          <el-form-item label="汇款日期" prop="remitTime">
-            <el-date-picker clearable v-model="form.remitTime" type="date" value-format="yyyy-MM-dd"
-              placeholder="请选择汇款日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="财务处理时间" prop="cwTime">
-            <el-date-picker clearable v-model="form.cwTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择财务处理时间">
-            </el-date-picker>
+            <el-input v-model="form.applyDocument" placeholder="请输入相关附件" :disabled="taskName != '保证金申请'" />
           </el-form-item>
-          <el-form-item label="退还时间" prop="backTime">
-            <el-date-picker clearable v-model="form.backTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择退还时间">
-            </el-date-picker>
+          <el-row :gutter="20">
+            <el-col :span="6" :offset="12" :xs="24">
+              <el-form-item label="申请人" label-width="120px">
+                <span class="auditor"> {{ form.applierUser ? form.applierUser.nickName : applierUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="申请日期" label-width="120px">
+                <span> {{ form.applyTime ? form.applyTime : applyTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
+          <el-form-item label="分管审批意见" prop="managerComment">
+            <el-input v-model="form.managerComment" placeholder="请输入分管审批意见" :disabled="taskName != '分管审批'" />
           </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="6" :offset="12" :xs="24">
+              <el-form-item label="签名" label-width="120px" v-if="taskName != '保证金申请'">
+                <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="日期" label-width="120px" v-if="taskName != '保证金申请'">
+                <span> {{ form.managerTime ? form.managerTime : managerTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider></el-divider>
           <el-form-item label="财务打款备注" prop="cwComment">
-            <el-input v-model="form.cwComment" placeholder="请输入财务打款备注" />
-          </el-form-item>
-          <el-form-item label="财务处理人" prop="cwUserId">
-            <el-input v-model="form.cwUserId" placeholder="请输入财务处理人" />
+            <el-input v-model="form.cwComment" placeholder="请输入财务打款备注" :disabled="taskName != '财务处理'" />
           </el-form-item>
+          <el-row>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="汇款日期" prop="remitTime">
+                <el-date-picker clearable v-model="form.remitTime" type="date" value-format="yyyy-MM-dd"
+                  placeholder="请选择汇款日期" :disabled="taskName != '财务处理'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" :xs="24">
+              <el-form-item label="退还时间" prop="backTime">
+                <el-date-picker clearable v-model="form.backTime" type="date" value-format="yyyy-MM-dd"
+                  placeholder="请选择退还时间" :disabled="taskName != '财务处理'">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6" :offset="12" :xs="24">
+              <el-form-item label="签名" label-width="120px" v-if="taskName == '财务处理'">
+                <span class="auditor"> {{ form.cwUser ? form.cwUser.nickName : cwUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :xs="24">
+              <el-form-item label="日期" label-width="120px" v-if="taskName == '财务处理'">
+                <span> {{ form.cwTime ? form.cwTime : cwTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div style="text-align: center;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm" v-if="taskName != '财务处理'">确 定</el-button>
+          <el-button @click="cancel" v-if="taskName != '财务处理'">取 消</el-button>
+          <el-button @click="submitForm" type="warning" v-if="taskName == '财务处理'">保 存</el-button>
+          <el-button @click="submitForm" type="danger" v-if="taskName == '财务处理'">保存并结束</el-button>
         </div>
       </el-col>
       <el-col :span="6" :xs="24">
@@ -93,8 +171,10 @@
 
 <script>
 import { parseTime } from "@/utils/ruoyi";
+import { listContract, getContract } from "@/api/oa/contract/contract";
 import { listTender, getTender } from "@/api/oa/tender/tender";
 import { listDeposit, getDeposit, delDeposit, addDeposit, updateDeposit } from "@/api/oa/deposit/deposit";
+import { getUsersManageLeader, getUsersDeptLeaderByDept, getUsersViceDeptLeaderByDept } from '@/api/system/post.js'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -116,6 +196,12 @@ export default {
   name: "Deposit",
   data() {
     return {
+      applierUser: '',
+      applyTime: undefined,
+      managerUser: '',
+      managerTime: undefined,
+      cwUser: '',
+      cwTime: undefined,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -150,6 +236,7 @@ export default {
         applyTime: null,
         applyReason: null,
         applyDocument: null,
+        managerComment: null,
         managerTime: null,
         managerUserId: null,
         remitTime: null,
@@ -162,19 +249,56 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        accountName: [
+          { required: true, message: '请输入开户名称', trigger: 'blur' },
+        ],
+        accountBank: [
+          { required: true, message: '请输入开户银行', trigger: 'blur' },
+        ],
+        cardNumber: [
+          { required: true, message: '请输入银行卡号', trigger: 'blur' },
+        ],
+        depositWay: [
+          { required: true, message: '请选择保证金形式', trigger: 'blur' },
+        ],
+        // remitTime: [
+        //   { required: true, message: '请输入汇款时间', trigger: 'blur' },
+        // ],
+        // backTime: [
+        //   { required: true, message: '请输入退还时间（如暂未退还，请点保存；待退还后，结束流程）', trigger: 'blur' },
+        // ],
       },
+      tenderOpen: false,
+      contractOpen: false,
       chooseTender: {},
-      isSelect: false,
+      chooseContract: {},
+      isTenderSelect: false,
+      isContractSelect: false,
       formTotal: 0,
       flowData: {},
       tenderList: [],
+      contractList: [],
+      depositWayList: [{ id: '1', name: '电汇' }, { id: '2', name: '现金' }, { id: '3', name: '汇票' }],
     };
   },
   mounted() {
     this.initForm();
   },
   created() {
+    if (this.taskName == '保证金申请') {
+      this.applierUser = this.$store.getters.name;
+      this.applyTime = 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.cwUser = this.$store.getters.name;
+      this.cwTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getTenderList();
+    this.getContractList();
     this.getList();
     flowXmlAndNode({ procInsId: this.taskForm.procInsId, deployId: this.taskForm.deployId }).then(res => {
       this.flowData = res.data;
@@ -193,9 +317,19 @@ export default {
           this.formTotal = 1;
           this.form = res.data;
           if (res.data.tenderId) {
-            getTender(data.tenderId).then(response => {
+            getTender(res.data.tenderId).then(response => {
               this.chooseTender = response.data;
-              this.isSelect = true
+              this.isTenderSelect = true;
+              this.form.depositType = '0';
+              this.tenderOpen = true;
+            })
+          }
+          if (res.data.contractId) {
+            getContract(res.data.contractId).then(response => {
+              this.chooseContract = response.data;
+              this.isContractSelect = true;
+              this.form.depositType = '1';
+              this.contractOpen = true;
             })
           }
           this.loading = false
@@ -226,15 +360,36 @@ export default {
         this.tenderList = response.rows;
       })
     },
+    // 查询合同列表
+    getContractList() {
+      this.loading = true
+      listContract({
+        pageNum: 1,
+        pageSize: 99999999
+      }).then(response => {
+        this.contractList = response.rows;
+      })
+    },
     // 选择项目
     handleSelectTender(val) {
       if (val != "" && val != undefined && val != null) {
         getTender(val).then(res => {
           this.chooseTender = res.data;
-          this.isSelect = true;
+          this.isTenderSelect = true;
+        })
+      } else {
+        this.isTenderSelect = false
+      }
+    },
+    // 选择合同
+    handleSelectContract(val) {
+      if (val != "" && val != undefined && val != null) {
+        getContract(val).then(res => {
+          this.chooseContract = res.data;
+          this.isContractSelect = true;
         })
       } else {
-        this.isSelect = false
+        this.isContractSelect = false
       }
     },
     isEmptyObject(obj) {
@@ -245,6 +400,16 @@ export default {
       }
       return true;
     },
+    changeDepositType(val) {
+      if (val == '0') {
+        this.tenderOpen = true;
+        this.contractOpen = false;
+      }
+      else if (val == '1') {
+        this.tenderOpen = false;
+        this.contractOpen = true;
+      }
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -261,6 +426,7 @@ export default {
         applyTime: null,
         applyReason: null,
         applyDocument: null,
+        managerComment: null,
         managerTime: null,
         managerUserId: null,
         remitTime: null,
@@ -313,12 +479,49 @@ export default {
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              if (this.taskName == '分管审批') {
+                let approvalList = [];
+                getUsersDeptLeaderByDept({ deptId: 106 }).then(res => {
+                  approvalList.push(res.data.userId);
+                  getUsersViceDeptLeaderByDept({ deptId: 106 }).then(res1 => {
+                    approvalList.push(res1.data.userId);
+                    this.$set(this.taskForm.variables, "approvalList", approvalList);
+                    complete(this.taskForm).then(response => {
+                      this.$modal.msgSuccess(response.msg);
+                      this.$emit('goBack')
+                    })
+                  })
+                });
+              }
+              else if (this.taskName == '财务处理') {
+                if (this.form.backTime != undefined) {
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  })
+                }                  
+              }
+            })
           } else {
+            this.form.depositId = this.taskForm.formId;
             addDeposit(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
             });
+            const params = { taskId: this.taskForm.taskId };
+            getNextFlowNode(params).then(res => {
+              getUsersManageLeader({ 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')
+                })
+              })
+            })
           }
         }
       });

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

@@ -278,6 +278,7 @@ export default {
             })
           } else {
             this.form.safeId = this.taskForm.formId;
+            this.form.projectId = this.taskForm.formId;
             addSafe(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

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

@@ -839,7 +839,6 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              updateSubContract(this.form);
               if (this.taskName == '分管审核') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);

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

@@ -403,6 +403,7 @@ export default {
           } else {
             this.form.qualityInspector = '';
             this.form.technicalId = this.taskForm.formId;
+            this.form.projectId = this.taskForm.formId;
             addTechnical(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;