jzh 1 anno fa
parent
commit
7591a31897

+ 56 - 31
zjugis-business/src/main/resources/templates/JobTransfer/index.ftl

@@ -19,13 +19,15 @@ styles=[ '/flow/css/formCommon.css' ]>
                 <tr>
 
                     <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-input z-readonly" name="createReqVO$nickname">
-                                    <input type="text" value="${formEntity.nickname!}">
+                                    <label>
+                                        <input type="text" value="${formEntity.nickname!}">
+                                    </label>
                                 </div>
                             </div>
                         </div>
@@ -33,49 +35,32 @@ styles=[ '/flow/css/formCommon.css' ]>
 
 
                     <td class="th">
-                        <div class="form-label">申请部门</div>
-                    </td>
-                    <td>
-                        <div class="form-group">
-                            <div class="z-comp-selecttree z-readonly" name="deptName">
-                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
-                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
-                                <div class="z-inputselect-bar">
-                                    <span>${formEntity.deptName!}</span><i></i>
-                                </div>
-                            </div>
-                        </div>
-                    </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 z-readonly" name="createReqVO$post"
-                                     data='${post_type!}' value="${formEntity.post!}">
-                                    <div class="z-inputselect-bar">
-                                        <span>${formEntity.post!}</span><i></i>
-                                    </div>
+                                <div class="z-comp-date z-readonly" name="createReqVO$dgsj">
+                                    <input type="text" value="${(formEntity.dgsj?date)!}">
                                 </div>
                             </div>
                         </div>
                     </td>
+
                 </tr>
 
 
                 <tr>
-
                     <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-date" name="createReqVO$dgsj">
-                                    <input type="text" value="${(formEntity.dgsj?date)!}">
+                            <div class="z-comp-selecttree z-readonly" name="deptName">
+                                <input type="hidden" name="createReqVO$deptName" value="${formEntity.deptName!}">
+                                <input type="hidden" name="createReqVO$deptId" value="${formEntity.deptId!}">
+                                <div class="z-inputselect-bar">
+                                    <span>${formEntity.deptName!}</span><i></i>
                                 </div>
                             </div>
                         </div>
@@ -99,6 +84,27 @@ styles=[ '/flow/css/formCommon.css' ]>
                         </div>
                     </td>
 
+
+                </tr>
+
+                <tr>
+
+                    <td class="th">
+                        <div class="form-label ">原岗位:</div>
+                    </td>
+                    <td>
+                        <div class="form-group">
+                            <div class="form-item">
+                                <div class="z-comp-select z-readonly" name="createReqVO$post"
+                                     data='${post_type!}' value="${formEntity.post!}">
+                                    <div class="z-inputselect-bar">
+                                        <span></span><i></i>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+
                     <td class="th">
                         <div class="form-label">调任岗位:</div>
                     </td>
@@ -108,17 +114,36 @@ styles=[ '/flow/css/formCommon.css' ]>
                                 <div class="z-comp-select" name="createReqVO$transferPost"
                                      data='${post_type!}' value="${formEntity.transferPost!}">
                                     <div class="z-inputselect-bar">
-                                        <span>${formEntity.transferPost!}</span><i></i>
+                                        <span></span><i></i>
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </td>
                 </tr>
+
+
+                <tr>
+                    <td class="th">
+                        <div class="form-label">申请理由:</div>
+                    </td>
+                    <td colspan="3">
+                        <div class="form-group">
+                            <div class="form-item">
+                                <div class="z-comp-textarea" name="createReqVO$sqly">
+                                    <label>
+                                        <textarea>${formEntity.sqly!}</textarea>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+
+
             </table>
         </div>
     </div>
-    <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
     <script language="javascript">
         ;
         (function () {

+ 0 - 1
zjugis-business/src/main/resources/templates/Staff/index.ftl

@@ -539,7 +539,6 @@ styles=[ '/flow/css/formCommon.css' ]>
             </table>
         </div>
     </div>
-    <script language="javascript" src="/timeSelector/TimeSelector.js"></script>
     <script language="javascript">
         ;
         (function () {

+ 4 - 2
zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/StaffApi.java

@@ -9,8 +9,10 @@ import com.zjugis.module.adm.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
 
@@ -36,7 +38,7 @@ public interface StaffApi {
     @Operation(summary = "生成员工工号")
     CommonResult<String> generateNum();
 
-    @PostMapping(PREFIX + "/getUserInfo")
+    @GetMapping(PREFIX + "/getUserInfo")
     @Operation(description = "获取用户档案信息")
-    CommonResult<StaffDeptPostDTO> getUser(String userId);
+    CommonResult<StaffDeptPostDTO> getUser(@RequestParam("userId")String userId);
 }