设备审批签名

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

 package com.ruoyi.web.controller.oa;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
         if (formDataJson.getString("deptComment") != null && formDataJson.getString("managerComment") == null) {
             cmcDeviceApproval.setDeptUserId(getLoginUser().getUserId());
             cmcDeviceApproval.setDeptComment(formDataJson.getString("deptComment"));
+            cmcDeviceApproval.setDeptTime(new Date());
         }
-        if (formDataJson.getString("managerComment") != null) {
+        if (formDataJson.getString("managerComment") != null && formDataJson.getString("dispatchComment") == null) {
             cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
             cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
+            cmcDeviceApproval.setManagerTime(new Date());
         }
         if (formDataJson.getDate("returnDate") != null) {
             cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
         if (formDataJson.getString("dispatchComment") != null) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
+            cmcDeviceApproval.setDispatchTime(new Date());
         }
         if (formDataJson.getJSONArray("devices").size() > 0) {
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());

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

     public AjaxResult getInfo(@PathVariable("projectId") String 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));
+        if (cmcProjectComment != null) {
+            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();
+        return success(cmcProjectComment);
     }
 
     /**

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

 
     private SysUser applierUser;
 
+    private SysUser deptUser;
+
+    private SysUser managerUser;
+
+    private SysUser dispatchUser;
+
     /** 使用部门 */
     @Excel(name = "使用部门")
     private Long useDept;
     @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date returnDate;
 
+    /** 部门审批时间 */
+    @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 dispatchTime;
+
     public void setDeviceApplyId(String deviceApplyId)
     {
         this.deviceApplyId = deviceApplyId;
     {
         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 setDispatchUser(SysUser dispatchUser)
+    {
+        this.dispatchUser = dispatchUser;
+    }
+
+    public SysUser getDispatchUser()
+    {
+        return dispatchUser;
+    }
     public void setUseDept(Long useDept)
     {
         this.useDept = useDept;
     {
         return returnDate;
     }
+    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 setDispatchTime(Date dispatchTime)
+    {
+        this.dispatchTime = dispatchTime;
+    }
+
+    public Date getDispatchTime()
+    {
+        return dispatchTime;
+    }
+
 
     @Override
     public String toString() {

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

         <result property="dispatcher"    column="dispatcher"    />
         <result property="dispatchComment"    column="dispatch_comment"    />
         <result property="estimateCost"    column="estimate_cost"    />
+        <result property="remark"    column="remark"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="managerTime"    column="manager_time"    />
         <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
         <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="dispatchUser"    javaType="SysUser"         resultMap="DispatchUserResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
         <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="DispatchUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dispatch_nick_name"    />
     </resultMap>
 
     <resultMap type="SysDept" id="SysDeptResult">
     </resultMap>
 
     <sql id="selectCmcDeviceApprovalVo">
-        select da.device_apply_id, da.applier, u.nick_name, da.use_dept, d.dept_name, da.devices, da.project_id, p.project_number, p.project_name, da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.begin_halfday, da.end_date, da.end_halfday, da.days, da.dept_user_id, da.dept_comment, da.manager_user_id, da.manager_comment, da.dispatcher, da.dispatch_comment, da.estimate_cost from cmc_device_approval as da
+        select da.device_apply_id, da.applier, u.nick_name as applier_nick_name, da.use_dept, d.dept_name, da.devices, da.project_id, p.project_number, p.project_name,
+               da.apply_reason, da.apply_date, da.return_date, da.begin_date, da.begin_halfday, da.end_date, da.end_halfday, da.days, da.dept_user_id, u1.nick_name as dept_nick_name,
+               da.dept_comment, da.manager_user_id, u2.nick_name as manager_nick_name, da.manager_comment, da.dispatcher, u3.nick_name as dispatch_nick_name, da.dispatch_comment, da.estimate_cost, da.remark from cmc_device_approval as da
             left join sys_user as u on u.user_id = da.applier
+            left join sys_user as u1 on u1.user_id = da.dept_user_id
+            left join sys_user as u2 on u2.user_id = da.manager_user_id
+            left join sys_user as u3 on u3.user_id = da.dispatcher
             left join sys_dept as d on d.dept_id = da.use_dept
             left join cmc_project as p on da.project_id = p.project_id
     </sql>
             <if test="dispatcher != null">dispatcher,</if>
             <if test="dispatchComment != null">dispatch_comment,</if>
             <if test="estimateCost != null">estimate_cost,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
             <if test="dispatcher != null">#{dispatcher},</if>
             <if test="dispatchComment != null">#{dispatchComment},</if>
             <if test="estimateCost != null">#{estimateCost},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
             <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="remark != null">remark = #{remark},</if>
         </trim>
         where device_apply_id = #{deviceApplyId}
     </update>

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

         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
     </resultMap>
 
-    <resultMap type="SysUser" id="jyUserResult">
+    <resultMap type="SysUser" id="JyUserResult">
         <result property="userId"    column="user_id"    />
         <result property="nickName"    column="jy_nick_name"    />
     </resultMap>
 
     <sql id="selectCmcProjectCommentVo">
         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
+               u1.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.jy_approver
+        left join sys_user as u1 on u1.user_id = pc.manage_approver
     </sql>
 
     <select id="selectCmcProjectCommentList" parameterType="CmcProjectComment" resultMap="CmcProjectCommentResult">

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

                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请时间：" prop="date">
-                    <el-date-picker style="width:175px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" :disabled="taskName != '用车申请'">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="开始日期：" prop="beginDate">
-                    <el-date-picker style="width:175px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:170px;" 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:175px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
                     </el-date-picker>
                   </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"
+                    <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
                       :disabled="true">
                     </el-date-picker>
                   </el-form-item>
                 </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"
+                    <el-date-picker style="width:170px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
                       :disabled="true">
                     </el-date-picker>
                   </el-form-item>
                 </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"
+                    <el-date-picker style="width:170px;" v-model="form.unionTime" value-format="yyyy-MM-dd" type="date"
                       :disabled="true">
                     </el-date-picker>
                   </el-form-item>
                 </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"
+                    <el-date-picker style="width:170px;" v-model="form.gmTime" value-format="yyyy-MM-dd" type="date"
                       :disabled="true">
                     </el-date-picker>
                   </el-form-item>
                 <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"
+                    <el-date-picker style="width:170px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
                       :disabled="true">
                     </el-date-picker>
                   </el-form-item>

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

  * @Author: ysh
  * @Date: 2024-03-07 13:44:39
  * @LastEditors: wrh
- * @LastEditTime: 2024-04-11 15:31:07
+ * @LastEditTime: 2024-04-11 17:04:54
 -->
 
 <template>
                 </el-col>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="申请时间：" prop="applyDate">
-                    <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
+                    <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" :disabled="taskName != '设备申请'">
                     </el-date-picker>
                   </el-form-item>
               <el-row>
                 <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:170px;" 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:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '设备申请'">
                     </el-date-picker>
                   </el-form-item>
               <el-divider></el-divider>
 
               <!-- 部门审核意见 -->
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px">
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
                   :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:170px;" 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">
+              <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:170px;" v-model="form.managerTime" 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">
                   :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 == '申请确认' || 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 == '申请确认' || taskName == '归还确认'">
+                    <el-date-picker style="width:170px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
+                      :disabled="true">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!-- 设备安排 -->
               <el-form-item label-width="120px" label="设备选择：">
                 <el-select v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice"
                 </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"
+              <el-form-item label="设备情况：" prop="remark" label-width="120px">
+                <el-input type="textarea" :rows="2" placeholder="请输入设备情况" v-model="form.remark"
+                  :disabled="taskName != '归还确认'">
+                </el-input>
+              </el-form-item>
+              <el-form-item label="归还日期：" style="margin-left:20px" prop="returnDate">
+                <el-date-picker style="width:170px;" v-model="form.returnDate" value-format="yyyy-MM-dd" type="date"
                   placeholder="选择日期" :disabled="taskName != '归还确认'">
                 </el-date-picker>
               </el-form-item>
     }
   },
   created() {
+    if (this.taskName == '部门审核')
+      this.deptUser = this.$store.getters.name;
+    if (this.taskName == '分管审核')
+      this.managerUser = this.$store.getters.name;
+    if (this.taskName == '安排设备')
+      this.dispatchUser = this.$store.getters.name;
     this.form.user.nickName = this.$store.getters.name;
     this.form.dept.deptName = this.$store.getters.deptName;
     this.getProjectList();
   },
   data() {
     return {
+      deptUser: '',
+      managerUser: '',
+      dispatchUser: '',
       form: {
         user: {
           nickName: '',
       flowData: {},
       isSelect: false,
       rules: {
-        passengers: [
-          { required: true, message: '请选择输入乘车人数', trigger: 'change' },
-        ],
         beginDate: [
           { required: true, message: '请选择开始日期', trigger: 'change' },
         ],
           { required: true, message: '请选择结束日期', trigger: 'change' },
         ],
         applyReason: [
-          { required: true, message: '请输入用车理由', trigger: 'blur' },
+          { required: true, message: '请输入申领理由', trigger: 'blur' },
         ],
       },
       deviceList: [],
             data.devices = arr;
           }
           this.form = data;
-          getProject(data.projectId).then(response => {
-            this.chooseProject = response.data;
-            this.isSelect = true
-          })
+          if (data.projectId) {
+            getProject(data.projectId).then(response => {
+              this.chooseProject = response.data;
+              this.isSelect = true
+            })
+          }
         }
       })
     },
         }
       }
       return true;
-    }
+    },
+    showFormItem(name) {
+      let isShow = false;
+      if (name == '部门审核')
+        isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.deptUserId != null);
+      else if (name == '分管审核')
+        isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
+      return isShow;
+    },
   },
 }
 </script>
 
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #121212 !important;
-}</style>
+}
+</style>