cmc-coding
/
cmc-oa
Vērot 3
Pievienot zvaigznīti 0
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Laidieni 0 Vikivietne Aktivitāte
Pārlūkot izejas kodu

设备审批签名

lamphua 1 gadu atpakaļ
vecāks
f2ac529e79
revīzija
00ca28887e
8 mainītis faili ar 848 papildinājumiem un 668 dzēšanām
Dalītais skats Rādīt salīdzināšanas statistiku
  1. 5
    1
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java
  2. 9
    7
      oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java
  3. 76
    0
      oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java
  4. 31
    2
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml
  5. 4
    4
      oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectCommentMapper.xml
  6. 632
    628
      oa-back/sql/sql.sql
  7. 8
    8
      oa-ui/src/views/flowable/form/carForm.vue
  8. 83
    18
      oa-ui/src/views/flowable/form/deviceForm.vue

+ 5
- 1
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java Parādīt failu 

@@ -1,6 +1,7 @@
1 1 
 package com.ruoyi.web.controller.oa;
2 2
3 3 
 import java.math.BigDecimal;
4 
+import java.util.Date;
4 5 
 import java.util.List;
5 6 
 import javax.servlet.http.HttpServletResponse;
6 7 
 
@@ -121,10 +122,12 @@ public class CmcDeviceApprovalController extends BaseController
121 122 
         if (formDataJson.getString("deptComment") != null && formDataJson.getString("managerComment") == null) {
122 123 
             cmcDeviceApproval.setDeptUserId(getLoginUser().getUserId());
123 124 
             cmcDeviceApproval.setDeptComment(formDataJson.getString("deptComment"));
125 
+            cmcDeviceApproval.setDeptTime(new Date());
124 126 
         }
125 
-        if (formDataJson.getString("managerComment") != null) {
127 
+        if (formDataJson.getString("managerComment") != null && formDataJson.getString("dispatchComment") == null) {
126 128 
             cmcDeviceApproval.setManagerUserId(getLoginUser().getUserId());
127 129 
             cmcDeviceApproval.setManagerComment(formDataJson.getString("managerComment"));
130 
+            cmcDeviceApproval.setManagerTime(new Date());
128 131 
         }
129 132 
         if (formDataJson.getDate("returnDate") != null) {
130 133 
             cmcDeviceApproval.setReturnDate(formDataJson.getDate("returnDate"));
 
@@ -132,6 +135,7 @@ public class CmcDeviceApprovalController extends BaseController
132 135 
         if (formDataJson.getString("dispatchComment") != null) {
133 136 
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());
134 137 
             cmcDeviceApproval.setDispatchComment(formDataJson.getString("dispatchComment"));
138 
+            cmcDeviceApproval.setDispatchTime(new Date());
135 139 
         }
136 140 
         if (formDataJson.getJSONArray("devices").size() > 0) {
137 141 
             cmcDeviceApproval.setDispatcher(getLoginUser().getUserId());

+ 9
- 7
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectCommentController.java Parādīt failu 

@@ -68,14 +68,16 @@ public class CmcProjectCommentController extends BaseController
68 68 
     public AjaxResult getInfo(@PathVariable("projectId") String projectId)
69 69 
     {
70 70 
         CmcProjectComment cmcProjectComment = cmcProjectCommentService.selectCmcProjectCommentByProjectId(projectId);
71 
-        String scApprove = cmcProjectComment.getScApprover();
72 
-        StringBuilder scApproverName = new StringBuilder();
73 
-        if (scApprove != null && !scApprove.equals("") && scApprove.split(",").length > 0) {
74 
-            for (String user : scApprove.split(","))
75 
-                scApproverName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
76 
-            cmcProjectComment.setScApproverName(scApproverName.substring(0, scApproverName.length() - 1));
71 
+        if (cmcProjectComment != null) {
72 
+            String scApprove = cmcProjectComment.getScApprover();
73 
+            StringBuilder scApproverName = new StringBuilder();
74 
+            if (scApprove != null && !scApprove.equals("") && scApprove.split(",").length > 0) {
75 
+                for (String user : scApprove.split(","))
76 
+                    scApproverName.append(userService.selectUserById(Long.parseLong(user)).getNickName()).append(",");
77 
+                cmcProjectComment.setScApproverName(scApproverName.substring(0, scApproverName.length() - 1));
78 
+            }
77 79 
         }
78 
-        return success();
80 
+        return success(cmcProjectComment);
79 81 
     }
80 82
81 83 
     /**

+ 76
- 0
oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcDeviceApproval.java Parādīt failu 

@@ -30,6 +30,12 @@ public class CmcDeviceApproval extends BaseEntity
30 30
31 31 
     private SysUser applierUser;
32 32
33 
+    private SysUser deptUser;
34 
+
35 
+    private SysUser managerUser;
36 
+
37 
+    private SysUser dispatchUser;
38 
+
33 39 
     /** 使用部门 */
34 40 
     @Excel(name = "使用部门")
35 41 
     private Long useDept;
 
@@ -110,6 +116,21 @@ public class CmcDeviceApproval extends BaseEntity
110 116 
     @Excel(name = "归还日期", width = 30, dateFormat = "yyyy-MM-dd")
111 117 
     private Date returnDate;
112 118
119 
+    /** 部门审批时间 */
120 
+    @JsonFormat(pattern = "yyyy-MM-dd")
121 
+    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
122 
+    private Date deptTime;
123 
+
124 
+    /** 分管审批时间 */
125 
+    @JsonFormat(pattern = "yyyy-MM-dd")
126 
+    @Excel(name = "分管审批时间", width = 30, dateFormat = "yyyy-MM-dd")
127 
+    private Date managerTime;
128 
+
129 
+    /** 调度审批时间 */
130 
+    @JsonFormat(pattern = "yyyy-MM-dd")
131 
+    @Excel(name = "调度审批时间", width = 30, dateFormat = "yyyy-MM-dd")
132 
+    private Date dispatchTime;
133 
+
113 134 
     public void setDeviceApplyId(String deviceApplyId)
114 135 
     {
115 136 
         this.deviceApplyId = deviceApplyId;
 
@@ -138,6 +159,33 @@ public class CmcDeviceApproval extends BaseEntity
138 159 
     {
139 160 
         return applierUser;
140 161 
     }
162 
+    public void setDeptUser(SysUser deptUser)
163 
+    {
164 
+        this.deptUser = deptUser;
165 
+    }
166 
+
167 
+    public SysUser getDeptUser()
168 
+    {
169 
+        return deptUser;
170 
+    }
171 
+    public void setManagerUser(SysUser managerUser)
172 
+    {
173 
+        this.managerUser = managerUser;
174 
+    }
175 
+
176 
+    public SysUser getManagerUser()
177 
+    {
178 
+        return managerUser;
179 
+    }
180 
+    public void setDispatchUser(SysUser dispatchUser)
181 
+    {
182 
+        this.dispatchUser = dispatchUser;
183 
+    }
184 
+
185 
+    public SysUser getDispatchUser()
186 
+    {
187 
+        return dispatchUser;
188 
+    }
141 189 
     public void setUseDept(Long useDept)
142 190 
     {
143 191 
         this.useDept = useDept;
 
@@ -318,6 +366,34 @@ public class CmcDeviceApproval extends BaseEntity
318 366 
     {
319 367 
         return returnDate;
320 368 
     }
369 
+    public void setDeptTime(Date deptTime)
370 
+    {
371 
+        this.deptTime = deptTime;
372 
+    }
373 
+
374 
+    public Date getDeptTime()
375 
+    {
376 
+        return deptTime;
377 
+    }
378 
+    public void setManagerTime(Date managerTime)
379 
+    {
380 
+        this.managerTime = managerTime;
381 
+    }
382 
+
383 
+    public Date getManagerTime()
384 
+    {
385 
+        return managerTime;
386 
+    }
387 
+    public void setDispatchTime(Date dispatchTime)
388 
+    {
389 
+        this.dispatchTime = dispatchTime;
390 
+    }
391 
+
392 
+    public Date getDispatchTime()
393 
+    {
394 
+        return dispatchTime;
395 
+    }
396 
+
321 397
322 398 
     @Override
323 399 
     public String toString() {

+ 31
- 2
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcDeviceApprovalMapper.xml Parādīt failu 

@@ -25,14 +25,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
25 25 
         <result property="dispatcher"    column="dispatcher"    />
26 26 
         <result property="dispatchComment"    column="dispatch_comment"    />
27 27 
         <result property="estimateCost"    column="estimate_cost"    />
28 
+        <result property="remark"    column="remark"    />
29 
+        <result property="deptTime"    column="dept_time"    />
30 
+        <result property="managerTime"    column="manager_time"    />
28 31 
         <association property="applierUser"    javaType="SysUser"         resultMap="SysUserResult" />
29 32 
         <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
30 33 
         <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
34 
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
35 
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
36 
+        <association property="dispatchUser"    javaType="SysUser"         resultMap="DispatchUserResult" />
31 37 
     </resultMap>
32 38
33 39 
     <resultMap type="SysUser" id="SysUserResult">
34 40 
         <result property="userId"    column="user_id"    />
35 
-        <result property="nickName"    column="nick_name"    />
41 
+        <result property="nickName"    column="applier_nick_name"    />
42 
+    </resultMap>
43 
+
44 
+    <resultMap type="SysUser" id="DeptUserResult">
45 
+        <result property="userId"    column="user_id"    />
46 
+        <result property="nickName"    column="dept_nick_name"    />
47 
+    </resultMap>
48 
+
49 
+    <resultMap type="SysUser" id="ManagerUserResult">
50 
+        <result property="userId"    column="user_id"    />
51 
+        <result property="nickName"    column="manager_nick_name"    />
52 
+    </resultMap>
53 
+
54 
+    <resultMap type="SysUser" id="DispatchUserResult">
55 
+        <result property="userId"    column="user_id"    />
56 
+        <result property="nickName"    column="dispatch_nick_name"    />
36 57 
     </resultMap>
37 58
38 59 
     <resultMap type="SysDept" id="SysDeptResult">
 
@@ -47,8 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
47 68 
     </resultMap>
48 69
49 70 
     <sql id="selectCmcDeviceApprovalVo">
50 
-        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
71 
+        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,
72 
+               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,
73 
+               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
51 74 
             left join sys_user as u on u.user_id = da.applier
75 
+            left join sys_user as u1 on u1.user_id = da.dept_user_id
76 
+            left join sys_user as u2 on u2.user_id = da.manager_user_id
77 
+            left join sys_user as u3 on u3.user_id = da.dispatcher
52 78 
             left join sys_dept as d on d.dept_id = da.use_dept
53 79 
             left join cmc_project as p on da.project_id = p.project_id
54 80 
     </sql>
 
@@ -106,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
106 132 
             <if test="dispatcher != null">dispatcher,</if>
107 133 
             <if test="dispatchComment != null">dispatch_comment,</if>
108 134 
             <if test="estimateCost != null">estimate_cost,</if>
135 
+            <if test="remark != null">remark,</if>
109 136 
          </trim>
110 137 
         <trim prefix="values (" suffix=")" suffixOverrides=",">
111 138 
             <if test="deviceApplyId != null">#{deviceApplyId},</if>
 
@@ -128,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
128 155 
             <if test="dispatcher != null">#{dispatcher},</if>
129 156 
             <if test="dispatchComment != null">#{dispatchComment},</if>
130 157 
             <if test="estimateCost != null">#{estimateCost},</if>
158 
+            <if test="remark != null">#{remark},</if>
131 159 
          </trim>
132 160 
     </insert>
133 161 
 
@@ -153,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
153 181 
             <if test="dispatcher != null">dispatcher = #{dispatcher},</if>
154 182 
             <if test="dispatchComment != null">dispatch_comment = #{dispatchComment},</if>
155 183 
             <if test="estimateCost != null">estimate_cost = #{estimateCost},</if>
184 
+            <if test="remark != null">remark = #{remark},</if>
156 185 
         </trim>
157 186 
         where device_apply_id = #{deviceApplyId}
158 187 
     </update>

+ 4
- 4
oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectCommentMapper.xml Parādīt failu 

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
19 19 
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
20 20 
     </resultMap>
21 21
22 
-    <resultMap type="SysUser" id="jyUserResult">
22 
+    <resultMap type="SysUser" id="JyUserResult">
23 23 
         <result property="userId"    column="user_id"    />
24 24 
         <result property="nickName"    column="jy_nick_name"    />
25 25 
     </resultMap>
 
@@ -31,9 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
31 31
32 32 
     <sql id="selectCmcProjectCommentVo">
33 33 
         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,
34 
-               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
35 
-        left join sys_user as u on u.user_id = pc.dept_user_id
36 
-        left join sys_user as u1 on u1.user_id = pc.manager_user_id
34 
+               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
35 
+        left join sys_user as u on u.user_id = pc.jy_approver
36 
+        left join sys_user as u1 on u1.user_id = pc.manage_approver
37 37 
     </sql>
38 38
39 39 
     <select id="selectCmcProjectCommentList" parameterType="CmcProjectComment" resultMap="CmcProjectCommentResult">

+ 632
- 628
oa-back/sql/sql.sql
Failā izmaiņas netiks attēlotas, jo tās ir par lielu
Parādīt failu


+ 8
- 8
oa-ui/src/views/flowable/form/carForm.vue Parādīt failu 

@@ -30,7 +30,7 @@
30 30 
                 </el-col>
31 31 
                 <el-col :span="6" :xs="24">
32 32 
                   <el-form-item label="申请时间：" prop="date">
33 
-                    <el-date-picker style="width:175px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
33 
+                    <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
34 34 
                       placeholder="选择日期" :disabled="taskName != '用车申请'">
35 35 
                     </el-date-picker>
36 36 
                   </el-form-item>

@@ -80,14 +80,14 @@
80 80 
                 </el-col>
81 81 
                 <el-col :span="6" :xs="24">
82 82 
                   <el-form-item label="开始日期：" prop="beginDate">
83 
-                    <el-date-picker style="width:175px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
83 
+                    <el-date-picker style="width:170px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
84 84 
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
85 85 
                     </el-date-picker>
86 86 
                   </el-form-item>
87 87 
                 </el-col>
88 88 
                 <el-col :span="6" :xs="24">
89 89 
                   <el-form-item label="结束日期：" prop="endDate">
90 
-                    <el-date-picker style="width:175px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
90 
+                    <el-date-picker style="width:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
91 91 
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '用车申请'">
92 92 
                     </el-date-picker>
93 93 
                   </el-form-item>

@@ -113,7 +113,7 @@
113 113 
                 </el-col>
114 114 
                 <el-col :span="6">
115 115 
                   <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
116 
-                    <el-date-picker style="width:175px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
116 
+                    <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
117 117 
                       :disabled="true">
118 118 
                     </el-date-picker>
119 119 
                   </el-form-item>

@@ -133,7 +133,7 @@
133 133 
                 </el-col>
134 134 
                 <el-col :span="6">
135 135 
                   <el-form-item label="日期：" prop="managerTime" label-width="120px" v-if="showFormItem('分管审核')">
136 
-                    <el-date-picker style="width:175px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
136 
+                    <el-date-picker style="width:170px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
137 137 
                       :disabled="true">
138 138 
                     </el-date-picker>
139 139 
                   </el-form-item>

@@ -153,7 +153,7 @@
153 153 
                 </el-col>
154 154 
                 <el-col :span="6">
155 155 
                   <el-form-item label="日期：" prop="unionTime" label-width="120px" v-if="showFormItem('工会审核')">
156 
-                    <el-date-picker style="width:175px;" v-model="form.unionTime" value-format="yyyy-MM-dd" type="date"
156 
+                    <el-date-picker style="width:170px;" v-model="form.unionTime" value-format="yyyy-MM-dd" type="date"
157 157 
                       :disabled="true">
158 158 
                     </el-date-picker>
159 159 
                   </el-form-item>

@@ -173,7 +173,7 @@
173 173 
                 </el-col>
174 174 
                 <el-col :span="6">
175 175 
                   <el-form-item label="日期：" prop="gmTime" label-width="120px" v-if="showFormItem('总经理审核')">
176 
-                    <el-date-picker style="width:175px;" v-model="form.gmTime" value-format="yyyy-MM-dd" type="date"
176 
+                    <el-date-picker style="width:170px;" v-model="form.gmTime" value-format="yyyy-MM-dd" type="date"
177 177 
                       :disabled="true">
178 178 
                     </el-date-picker>
179 179 
                   </el-form-item>

@@ -195,7 +195,7 @@
195 195 
                 <el-col :span="6">
196 196 
                   <el-form-item label="日期：" prop="dispatchTime" label-width="120px"
197 197 
                     v-if="taskName == '安排用车' || taskName == '申请确认'">
198 
-                    <el-date-picker style="width:175px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
198 
+                    <el-date-picker style="width:170px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
199 199 
                       :disabled="true">
200 200 
                     </el-date-picker>
201 201 
                   </el-form-item>

+ 83
- 18
oa-ui/src/views/flowable/form/deviceForm.vue Parādīt failu 

@@ -2,7 +2,7 @@
2 2 
  * @Author: ysh
3 3 
  * @Date: 2024-03-07 13:44:39
4 4 
  * @LastEditors: wrh
5 
- * @LastEditTime: 2024-04-11 15:31:07
5 
+ * @LastEditTime: 2024-04-11 17:04:54
6 6 
 -->
7 7
8 8 
 <template>

@@ -30,7 +30,7 @@
30 30 
                 </el-col>
31 31 
                 <el-col :span="6" :xs="24">
32 32 
                   <el-form-item label="申请时间：" prop="applyDate">
33 
-                    <el-date-picker style="width:140px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
33 
+                    <el-date-picker style="width:170px;" v-model="form.applyDate" value-format="yyyy-MM-dd" type="date"
34 34 
                       placeholder="选择日期" :disabled="taskName != '设备申请'">
35 35 
                     </el-date-picker>
36 36 
                   </el-form-item>

@@ -66,14 +66,14 @@
66 66 
               <el-row>
67 67 
                 <el-col :span="6" :xs="24">
68 68 
                   <el-form-item label="开始日期：" prop="beginDate">
69 
-                    <el-date-picker style="width:140px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
69 
+                    <el-date-picker style="width:170px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
70 70 
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '设备申请'">
71 71 
                     </el-date-picker>
72 72 
                   </el-form-item>
73 73 
                 </el-col>
74 74 
                 <el-col :span="6" :xs="24">
75 75 
                   <el-form-item label="结束日期：" prop="endDate">
76 
-                    <el-date-picker style="width:140px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
76 
+                    <el-date-picker style="width:170px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
77 77 
                       placeholder="选择日期" @change="calculateDay" :disabled="taskName != '设备申请'">
78 78 
                     </el-date-picker>
79 79 
                   </el-form-item>

@@ -87,17 +87,45 @@
87 87 
               <el-divider></el-divider>
88 88
89 89 
               <!-- 部门审核意见 -->
90 
-              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px">
90 
+              <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="showFormItem('部门审核')">
91 91 
                 <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment"
92 92 
                   :disabled="taskName != '部门审核'">
93 93 
                 </el-input>
94 94 
               </el-form-item>
95 
+              <el-row>
96 
+                <el-col :span="6" :xs="24" :offset="12">
97 
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('部门审核')">
98 
+                    <span class="auditor"> {{ form.deptUser ? form.deptUser.nickName : deptUser }} </span>
99 
+                  </el-form-item>
100 
+                </el-col>
101 
+                <el-col :span="6">
102 
+                  <el-form-item label="日期：" prop="deptTime" label-width="120px" v-if="showFormItem('部门审核')">
103 
+                    <el-date-picker style="width:170px;" v-model="form.deptTime" value-format="yyyy-MM-dd" type="date"
104 
+                      :disabled="true">
105 
+                    </el-date-picker>
106 
+                  </el-form-item>
107 
+                </el-col>
108 
+              </el-row>
95 109 
               <!-- 分管审核意见 -->
96 
-              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px">
110 
+              <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="showFormItem('分管审核')">
97 111 
                 <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment"
98 112 
                   :disabled="taskName != '分管审核'">
99 113 
                 </el-input>
100 114 
               </el-form-item>
115 
+              <el-row>
116 
+                <el-col :span="6" :xs="24" :offset="12">
117 
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('分管审核')">
118 
+                    <span class="auditor"> {{ form.managerUser ? form.managerUser.nickName : managerUser }} </span>
119 
+                  </el-form-item>
120 
+                </el-col>
121 
+                <el-col :span="6">
122 
+                  <el-form-item label="日期：" prop="managerTime" label-width="120px" v-if="showFormItem('分管审核')">
123 
+                    <el-date-picker style="width:170px;" v-model="form.managerTime" value-format="yyyy-MM-dd" type="date"
124 
+                      :disabled="true">
125 
+                    </el-date-picker>
126 
+                  </el-form-item>
127 
+                </el-col>
128 
+              </el-row>
101 129 
               <!-- 安排设备意见 -->
102 130 
               <el-divider></el-divider>
103 131 
               <el-form-item label="安排设备意见：" prop="dispatchComment" label-width="120px">

@@ -105,6 +133,21 @@
105 133 
                   :disabled="taskName != '安排设备'">
106 134 
                 </el-input>
107 135 
               </el-form-item>
136 
+              <el-row>
137 
+                <el-col :span="6" :xs="24" :offset="12">
138 
+                  <el-form-item label="签名：" label-width="120px" v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
139 
+                    <span class="auditor"> {{ form.dispatchUser ? form.dispatchUser.nickName : dispatchUser }} </span>
140 
+                  </el-form-item>
141 
+                </el-col>
142 
+                <el-col :span="6">
143 
+                  <el-form-item label="日期：" prop="dispatchTime" label-width="120px"
144 
+                    v-if="taskName == '安排设备' || taskName == '申请确认' || taskName == '归还确认'">
145 
+                    <el-date-picker style="width:170px;" v-model="form.dispatchTime" value-format="yyyy-MM-dd" type="date"
146 
+                      :disabled="true">
147 
+                    </el-date-picker>
148 
+                  </el-form-item>
149 
+                </el-col>
150 
+              </el-row>
108 151 
               <!-- 设备安排 -->
109 152 
               <el-form-item label-width="120px" label="设备选择：">
110 153 
                 <el-select v-model="form.devices" filterable multiple placeholder="请选择" @change="handleSelectDevice"

@@ -127,8 +170,13 @@
127 170 
                 </el-descriptions>
128 171 
               </el-form-item>
129 172 
               <el-divider></el-divider>
130 
-              <el-form-item label="归还日期：" prop="returnDate">
131 
-                <el-date-picker style="width:140px;" v-model="form.returnDate" value-format="yyyy-MM-dd" type="date"
173 
+              <el-form-item label="设备情况：" prop="remark" label-width="120px">
174 
+                <el-input type="textarea" :rows="2" placeholder="请输入设备情况" v-model="form.remark"
175 
+                  :disabled="taskName != '归还确认'">
176 
+                </el-input>
177 
+              </el-form-item>
178 
+              <el-form-item label="归还日期：" style="margin-left:20px" prop="returnDate">
179 
+                <el-date-picker style="width:170px;" v-model="form.returnDate" value-format="yyyy-MM-dd" type="date"
132 180 
                   placeholder="选择日期" :disabled="taskName != '归还确认'">
133 181 
                 </el-date-picker>
134 182 
               </el-form-item>

@@ -182,6 +230,12 @@ export default {
182 230 
     }
183 231 
   },
184 232 
   created() {
233 
+    if (this.taskName == '部门审核')
234 
+      this.deptUser = this.$store.getters.name;
235 
+    if (this.taskName == '分管审核')
236 
+      this.managerUser = this.$store.getters.name;
237 
+    if (this.taskName == '安排设备')
238 
+      this.dispatchUser = this.$store.getters.name;
185 239 
     this.form.user.nickName = this.$store.getters.name;
186 240 
     this.form.dept.deptName = this.$store.getters.deptName;
187 241 
     this.getProjectList();

@@ -192,6 +246,9 @@ export default {
192 246 
   },
193 247 
   data() {
194 248 
     return {
249 
+      deptUser: '',
250 
+      managerUser: '',
251 
+      dispatchUser: '',
195 252 
       form: {
196 253 
         user: {
197 254 
           nickName: '',

@@ -208,9 +265,6 @@ export default {
208 265 
       flowData: {},
209 266 
       isSelect: false,
210 267 
       rules: {
211 
-        passengers: [
212 
-          { required: true, message: '请选择输入乘车人数', trigger: 'change' },
213 
-        ],
214 268 
         beginDate: [
215 269 
           { required: true, message: '请选择开始日期', trigger: 'change' },
216 270 
         ],

@@ -218,7 +272,7 @@ export default {
218 272 
           { required: true, message: '请选择结束日期', trigger: 'change' },
219 273 
         ],
220 274 
         applyReason: [
221 
-          { required: true, message: '请输入用车理由', trigger: 'blur' },
275 
+          { required: true, message: '请输入申领理由', trigger: 'blur' },
222 276 
         ],
223 277 
       },
224 278 
       deviceList: [],

@@ -254,10 +308,12 @@ export default {
254 308 
             data.devices = arr;
255 309 
           }
256 310 
           this.form = data;
257 
-          getProject(data.projectId).then(response => {
258 
-            this.chooseProject = response.data;
259 
-            this.isSelect = true
260 
-          })
311 
+          if (data.projectId) {
312 
+            getProject(data.projectId).then(response => {
313 
+              this.chooseProject = response.data;
314 
+              this.isSelect = true
315 
+            })
316 
+          }
261 317 
         }
262 318 
       })
263 319 
     },

@@ -400,7 +456,15 @@ export default {
400 456 
         }
401 457 
       }
402 458 
       return true;
403 
-    }
459 
+    },
460 
+    showFormItem(name) {
461 
+      let isShow = false;
462 
+      if (name == '部门审核')
463 
+        isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.deptUserId != null);
464 
+      else if (name == '分管审核')
465 
+        isShow = (this.taskName == '设备申请' || this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排设备' || this.taskName == '申请确认' || this.taskName == '归还确认') && this.form.managerUserId != null);
466 
+      return isShow;
467 
+    },
404 468 
   },
405 469 
 }
406 470 
 </script>

@@ -412,4 +476,5 @@ export default {
412 476
413 477 
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
414 478 
   color: #121212 !important;
415 
-}</style>
479 
+}
480 
+</style>

Rakstīt Priekšskatītījums
Notiek ielāde…
Atcelt
Saglabāt