用车审批添加审批人，日期

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -100,22 +101,27 @@ public class CmcCarApprovalController extends BaseController
         if (formDataJson.getString("deptComment") != null && formDataJson.getString("managerComment") == null) {
             cmcCarApproval.setDeptUserId(getLoginUser().getUserId());
             cmcCarApproval.setDeptComment(formDataJson.getString("deptComment"));
+            cmcCarApproval.setDeptTime(new Date());
         }
-        if (formDataJson.getString("managerComment") != null) {
+        if (formDataJson.getString("managerComment") != null && formDataJson.getString("dispatchComment") == null) {
             cmcCarApproval.setManagerUserId(getLoginUser().getUserId());
             cmcCarApproval.setManagerComment(formDataJson.getString("managerComment"));
+            cmcCarApproval.setManagerTime(new Date());
         }
-        if (formDataJson.getString("gmComment") != null) {
+        if (formDataJson.getString("gmComment") != null && formDataJson.getString("dispatchComment") == null) {
             cmcCarApproval.setGmUserId(getLoginUser().getUserId());
             cmcCarApproval.setGmComment(formDataJson.getString("gmComment"));
+            cmcCarApproval.setGmTime(new Date());
         }
-        if (formDataJson.getString("unionComment") != null) {
+        if (formDataJson.getString("unionComment") != null && formDataJson.getString("dispatchComment") == null) {
             cmcCarApproval.setUnionUserId(getLoginUser().getUserId());
             cmcCarApproval.setUnionComment(formDataJson.getString("unionComment"));
+            cmcCarApproval.setUnionTime(new Date());
         }
         if (formDataJson.getString("dispatchComment") != null) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());
             cmcCarApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
+            cmcCarApproval.setDispatchTime(new Date());
         }
         if (formDataJson.getJSONArray("cars").size() > 0 && formDataJson.getJSONArray("drivers").size() > 0) {
             cmcCarApproval.setDispatcher(getLoginUser().getUserId());

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

@@ -1,7 +1,9 @@
 package com.ruoyi.web.controller.oa;
 
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +35,9 @@ public class CmcProjectCommentController extends BaseController
     @Autowired
     private ICmcProjectCommentService cmcProjectCommentService;
 
+    @Autowired
+    private ISysUserService userService;
+
     /**
      * 查询cmc项目审批列表
      */
@@ -62,7 +67,15 @@ public class CmcProjectCommentController extends BaseController
     @GetMapping(value = "/{projectId}")
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
-        return success(cmcProjectCommentService.selectCmcProjectCommentByProjectId(projectId));
+        CmcProjectComment cmcProjectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(projectId);
+        String scApprove = cmcProjectComment.getScApprover();
+        StringBuilder scApproverName = new StringBuilder();
+        if (scApprove != null && !scApprove.equals("") && scApprove.split(",").length > 0) {
+            for (String user : scApprove.split(","))
+                scApproverName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
+            cmcProjectComment.setScApproverName(scApproverName.substring(0, scApproverName.length() - 1));
+        }
+        return success();
     }
 
     /**
@@ -72,6 +85,10 @@ public class CmcProjectCommentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectComment cmcProjectComment)
     {
+        if (cmcProjectComment.getJyComment() != null) {
+            cmcProjectComment.setJyApprover(getLoginUser().getUserId());
+            cmcProjectComment.setJyApprovalTime(new Date());
+        }
         return toAjax(cmcProjectCommentService.insertCmcProjectComment(cmcProjectComment));
     }
 
@@ -82,6 +99,10 @@ public class CmcProjectCommentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CmcProjectComment cmcProjectComment)
     {
+        if (cmcProjectComment.getManageComment() != null) {
+            cmcProjectComment.setManageApprover(getLoginUser().getUserId());
+            cmcProjectComment.setManageApprovalTime(new Date());
+        }
         return toAjax(cmcProjectCommentService.updateCmcProjectComment(cmcProjectComment));
     }
 

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

@@ -35,7 +35,7 @@ public class CmcBudgetSettle extends BaseEntity
 
     /** 系数 */
     @Excel(name = "系数")
-    private Long coefficient;
+    private Double coefficient;
 
     /** 地类 */
     @Excel(name = "地类")
@@ -90,12 +90,12 @@ public class CmcBudgetSettle extends BaseEntity
     {
         return workload;
     }
-    public void setCoefficient(Long coefficient) 
+    public void setCoefficient(Double coefficient)
     {
         this.coefficient = coefficient;
     }
 
-    public Long getCoefficient() 
+    public Double getCoefficient()
     {
         return coefficient;
     }

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

@@ -29,6 +29,16 @@ public class CmcCarApproval extends BaseEntity
 
     private SysUser applierUser;
 
+    private SysUser deptUser;
+
+    private SysUser managerUser;
+
+    private SysUser unionUser;
+
+    private SysUser gmUser;
+
+    private SysUser dispatchUser;
+
     /** 使用部门 */
     @Excel(name = "使用部门")
     private Long useDept;
@@ -132,6 +142,31 @@ public class CmcCarApproval extends BaseEntity
     @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date applyDate;
 
+    /** 部门审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
+    /** 分管审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 工会审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "工会审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date unionTime;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date gmTime;
+
+    /** 派车审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "派车审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date dispatchTime;
+
     public void setCarApplyId(String carApplyId)
     {
         this.carApplyId = carApplyId;
@@ -159,6 +194,52 @@ public class CmcCarApproval extends BaseEntity
     {
         return applierUser;
     }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
+    public void setUnionUser(SysUser unionUser)
+    {
+        this.unionUser = unionUser;
+    }
+
+    public SysUser getUnionUser()
+    {
+        return unionUser;
+    }
+    public void setGmUser(SysUser gmUser)
+    {
+        this.gmUser = gmUser;
+    }
+
+    public SysUser getGmUser()
+    {
+        return gmUser;
+    }
+    public void setDispatchUser(SysUser dispatchUser)
+    {
+        this.dispatchUser = dispatchUser;
+    }
+
+    public SysUser getDispatchUser()
+    {
+        return dispatchUser;
+    }
+
     public void setUseDept(Long useDept)
     {
         this.useDept = useDept;
@@ -394,6 +475,56 @@ public class CmcCarApproval extends BaseEntity
         return applyDate;
     }
 
+    public void setDeptTime(Date deptTime)
+    {
+        this.deptTime = deptTime;
+    }
+
+    public Date getDeptTime()
+    {
+        return deptTime;
+    }
+
+    public void setManagerTime(Date managerTime)
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime()
+    {
+        return managerTime;
+    }
+
+    public void setUnionTime(Date unionTime)
+    {
+        this.unionTime = unionTime;
+    }
+
+    public Date getUnionTime()
+    {
+        return unionTime;
+    }
+
+    public void setGmTime(Date gmTime)
+    {
+        this.gmTime = gmTime;
+    }
+
+    public Date getGmTime()
+    {
+        return gmTime;
+    }
+
+    public void setDispatchTime(Date dispatchTime)
+    {
+        this.dispatchTime = dispatchTime;
+    }
+
+    public Date getDispatchTime()
+    {
+        return dispatchTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProjectComment.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;
@@ -28,6 +29,10 @@ public class CmcProjectComment extends BaseEntity
     @Excel(name = "经营审核人")
     private Long jyApprover;
 
+    private SysUser jyUser;
+
+    private SysUser managerUser;
+
     /** 经营审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "经营审核时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -54,6 +59,10 @@ public class CmcProjectComment extends BaseEntity
     @Excel(name = "生产确认人")
     private String scApprover;
 
+    /** 生产确认人 */
+    @Excel(name = "生产确认人")
+    private String scApproverName;
+
     /** 生产确认时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "生产确认时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -140,6 +149,15 @@ public class CmcProjectComment extends BaseEntity
     {
         return scApprover;
     }
+    public void setScApproverName(String scApproverName)
+    {
+        this.scApproverName = scApproverName;
+    }
+
+    public String getScApproverName()
+    {
+        return scApproverName;
+    }
     public void setScApprovalTime(Date scApprovalTime) 
     {
         this.scApprovalTime = scApprovalTime;
@@ -149,6 +167,24 @@ public class CmcProjectComment extends BaseEntity
     {
         return scApprovalTime;
     }
+    public void setJyUser(SysUser jyUser)
+    {
+        this.jyUser = jyUser;
+    }
+
+    public SysUser getJyUser()
+    {
+        return jyUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
 
     @Override
     public String toString() {

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

@@ -31,14 +31,49 @@
         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
-        <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="unionTime"    column="union_time"    />
+        <result property="gmTime"    column="gm_time"    />
+        <result property="dispatchTime"    column="dispatch_time"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="unionUser"    javaType="SysUser"         resultMap="UnionUserResult" />
+        <association property="gmUser"    javaType="SysUser"         resultMap="GmUserResult" />
+        <association property="dispatchUser"    javaType="SysUser"         resultMap="DispatchUserResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="SysUserResult">
+    <resultMap type="SysUser" id="ApplierUserResult">
         <result property="userId"    column="user_id"    />
-        <result property="nickName"    column="nick_name"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="UnionUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="union_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="GmUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="gm_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DispatchUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dispatch_nick_name"    />
     </resultMap>
 
     <resultMap type="SysDept" id="SysDeptResult">
@@ -53,8 +88,17 @@
     </resultMap>
 
     <sql id="selectCmcCarApprovalVo">
-        select ca.car_apply_id, ca.applier, u.nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name, ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id, ca.dept_comment, ca.manager_user_id, ca.manager_comment, ca.car_usage, ca.union_user_id, ca.union_comment, ca.gm_user_id, ca.gm_comment, ca.dispatcher, ca.dispatch_comment, ca.estimate_cost from cmc_car_approval as ca
+        select ca.car_apply_id, ca.applier, u.nick_name as applier_nick_name, ca.use_dept, d.dept_name, ca.cars, ca.drivers, ca.project_id, p.project_number, p.project_name,
+               ca.apply_reason, ca.passengers, ca.apply_date, ca.begin_date, ca.begin_halfday, ca.end_date, ca.end_halfday, ca.days, ca.dept_user_id,
+               u1.nick_name as dept_nick_name, ca.dept_comment, ca.manager_user_id, u2.nick_name as manager_nick_name, ca.manager_comment, ca.car_usage,
+               ca.union_user_id, u3.nick_name as union_nick_name, ca.union_comment, ca.gm_user_id, u4.nick_name as gm_nick_name, ca.gm_comment,
+               ca.dispatcher, u5.nick_name as dispatch_nick_name, ca.dispatch_comment, ca.estimate_cost, ca.dept_time, ca.manager_time, ca.union_time, ca.gm_time, ca.dispatch_time from cmc_car_approval as ca
             left join sys_user as u on u.user_id = ca.applier
+            left join sys_user as u1 on u1.user_id = ca.dept_user_id
+            left join sys_user as u2 on u2.user_id = ca.manager_user_id
+            left join sys_user as u3 on u3.user_id = ca.union_user_id
+            left join sys_user as u4 on u4.user_id = ca.gm_user_id
+            left join sys_user as u5 on u5.user_id = ca.dispatcher
             left join sys_dept as d on d.dept_id = ca.use_dept
             left join cmc_project as p on ca.project_id = p.project_id
     </sql>
@@ -183,6 +227,11 @@
             <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
+            <if test="deptTime != null ">dept_time = #{deptTime},</if>
+            <if test="managerTime != null ">manager_time = #{managerTime},</if>
+            <if test="unionTime != null ">union_time = #{unionTime},</if>
+            <if test="gmTime != null ">gm_time = #{gmTime},</if>
+            <if test="dispatchTime != null ">dispatch_time = #{dispatchTime}</if>
         </trim>
         where car_apply_id = #{carApplyId}
     </update>

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

@@ -15,30 +15,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="scComment"    column="sc_comment"    />
         <result property="scApprover"    column="sc_approver"    />
         <result property="scApprovalTime"    column="sc_approval_time"    />
+        <association property="jyUser"    javaType="SysUser"         resultMap="JyUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="jyUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="jy_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcProjectCommentVo">
-        select project_id, jy_comment, jy_approver, jy_approval_time, manage_comment, manage_approver, manage_approval_time, sc_comment, sc_approver, sc_approval_time from cmc_project_comment
+        select pc.project_id, pc.jy_comment, pc.jy_approver, u.nick_name as jy_nick_name, pc.jy_approval_time, pc.manage_comment, pc.manage_approver,
+               u.nick_name as manager_nick_name, pc.manage_approval_time, pc.sc_comment, pc.sc_approver, pc.sc_approval_time from cmc_project_comment as pc
+        left join sys_user as u on u.user_id = pc.dept_user_id
+        left join sys_user as u1 on u1.user_id = pc.manager_user_id
     </sql>
 
     <select id="selectCmcProjectCommentList" parameterType="CmcProjectComment" resultMap="CmcProjectCommentResult">
         <include refid="selectCmcProjectCommentVo"/>
         <where>  
-            <if test="jyComment != null  and jyComment != ''"> and jy_comment = #{jyComment}</if>
-            <if test="jyApprover != null "> and jy_approver = #{jyApprover}</if>
-            <if test="jyApprovalTime != null "> and jy_approval_time = #{jyApprovalTime}</if>
-            <if test="manageComment != null  and manageComment != ''"> and manage_comment = #{manageComment}</if>
-            <if test="manageApprover != null "> and manage_approver = #{manageApprover}</if>
-            <if test="manageApprovalTime != null "> and manage_approval_time = #{manageApprovalTime}</if>
-            <if test="scComment != null  and scComment != ''"> and sc_comment = #{scComment}</if>
-            <if test="scApprover != null  and scApprover != ''"> and sc_approver = #{scApprover}</if>
-            <if test="scApprovalTime != null "> and sc_approval_time = #{scApprovalTime}</if>
+            <if test="jyComment != null  and jyComment != ''"> and pc.jy_comment = #{jyComment}</if>
+            <if test="jyApprover != null "> and pc.jy_approver = #{jyApprover}</if>
+            <if test="jyApprovalTime != null "> and pc.jy_approval_time = #{jyApprovalTime}</if>
+            <if test="manageComment != null  and manageComment != ''"> and pc.manage_comment = #{manageComment}</if>
+            <if test="manageApprover != null "> and pc.manage_approver = #{manageApprover}</if>
+            <if test="manageApprovalTime != null "> and pc.manage_approval_time = #{manageApprovalTime}</if>
+            <if test="scComment != null  and scComment != ''"> and pc.sc_comment = #{scComment}</if>
+            <if test="scApprover != null  and scApprover != ''"> and pc.sc_approver = #{scApprover}</if>
+            <if test="scApprovalTime != null "> and pc.sc_approval_time = #{scApprovalTime}</if>
         </where>
     </select>
     
     <select id="selectCmcProjectCommentByProjectId" parameterType="String" resultMap="CmcProjectCommentResult">
         <include refid="selectCmcProjectCommentVo"/>
-        where project_id = #{projectId}
+        where pc.project_id = #{projectId}
     </select>
         
     <insert id="insertCmcProjectComment" parameterType="CmcProjectComment">

oa-back/sql/sql.sql

@@ -1600,14 +1600,19 @@ create table `cmc_car_approval`  (
   `days`				float			default null 	comment '天数',
   `dept_user_id`		bigint			default null 	comment '部门审批人',
   `dept_comment`		varchar(255)	default null 	comment '部门审批意见',
+  `dept_time`			date			default null 	comment '部门审批时间',
   `manager_user_id`		bigint			default null 	comment '分管审批人',
   `manager_comment`		varchar(255)	default null 	comment '分管审批意见',
+  `manager_time`		date			default null 	comment '分管审批时间',
   `union_user_id`		bigint			default null 	comment '工会审批人',
   `union_comment`		varchar(255)	default null 	comment '工会审批意见',
+  `union_time`			date			default null 	comment '工会审批时间',
   `gm_user_id`			bigint			default null 	comment '总经理审批人',
   `gm_comment`			varchar(255)	default null 	comment '总经理审批意见',
-  `dispatcher`			bigint			default null	comment '调度员',
-  `dispatch_comment`	varchar(255)	default null 	comment '调度审批意见',
+  `gm_time`				date			default null 	comment '总经理审批时间',
+  `dispatcher`			bigint			default null	comment '派车人',
+  `dispatch_comment`	varchar(255)	default null 	comment '派车审批意见',
+  `dispatch_time`		date			default null 	comment '派车审批时间',
   `estimate_cost`		decimal(10,2)	default null	comment '预计用车成本',
   `apply_date`			date			default null 	comment '申请日期',
   primary key (`car_apply_id`)
@@ -3659,7 +3664,7 @@ create table `cmc_project_comment`  (
   `manage_approver` 	bigint			default null comment '分管审核人',
   `manage_approval_time` datetime		default null comment '分管审核时间',
   `sc_comment` 			varchar(255)	default null comment '生产确认意见',
-  `sc_approver` 		varchar(20)		default null comment '生产确认人',
+  `sc_approver` 		varchar(50)		default null comment '生产确认人',
   `sc_approval_time` 	datetime		default null comment '生产确认时间',
   primary key (`project_id`)
 ) engine = innodb comment = 'cmc项目审批表';

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-10 17:14:03
+ * @LastEditTime: 2024-04-11 14:52:03
 -->
 
 <template>
@@ -14,6 +14,7 @@
           <div>
             <el-form ref="carForm" :model="form" label-width="100px" :rules="rules">
               <!-- 申请人填写 -->
+              <el-divider></el-divider>
               <el-row :gutter="20">
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请人：" prop="user.nickName">
@@ -29,7 +30,7 @@
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请时间：" prop="date">
-                    <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:175px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" :disabled="taskName != '用车申请'">
                     </el-date-picker>
                   </el-form-item>
@@ -46,7 +47,7 @@
               </el-row>
               <el-form-item label="项目编号：" prop="projectId">
                 <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-                  :disabled="taskName != '用车申请'" clearable>
+                  :disabled="taskName != '用车申请' || form.carUsage == '1'" clearable>
                   <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
                     :value="item.projectId">
                   </el-option>
@@ -79,14 +80,14 @@
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="开始日期：" prop="beginDate">
-                    <el-date-picker style="width:140px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:175px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="结束日期：" prop="endDate">
-                    <el-date-picker style="width:140px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:175px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
                     </el-date-picker>
                   </el-form-item>
@@ -104,30 +105,102 @@
                   :disabled="taskName != '部门审核'">
                 </el-input>
               </el-form-item>
+              <el-row>
+                <el-col :span="6" :xs="24" :offset="12">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
+                    <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
+                    <el-date-picker style="width:175px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
+                      :disabled="true">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!-- 分管审核意见 -->
               <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
                   :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
+              <el-row>
+                <el-col :span="6" :xs="24" :offset="12">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
+                    <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="日期：" prop="managerTime" label-width="120px" v-if="showFormItem('分管审核')">
+                    <el-date-picker style="width:175px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
+                      :disabled="true">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!-- 工会审核意见 -->
               <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="showFormItem('工会审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment"
                   :disabled="taskName != '工会审核'">
                 </el-input>
               </el-form-item>
+              <el-row>
+                <el-col :span="6" :xs="24" :offset="12">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('工会审核')">
+                    <span class="auditor"> {{ form.unionUser ? form.unionUser.nickName : unionUser }} </span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="日期：" prop="unionTime" label-width="120px" v-if="showFormItem('工会审核')">
+                    <el-date-picker style="width:175px;" v-model="form.unionTime" value-format="yyyy-MM-dd" type="date"
+                      :disabled="true">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!-- 总经理审核意见 -->
               <el-form-item label="总经理审核意见" prop="gmComment" label-width="120px" v-if="showFormItem('总经理审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入总经理审核意见" v-model="form.gmComment"
                   :disabled="taskName != '总经理审核'">
                 </el-input>
               </el-form-item>
+              <el-row>
+                <el-col :span="6" :xs="24" :offset="12">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('总经理审核')">
+                    <span class="auditor"> {{ form.gmUser ? form.gmUser.nickName : gmUser }} </span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="日期：" prop="gmTime" label-width="120px" v-if="showFormItem('总经理审核')">
+                    <el-date-picker style="width:175px;" v-model="form.gmTime" value-format="yyyy-MM-dd" type="date"
+                      :disabled="true">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-divider></el-divider>
               <!-- 安排用车意见 -->
               <el-form-item label="安排用车意见：" prop="dispatchComment" label-width="120px">
                 <el-input type="textarea" :rows="2" placeholder="请输入安排用车意见" v-model="form.dispatchComment"
                   :disabled="taskName != '安排用车'">
                 </el-input>
               </el-form-item>
+              <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.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="日期：" prop="dispatchTime" label-width="120px"
+                    v-if="taskName == '安排用车' || taskName == '申请确认'">
+                    <el-date-picker style="width:175px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
+                      :disabled="true">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!-- 综合事务部管理人员填写 -->
               <el-form-item label="车牌号：">
                 <el-checkbox-group v-model="form.cars" :disabled="taskName != '安排用车'">
@@ -193,6 +266,16 @@ export default {
     }
   },
   created() {
+    if (this.taskName == '部门审核')
+      this.deptUser = this.$store.getters.name;
+    if (this.taskName == '分管审核')
+      this.managerUser = this.$store.getters.name;
+    if (this.taskName == '工会审核')
+      this.unionUser = this.$store.getters.name;
+    if (this.taskName == '总经理审核')
+      this.gmUser = this.$store.getters.name;
+    if (this.taskName == '安排用车')
+      this.dispatchUser = this.$store.getters.name;
     this.dept = this.$store.getters.deptId;
     this.getProjectList();
     this.getCarList();
@@ -203,6 +286,11 @@ export default {
   },
   data() {
     return {
+      deptUser: '',
+      managerUser: '',
+      unionUser: '',
+      gmUser: '',
+      dispatchUser: '',
       form: {
         carUsage: '0',
         days: '',
@@ -438,15 +526,15 @@ export default {
       else
         this.dept = this.$store.getters.deptId;
     },
-    showFormItem(taskName) {
+    showFormItem(name) {
       let isShow = false;
-      if (taskName == '部门审核')
+      if (name == '部门审核')
         isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
-      else if (taskName == '分管审核')
+      else if (name == '分管审核')
         isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
-      else if (taskName == '工会审核')
+      else if (name == '工会审核')
         isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '工会审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
-      else if (taskName == '总经理审核')
+      else if (name == '总经理审核')
         isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
       return isShow;
     },
@@ -457,6 +545,11 @@ export default {
 <style lang="scss" scoped></style>
 
 <style>
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+
 .my-label {
   width: 100px;
   background: #E1F3D8;

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-03-29 10:23:41
+ * @LastEditTime: 2024-04-11 15:31:07
 -->
 
 <template>
@@ -14,6 +14,7 @@
           <div>
             <el-form ref="deviceForm" :model="form" label-width="100px" :rules="rules">
               <!-- 申请人填写 -->
+              <el-divider></el-divider>
               <el-row :gutter="20">
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请人：" prop="user.nickName">
@@ -44,16 +45,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 label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ? chooseProject.projectLeaderUser.nickName : ''
-                    }}</el-descriptions-item>
+                  }}</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">
                     <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="申领事由：" prop="applyReason">
@@ -86,38 +88,50 @@
 
               <!-- 部门审核意见 -->
               <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment" :disabled="taskName != '部门审核'">
+                <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
+                  :disabled="taskName != '部门审核'">
                 </el-input>
               </el-form-item>
               <!-- 分管审核意见 -->
               <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment" :disabled="taskName != '分管审核'">
+                <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
+                  :disabled="taskName != '分管审核'">
                 </el-input>
               </el-form-item>
               <!-- 安排设备意见 -->
+              <el-divider></el-divider>
               <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="120px">
-                <el-input type="textarea" :rows="2" placeholder="请输入安排设备意见" v-model="form.dispatchComment" :disabled="taskName != '安排设备'">
+                <el-input type="textarea" :rows="2" placeholder="请输入安排设备意见" v-model="form.dispatchComment"
+                  :disabled="taskName != '安排设备'">
                 </el-input>
               </el-form-item>
               <!-- 设备安排 -->
               <el-form-item label-width="120px" label="设备选择：">
-                <el-select v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice" clearable :disabled="taskName != '安排设备'">
-                  <el-option v-for="item in deviceList" :key="item.deviceId" :label="item.brand + item.series + item.name + item.code" :value="item.deviceId">
+                <el-select v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice"
+                  clearable :disabled="taskName != '安排设备'">
+                  <el-option v-for="item in deviceList" :key="item.deviceId"
+                    :label="item.brand + item.series + item.name + item.code" :value="item.deviceId">
                   </el-option>
                 </el-select>
                 <el-descriptions border v-if="isDeviceSelect" style="margin-top: 10px;" :column="1">
                   <el-descriptions-item label="出厂编号" label-class-name="my-label">{{ chooseDevice.code
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="设备名称" label-class-name="my-label">{{ chooseDevice.name
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="设备品牌" label-class-name="my-label">{{ chooseDevice.brand
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="规格型号" label-class-name="my-label">{{ chooseDevice.series
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                   <el-descriptions-item label="存放地点" label-class-name="my-label">{{ chooseDevice.place
-                    }}</el-descriptions-item>
+                  }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
+              <el-divider></el-divider>
+              <el-form-item label="归还日期：" prop="returnDate">
+                <el-date-picker style="width:140px;" v-model="form.returnDate" value-format="yyyy-MM-dd" type="date"
+                  placeholder="选择日期" :disabled="taskName != '归还确认'">
+                </el-date-picker>
+              </el-form-item>
             </el-form>
             <el-row style="text-align: center;" v-if="taskName == '设备申请'">
               <el-button type="primary" @click="submit">提交申请</el-button>
@@ -194,9 +208,6 @@ export default {
       flowData: {},
       isSelect: false,
       rules: {
-        projectId: [
-          { required: true, message: '请选择项目编号', trigger: 'change' },
-        ],
         passengers: [
           { required: true, message: '请选择输入乘车人数', trigger: 'change' },
         ],
@@ -401,5 +412,4 @@ export default {
 
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
-}
-</style>
+}</style>