安全要求、合同总经理审核、技术方案流程

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

@@ -96,10 +96,14 @@ public class CmcContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcContract cmcContract)
     {
-        if (cmcContract.getManagerComment() != null && cmcContract.getSignDate() == null) {
+        if (cmcContract.getManagerComment() != null && cmcContract.getGmComment() == null) {
             cmcContract.setManagerUserId(getLoginUser().getUserId());
             cmcContract.setManagerTime(new Date());
         }
+        if (cmcContract.getGmComment() != null && cmcContract.getSignDate() == null) {
+            cmcContract.setGmUserId(getLoginUser().getUserId());
+            cmcContract.setGmTime(new Date());
+        }
         return toAjax(cmcContractService.updateCmcContract(cmcContract));
     }
 

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

@@ -90,10 +90,14 @@ public class CmcSubContractController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcSubContract cmcSubContract)
     {
-        if (cmcSubContract.getManagerComment() != null && cmcSubContract.getSignDate() == null) {
+        if (cmcSubContract.getManagerComment() != null && cmcSubContract.getGmComment() == null) {
             cmcSubContract.setManagerUserId(getLoginUser().getUserId());
             cmcSubContract.setManagerTime(new Date());
         }
+        if (cmcSubContract.getGmComment() != null && cmcSubContract.getSignDate() == null) {
+            cmcSubContract.setGmUserId(getLoginUser().getUserId());
+            cmcSubContract.setGmTime(new Date());
+        }
         return toAjax(cmcSubContractService.updateCmcSubContract(cmcSubContract));
     }
 

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

@@ -88,6 +88,7 @@ public class CmcTechnicalPlanController extends BaseController
     public AjaxResult add(@RequestBody CmcTechnicalPlan cmcTechnicalPlan)
     {
         cmcTechnicalPlan.setTechnicalTime(new Date());
+        cmcTechnicalPlan.setTechnicalPlanner(getLoginUser().getUserId());
         return toAjax(cmcTechnicalPlanService.insertCmcTechnicalPlan(cmcTechnicalPlan));
     }
 
@@ -103,7 +104,7 @@ public class CmcTechnicalPlanController extends BaseController
             cmcTechnicalPlan.setTechnicalUploadTime(new Date());
         }
         if ((cmcTechnicalPlan.getModifyDocument() != null || cmcTechnicalPlan.getTechnicalComment() != null) && cmcTechnicalPlan.getManageComment() == null) {
-            cmcTechnicalPlan.setTechnicalPlanner(getLoginUser().getUserId());
+            cmcTechnicalPlan.setTechnicalAuditor(getLoginUser().getUserId());
             cmcTechnicalPlan.setTechApprovalTime(new Date());
         }
         if (cmcTechnicalPlan.getManageComment() != null) {

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/oa/CallSafeActivityExecutionListener.java

@@ -15,5 +15,6 @@ public class CallSafeActivityExecutionListener implements ExecutionListener {
         SysUserPostMapper userPostMapper = SpringUtils.getBean(SysUserPostMapper.class);
         String userId = userPostMapper.selectUserListByPostName("专职安全员").get(0).getUserId().toString();
         Authentication.setAuthenticatedUserId(userId);
+        delegateExecution.setVariable("approval", userId);
     }
 }

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

@@ -105,6 +105,21 @@ public class CmcContract extends BaseEntity
     @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
+    /** 总经理审核人 */
+    private Long gmUserId;
+    @Excel(name = "总经理")
+    private String gmUserName;
+    private SysUser gmUser;
+
+    /** 总经理审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmTime;
+
+    /** 总经理审核意见 */
+    @Excel(name = "总经理审核意见")
+    private String gmComment;
+
     public void setContractId(String contractId)
     {
         this.contractId = contractId;
@@ -308,6 +323,43 @@ public class CmcContract extends BaseEntity
     {
         return managerTime;
     }
+    public void setGmUserId(Long gmUserId)
+    {
+        this.gmUserId = gmUserId;
+    }
+
+    public Long getGmUserId()
+    {
+        return gmUserId;
+    }
+    public void setGmTime(Date gmTime)
+    {
+        this.gmTime = gmTime;
+    }
+
+    public Date getGmTime()
+    {
+        return gmTime;
+    }
+    public void setGmComment(String gmComment)
+    {
+        this.gmComment = gmComment;
+    }
+
+    public String getGmComment()
+    {
+        return gmComment;
+    }
+    public void setGmUser(SysUser gmUser)
+    {
+        this.gmUser = gmUser;
+        this.gmUserName = gmUser == null ? "" : gmUser.getNickName();
+    }
+
+    public SysUser getGmUser()
+    {
+        return gmUser;
+    }
 
     @Override
     public String toString() {

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

@@ -126,7 +126,6 @@ public class CmcSettle extends BaseEntity
     private String deptComment;
 
     /** 经营发展部审核人 */
-    @Excel(name = "经营发展部审核人")
     private Long jyUserId;
 
     /** 经营发展部审核日期 */
@@ -151,7 +150,6 @@ public class CmcSettle extends BaseEntity
     private String managerComment;
 
     /** 总经理审核人 */
-    @Excel(name = "总经理审核人")
     private Long gmUserId;
 
     /** 总经理审核日期 */
@@ -534,7 +532,7 @@ public class CmcSettle extends BaseEntity
 
     public SysUser getGmUser()
     {
-        return reporterUser;
+        return gmUser;
     }
 
     @Override

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

@@ -94,6 +94,21 @@ public class CmcSubContract extends BaseEntity
     @Excel(name = "分管审批日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date managerTime;
 
+    /** 总经理审核人 */
+    private Long gmUserId;
+    @Excel(name = "总经理")
+    private String gmUserName;
+    private SysUser gmUser;
+
+    /** 总经理审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmTime;
+
+    /** 总经理审核意见 */
+    @Excel(name = "总经理审核意见")
+    private String gmComment;
+
     public void setSubContractId(String subContractId)
     {
         this.subContractId = subContractId;
@@ -269,6 +284,43 @@ public class CmcSubContract extends BaseEntity
     {
         return managerTime;
     }
+    public void setGmUserId(Long gmUserId)
+    {
+        this.gmUserId = gmUserId;
+    }
+
+    public Long getGmUserId()
+    {
+        return gmUserId;
+    }
+    public void setGmTime(Date gmTime)
+    {
+        this.gmTime = gmTime;
+    }
+
+    public Date getGmTime()
+    {
+        return gmTime;
+    }
+    public void setGmComment(String gmComment)
+    {
+        this.gmComment = gmComment;
+    }
+
+    public String getGmComment()
+    {
+        return gmComment;
+    }
+    public void setGmUser(SysUser gmUser)
+    {
+        this.gmUser = gmUser;
+        this.gmUserName = gmUser == null ? "" : gmUser.getNickName();
+    }
+
+    public SysUser getGmUser()
+    {
+        return gmUser;
+    }
 
     @Override
     public String toString() {

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

@@ -35,6 +35,9 @@ public class CmcTechnicalPlan extends BaseEntity
     /** 技术设计人 */
     private Long technicalDesigner;
 
+    /** 技术设计人 */
+    private Long technicalAuditor;
+
     /** 技术安排人 */
     private Long technicalPlanner;
 
@@ -52,6 +55,10 @@ public class CmcTechnicalPlan extends BaseEntity
     private String planUserName;
     private SysUser planUser;
 
+    @Excel(name = "技术审核人")
+    private String auditUserName;
+    private SysUser auditUser;
+
     @Excel(name = "技术设计人")
     private String designUserName;
     private SysUser designUser;
@@ -167,6 +174,15 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return technicalPlanner;
     }
+    public void setTechnicalAuditor(Long technicalAuditor)
+    {
+        this.technicalAuditor = technicalAuditor;
+    }
+
+    public Long getTechnicalAuditor()
+    {
+        return technicalAuditor;
+    }
     public void setDirectUser(SysUser directUser)
     {
         this.directUser = directUser;
@@ -199,6 +215,16 @@ public class CmcTechnicalPlan extends BaseEntity
     {
         return designUser;
     }
+    public void setAuditUser(SysUser auditUser)
+    {
+        this.auditUser = auditUser;
+        this.auditUserName = auditUser == null ? "" : auditUser.getNickName();
+    }
+
+    public SysUser getAuditUser()
+    {
+        return auditUser;
+    }
     public void setManagerUser(SysUser managerUser)
     {
         this.managerUser = managerUser;

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

@@ -24,8 +24,12 @@
         <result property="managerComment"    column="manager_comment"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="managerTime"    column="manager_time"    />
+        <result property="gmUserId"    column="gm_user_id"    />
+        <result property="gmTime"    column="gm_time"    />
+        <result property="gmComment"    column="gm_comment"    />
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
         <association property="tender"    javaType="CmcTender"         resultMap="CmcTenderResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
     </resultMap>
@@ -51,6 +55,11 @@
         <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="GmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="gm_nick_name"    />
+    </resultMap>
+
     <resultMap type="CmcPartyA" id="CmcPartyAResult">
         <result property="partyAId"    column="party_a_id"    />
         <result property="partyAName"    column="party_a_name"    />
@@ -60,9 +69,10 @@
         select c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, c.party_a_id, pa.party_a_name, t.project_name as project_name, t.party_a_id as party_a_id, 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
+               c.manager_time, c.gm_user_id, u2.nick_name as gm_nick_name, c.gm_time, c.gm_comment 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 sys_user as u2 on u2.user_id = c.gm_user_id
         left join cmc_tender as t on t.tender_id = c.tender_id
         left join cmc_party_a as pa on pa.party_a_id = c.party_a_id
     </sql>
@@ -115,6 +125,9 @@
             <if test="managerComment != null">manager_comment,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="managerTime != null">manager_time,</if>
+            <if test="gmUserId != null">gm_user_id,</if>
+            <if test="gmTime != null">gm_time,</if>
+            <if test="gmComment != null">gm_comment,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="contractId != null">#{contractId},</if>
@@ -136,6 +149,9 @@
             <if test="managerComment != null">#{managerComment},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="managerTime != null">#{managerTime},</if>
+            <if test="gmUserId != null">#{gmUserId},</if>
+            <if test="gmTime != null">#{gmTime},</if>
+            <if test="gmComment != null">#{gmComment},</if>
         </trim>
     </insert>
 
@@ -160,6 +176,9 @@
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
+            <if test="gmTime != null">gm_time = #{gmTime},</if>
+            <if test="gmComment != null">gm_comment = #{gmComment},</if>
         </trim>
         where contract_id = #{contractId}
     </update>

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

@@ -22,8 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="managerComment"    column="manager_comment"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="managerTime"    column="manager_time"    />
+        <result property="gmUserId"    column="gm_user_id"    />
+        <result property="gmTime"    column="gm_time"    />
+        <result property="gmComment"    column="gm_comment"    />
         <association property="draftUser"    javaType="SysUser"         resultMap="DraftUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
         <association property="partner"    javaType="CmcPartner"         resultMap="CmcPartnerResult" />
     </resultMap>
 
@@ -37,6 +41,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="GmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="gm_nick_name"    />
+    </resultMap>
+
     <resultMap type="CmcPartner" id="CmcPartnerResult">
         <result property="partnerId"    column="partner_id"    />
         <result property="partnerName"    column="partner_name"    />
@@ -44,9 +53,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcSubContractVo">
         select sc.sub_contract_id, sc.sub_contract_name, sc.sub_amount, sc.partner_id, p.partner_name, sc.contact_person, sc.telephone, sc.contract_document, sc.drafter, u.nick_name as draft_nick_name, sc.draft_time,
-               sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment, sc.manager_user_id, u1.nick_name as manager_nick_name, sc.manager_time from cmc_sub_contract as sc
+               sc.remark, sc.sign_date, sc.sign_remark, sc.sign_scan, sc.comment_type, sc.manager_comment, sc.manager_user_id, u1.nick_name as manager_nick_name, sc.manager_time, sc.gm_user_id, u2.nick_name as gm_nick_name,
+               sc.gm_time, sc.gm_comment from cmc_sub_contract as sc
         left join sys_user as u on u.user_id = sc.drafter
         left join sys_user as u1 on u1.user_id = sc.manager_user_id
+        left join sys_user as u2 on u2.user_id = sc.gm_user_id
         left join cmc_partner as p on p.partner_id = sc.partner_id
     </sql>
 
@@ -94,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerComment != null">manager_comment,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="managerTime != null">manager_time,</if>
+            <if test="gmUserId != null">gm_user_id,</if>
+            <if test="gmTime != null">gm_time,</if>
+            <if test="gmComment != null">gm_comment,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="subContractId != null">#{subContractId},</if>
@@ -113,6 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerComment != null">#{managerComment},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="managerTime != null">#{managerTime},</if>
+            <if test="gmUserId != null">#{gmUserId},</if>
+            <if test="gmTime != null">#{gmTime},</if>
+            <if test="gmComment != null">#{gmComment},</if>
          </trim>
     </insert>
 
@@ -135,6 +152,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="gmUserId != null">gm_user_id = #{gmUserId},</if>
+            <if test="gmTime != null">gm_time = #{gmTime},</if>
+            <if test="gmComment != null">gm_comment = #{gmComment},</if>
         </trim>
         where sub_contract_id = #{subContractId}
     </update>

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

@@ -10,6 +10,7 @@
         <result property="technicalDirector"    column="technical_director"    />
         <result property="technicalDesigner"    column="technical_designer"    />
         <result property="technicalPlanner"    column="technical_planner"    />
+        <result property="technicalAuditor"    column="technical_auditor"    />
         <result property="planComment"    column="plan_comment"    />
         <result property="qualityInspector"    column="quality_inspector"    />
         <result property="technicalTime"    column="technical_time"    />
@@ -25,6 +26,7 @@
         <association property="directUser"    javaType="SysUser"         resultMap="DirectUserResult" />
         <association property="planUser"    javaType="SysUser"         resultMap="PlanUserResult" />
         <association property="designUser"    javaType="SysUser"         resultMap="DesignUserResult" />
+        <association property="auditUser"    javaType="SysUser"         resultMap="AuditUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
     </resultMap>
@@ -44,6 +46,11 @@
         <result property="nickName"    column="design_nick_name"    />
     </resultMap>
 
+    <resultMap type="SysUser" id="AuditUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="audit_nick_name"    />
+    </resultMap>
+
     <resultMap type="SysUser" id="ManagerUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="manager_nick_name"    />
@@ -58,11 +65,13 @@
     <sql id="selectCmcTechnicalPlanVo">
         select t.technical_plan_id, t.project_id, p.project_number, p.project_name, t.technical_director, u.nick_name as direct_nick_name, t.technical_designer, u1.nick_name as design_nick_name,
                t.technical_planner, u2.nick_name as plan_nick_name, t.plan_comment, t.quality_inspector, t.technical_time, t.technical_document, t.modify_document, t.final_document,
-               t.design_description, t.technical_comment, t.manager_user_id, u3.nick_name as manager_nick_name, t.manage_comment, t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical_plan as t
+               t.design_description, t.technical_comment, t.technical_auditor, u3.nick_name as audit_nick_name, t.manager_user_id, u4.nick_name as manager_nick_name, t.manage_comment,
+               t.technical_upload_time, t.tech_approval_time, t.manage_approval_time from cmc_technical_plan as t
         left join sys_user as u on u.user_id = t.technical_director
         left join sys_user as u1 on u1.user_id = t.technical_designer
         left join sys_user as u2 on u2.user_id = t.technical_planner
-        left join sys_user as u3 on u3.user_id = t.manager_user_id
+        left join sys_user as u3 on u3.user_id = t.technical_auditor
+        left join sys_user as u4 on u4.user_id = t.manager_user_id
         left join cmc_project as p on p.project_id = t.project_id
     </sql>
 
@@ -73,6 +82,7 @@
             <if test="technicalDirector != null "> and t.technical_director = #{technicalDirector}</if>
             <if test="technicalDesigner != null "> and t.technical_designer = #{technicalDesigner}</if>
             <if test="technicalPlanner != null "> and t.technical_planner = #{technicalPlanner}</if>
+            <if test="technicalAuditor != null "> and t.technical_auditor = #{technicalAuditor}</if>
             <if test="planComment != null  and planComment != ''"> and t.plan_comment = #{planComment}</if>
             <if test="qualityInspector != null  and qualityInspector != ''"> and t.quality_inspector = #{qualityInspector}</if>
             <if test="technicalTime != null "> and t.technical_time = #{technicalTime}</if>
@@ -101,6 +111,7 @@
             <if test="technicalDirector != null">technical_director,</if>
             <if test="technicalDesigner != null">technical_designer,</if>
             <if test="technicalPlanner != null">technical_planner,</if>
+            <if test="technicalAuditor != null">technical_auditor,</if>
             <if test="planComment != null">plan_comment,</if>
             <if test="qualityInspector != null">quality_inspector,</if>
             <if test="technicalTime != null">technical_time,</if>
@@ -121,6 +132,7 @@
             <if test="technicalDirector != null">#{technicalDirector},</if>
             <if test="technicalDesigner != null">#{technicalDesigner},</if>
             <if test="technicalPlanner != null">#{technicalPlanner},</if>
+            <if test="technicalAuditor != null">#{technicalAuditor},</if>
             <if test="planComment != null">#{planComment},</if>
             <if test="qualityInspector != null">#{qualityInspector},</if>
             <if test="technicalTime != null">#{technicalTime},</if>
@@ -144,6 +156,7 @@
             <if test="technicalDirector != null">technical_director = #{technicalDirector},</if>
             <if test="technicalDesigner != null">technical_designer = #{technicalDesigner},</if>
             <if test="technicalPlanner != null">technical_planner = #{technicalPlanner},</if>
+            <if test="technicalAuditor != null">technical_auditor = #{technicalAuditor},</if>
             <if test="planComment != null">plan_comment = #{planComment},</if>
             <if test="qualityInspector != null">quality_inspector = #{qualityInspector},</if>
             <if test="technicalTime != null">technical_time = #{technicalTime},</if>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: wrh
- * @LastEditTime: 2024-07-05 17:33:58
+ * @LastEditTime: 2024-07-08 18:28:06
 -->
 <template>
   <div class="app-container">
@@ -354,7 +354,7 @@
             </table>
           </el-form-item>
           <el-divider></el-divider>
-          <el-form-item label="分管审批意见" prop="remark">
+          <el-form-item label="分管审批意见" prop="managerComment">
             <el-input v-model="form.managerComment" type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入审批意见"
               :disabled="taskName != '分管审核'" />
           </el-form-item>
@@ -372,6 +372,24 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-form-item label="总经理审批意见" prop="gmComment">
+            <el-input v-model="form.gmComment" type="textarea" :autosize="{ minRows: 4 }" 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 != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
+                <span class="auditor"> {{ form.gmUser ? form.gmUser.nickName : gmUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px"
+                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
+                <span> {{ form.gmTime ? form.gmTime : gmTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
             <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
@@ -453,7 +471,7 @@ import { getContractMeeting, addContractMeeting, updateContractMeeting } from "@
 import { listProjectContract, addProjectContract, delProjectContract } from "@/api/oa/contract/projectContract";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
 import { listTender, getTender } from "@/api/oa/tender/tender";
-import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import ChooseProject from '../components/chooseProject.vue';
@@ -512,6 +530,8 @@ export default {
       draftTime: undefined,
       managerUser: '',
       managerTime: undefined,
+      gmUser: '',
+      gmTime: undefined,
       hostUser: '',
       commentTime: undefined,
       // 遮罩层
@@ -611,6 +631,10 @@ export default {
       this.managerUser = this.$store.getters.name;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    else if (this.taskName == '总经理审核') {
+      this.gmUser = this.$store.getters.name;
+      this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getProjectList();
     this.getPartyAList();
     this.getDeptList();
@@ -1003,10 +1027,13 @@ export default {
             }
             getNextFlowNode(params).then(res => {
               if (this.taskName == '分管审核') {
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+                getUserByPost({ postName: '总经理' }).then(res => {
+                  this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+                  complete(this.taskForm).then(response => {
+                    this.$modal.msgSuccess(response.msg);
+                    this.$emit('goBack')
+                  });
+                })
               }
               else if (this.taskName == '线上会审') {
                 for (let comment of this.commentList) {
@@ -1029,15 +1056,21 @@ export default {
                 formData.append("form", jsonForm);
                 updateContractMeeting(formData);
                 getUsersManageLeader({ userId: this.form.drafter }).then(res => {
-            let userIdList = [];
-            userIdList.push(res.data[0].userId)
-            this.$set(this.taskForm.variables, "approvalList", userIdList);
+                  let userIdList = [];
+                  userIdList.push(res.data[0].userId)
+                  this.$set(this.taskForm.variables, "approvalList", userIdList);
                   complete(this.taskForm).then(response => {
                     this.$modal.msgSuccess(response.msg);
                     this.$emit('goBack')
                   });
                 })
               }
+              else if (this.taskName == '总经理审核') {
+                complete(this.taskForm).then(response => {
+                  this.$modal.msgSuccess(response.msg);
+                  this.$emit('goBack')
+                });
+              }
               else if (this.taskName == '合同签订') {
                 complete(this.taskForm).then(response => {
                   this.$modal.msgSuccess(response.msg);

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-05-10 15:31:57
  * @LastEditors: wrh
- * @LastEditTime: 2024-07-05 17:29:38
+ * @LastEditTime: 2024-07-09 09:19:28
 -->
 <template>
   <div class="app-container">
@@ -369,6 +369,24 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-form-item label="总经理审批意见" prop="gmComment">
+            <el-input v-model="form.gmComment" type="textarea" :autosize="{ minRows: 4 }" 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 != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
+                <span class="auditor"> {{ form.gmUser ? form.gmUser.nickName : gmUser }} </span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="日期：" label-width="120px"
+                v-if="taskName != '合同拟稿' && taskName != '线上会审' && taskName != '会议评审' && taskName != '分管审核'">
+                <span> {{ form.gmTime ? form.gmTime : gmTime }} </span>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-divider></el-divider>
           <el-form-item label="签订日期" prop="signDate">
             <el-date-picker clearable v-model="form.signDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择签订日期"
@@ -430,7 +448,7 @@ import { listProjectContract } from "@/api/oa/contract/projectContract";
 import { getContract } from "@/api/oa/contract/contract";
 import { listSubContract, getSubContract, delSubContract, addSubContract, updateSubContract } from "@/api/oa/contract/subContract";
 import { listProjectSubcontract, addProjectSubcontract, delProjectSubcontract } from '@/api/oa/contract/projectSubcontract'
-import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept } from '@/api/system/post.js'
+import { getUsersDeptLeader, getUsersManageLeader, getUsersDeptLeaderByDept, getDeptLeadersByDeptId, getUsersManageLeaderByDept, getUserByPost } from '@/api/system/post.js'
 import flow from '@/views/flowable/task/todo/detail/flow'
 import { flowXmlAndNode } from "@/api/flowable/definition";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm, } from "@/api/flowable/todo";
@@ -482,6 +500,8 @@ export default {
       draftTime: undefined,
       managerUser: '',
       managerTime: undefined,
+      gmUser: '',
+      gmTime: undefined,
       hostUser: '',
       commentTime: undefined,
       // 遮罩层
@@ -608,6 +628,10 @@ export default {
       this.managerUser = this.$store.getters.name;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
+    else if (this.taskName == '总经理审核') {
+      this.gmUser = this.$store.getters.name;
+      this.gmTime = parseTime(new Date(), '{y}-{m}-{d}')
+    }
     this.getProjectList();
     this.getPartnerList();
     this.getDeptList();
@@ -739,6 +763,7 @@ export default {
                 if (comment.deptId == 105)
                   getDeptLeadersByDeptId({ deptId: comment.deptId }).then(res => {
                     comment.userId = res.data[1].userId;
+                    console.log(comment.userId);
                   })
                 else
                   getUsersDeptLeaderByDept({ deptId: comment.deptId }).then(res => {
@@ -937,7 +962,10 @@ export default {
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
               if (this.taskName == '分管审核') {
-                handleComplete(this.taskForm);
+                getUserByPost({ postName: '总经理' }).then(res => {
+                  this.$set(this.taskForm.variables, "approval", res.data[0].userId);
+                  handleComplete(this.taskForm);
+                })
               }
               else if (this.taskName == '合同拟稿') {
                 this.contractDraftSubmit(handleComplete)
@@ -966,6 +994,9 @@ export default {
                   handleComplete(this.taskForm);
                 })
               }
+              else if (this.taskName == '总经理审核') {
+                handleComplete(this.taskForm);
+              }
               else if (this.taskName == '合同签订') {
                 handleComplete(this.taskForm);
               }

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-04-19 15:32:00
  * @LastEditors: wrh
- * @LastEditTime: 2024-07-01 14:04:29
+ * @LastEditTime: 2024-07-08 18:00:55
 -->
 <template>
   <div class="app-container">
@@ -89,13 +89,13 @@
             </el-link>
           </div>
         </el-form-item>
-        <el-form-item label="技术质量与安全部审核意见" prop="technicalComment">
-          <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术质量与安全部审核意见" />
+        <el-form-item label="技术方案审核意见" prop="technicalComment">
+          <el-input type="textarea" v-model="form.technicalComment" placeholder="请输入技术方案审核意见" />
         </el-form-item>
         <el-row>
           <el-col :span="6" :xs="24" :offset="12">
-            <el-form-item label="签名" prop="technicalPlanner">
-              <span class="auditor"> {{ form.planUser ? form.planUser.nickName : '' }} </span>
+            <el-form-item label="签名" prop="technicalAuditor">
+              <span class="auditor"> {{ form.auditUser ? form.auditUser.nickName : '' }} </span>
             </el-form-item>
           </el-col>
           <el-col :span="6">

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

@@ -120,14 +120,14 @@
               </el-link>
             </div>
           </el-form-item>
-          <el-form-item label="技术质量与安全部审核意见" prop="technicalComment">
-            <el-input type="textarea" v-model="form.technicalComment" :autosize="{ minRows: 4 }" placeholder="请输入技术质量与安全部审核意见"
+          <el-form-item label="技术方案审核意见" prop="technicalComment">
+            <el-input type="textarea" v-model="form.technicalComment" :autosize="{ minRows: 4 }" placeholder="请输入技术方案审核意见"
               :disabled="taskName != '技术审核'" />
           </el-form-item>
           <el-row>
             <el-col :span="6" :xs="24" :offset="12">
-              <el-form-item label="签名" prop="technicalPlanner" v-if="showFormItem('技术审核')">
-                <span class="auditor"> {{ form.planUser ? form.planUser.nickName : planUser }} </span>
+              <el-form-item label="签名" prop="technicalAuditor" v-if="showFormItem('技术审核')">
+                <span class="auditor"> {{ form.auditUser ? form.auditUser.nickName : auditUser }} </span>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -183,6 +183,17 @@
         </el-card>
       </el-col>
     </el-row>
+    <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
+      <el-form ref="taskForm" :model="taskForm">
+        <el-form-item prop="targetKey">
+          <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="completeOpen = false">取 消</el-button>
+        <el-button type="primary" @click="taskComplete">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -191,6 +202,7 @@ import { parseTime } from "@/utils/ruoyi";
 import { listTechnicalPlan, getTechnicalPlan, delTechnicalPlan, addTechnicalPlan, updateTechnicalPlan } from "@/api/oa/technical/technicalPlan";
 import { getProject } from "@/api/oa/project/project";
 import { listUser } from '@/api/system/user';
+import FlowUser from '@/components/flow/User';
 import flow from '@/views/flowable/task/todo/detail/flow';
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
 import { flowXmlAndNode } from "@/api/flowable/definition";
@@ -198,6 +210,7 @@ import { getUsersManageLeaderByDept } from '@/api/system/post'
 
 export default {
   components: {
+    FlowUser,
     flow
   },
   name: "Technical",
@@ -216,6 +229,7 @@ export default {
       planUser: '',
       managerUser: '',
       designUser: '',
+      auditUser: '',
       technicalTime: undefined,
       technicalUploadTime: undefined,
       techApprovalTime: undefined,
@@ -246,6 +260,7 @@ export default {
         technicalDirector: null,
         technicalDesigner: null,
         technicalPlanner: null,
+        technicalAuditor: null,
         planComment: null,
         qualityInspector: null,
         technicalTime: null,
@@ -271,6 +286,10 @@ export default {
       form: {},
       formTotal: 0,
       flowData: {},
+      checkSendUser: false,
+      completeOpen: false,
+      completeTitle: '',
+      checkType: 'single',
       isDocumentValid: true
     };
   },
@@ -284,7 +303,7 @@ export default {
       this.technicalUploadTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '技术审核') {
-      this.planUser = this.$store.getters.name;
+      this.auditUser = this.$store.getters.name;
       this.techApprovalTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
     if (this.taskName == '总工审核') {
@@ -407,6 +426,26 @@ export default {
       }
       return true;
     },
+    // 用户信息选中数据
+    handleUserSelect(selection) {
+      if (selection) {
+        //不多选
+        this.$set(this.taskForm.variables, "approval", selection.userId.toString());
+      }
+    },
+    /** 用户审批任务 */
+    taskComplete() {
+      if (!this.taskForm.variables && this.checkSendUser) {
+        this.$modal.msgError("请选择流程接收人员!");
+        return;
+      }
+      if (this.taskForm) {
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.$emit('goBack')
+        });
+      }
+    },
     validateDocument(doc) {
       // 这里添加你的验证逻辑  
       // 例如，检查tenderId是否为空或者是否符合其他规则  
@@ -435,12 +474,10 @@ export default {
             });
             const params = { taskId: this.taskForm.taskId };
             getNextFlowNode(params).then(res => {
-              if (this.taskName == '方案上传') {
-                this.$set(this.taskForm.variables, "approval", this.form.technicalPlanner);
-                complete(this.taskForm).then(response => {
-                  this.$modal.msgSuccess(response.msg);
-                  this.$emit('goBack')
-                });
+              if (this.taskName == '方案上传') {                
+                this.checkSendUser = true;
+                this.completeOpen = true;
+                this.completeTitle = "流程审批";
               }
               else if (this.taskName == '技术审核') {
                 getUsersManageLeaderByDept({ deptId: 110 }).then(res => {

oa-ui/vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:8086`,
+        // target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''