Browse Source

离职申请添加申请时间

jzh 1 year ago
parent
commit
42c95f100c

+ 5 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/resignApply/controller/vo/ResignApplyPageReqVO.java

@@ -89,6 +89,11 @@ public class ResignApplyPageReqVO extends PageParam {
      */
     private LocalDateTime lzsxrq;
 
+    /**
+     * 申请时间
+     */
+    private LocalDateTime createTime;
+
     /**
      * 员工工号
      */

+ 15 - 6
zjugis-business/src/main/resources/templates/ResignApply/index.ftl

@@ -104,19 +104,17 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
                             </td>
 
                             <td class="th">
-                                <div class="form-label ">员工所在地:</div>
+                                <div class="form-label">申请时间:</div>
                             </td>
                             <td>
                                 <div class="form-group">
                                     <div class="form-item">
-                                        <div class="z-comp-select" name="createReqVO$lzygszd"
-                                             data='${location_type!}' value="${formEntity.lzygszd!}">
-                                            <div class="z-inputselect-bar">
-                                                <span></span><i></i>
-                                            </div>
+                                        <div class="z-comp-date z-readonly" name="createReqVO$createTime">
+                                            <input type="text" value="${(formEntity.createTime?date)!}">
                                         </div>
                                     </div>
                                 </div>
+
                             </td>
 
 
@@ -155,8 +153,19 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css','/timeSelector/Tim
 
 
                             <td class="th">
+                                <div class="form-label ">员工所在地:</div>
                             </td>
                             <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$lzygszd"
+                                             data='${location_type!}' value="${formEntity.lzygszd!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </td>
                         </tr>
 

+ 1 - 0
zjugis-business/src/main/resources/templates/ResignApply/js/index.js

@@ -30,6 +30,7 @@
                 mealName.htdqs = Date.parse(mealName.htdqs + "");
                 mealName.zhsbrq = Date.parse(mealName.zhsbrq + "");
                 mealName.lzsxrq = Date.parse(mealName.lzsxrq + "");
+                mealName.createTime = Date.parse(mealName.createTime + "");
                 mealName.lzyy = appendLZYYResult();
                 postData.createReqVO = mealName;
             }