Ver código fonte

录用去掉字段+入职新增字段

jzh 1 ano atrás
pai
commit
73c1434358

+ 5 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffVO.java

@@ -363,6 +363,11 @@ public class StaffVO {
      */
     private Integer syq;
 
+    /**
+     * 证件交验情况
+     */
+    private String zjjy;
+
 
     List<StaffFamilyDetailDO> detail;
 }

+ 5 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/staff/entity/StaffDO.java

@@ -366,5 +366,10 @@ public class StaffDO extends BaseEntity {
      */
     private Integer syq;
 
+    /**
+     * 证件交验情况
+     */
+    private String zjjy;
+
 
 }

+ 0 - 48
zjugis-business/src/main/resources/templates/Interview/index.ftl

@@ -156,54 +156,6 @@ styles=['/flow/css/formCommon.css','/timeSelector/TimeSelector.css','/OwCommon/O
 
                         </tr>
 
-
-                        <tr>
-                            <td class="th">
-                                <div class="form-label">证件交验情况:</div>
-                            </td>
-
-
-                            <td class="z-checkbox-column">
-                                <div class="z-form-control">
-                                    <div class="z-comp-checkbox" name="createReqVO$v1">
-                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",1,")>checked</#if>"
-                                             value="1"><i></i>学历证书
-                                        </div>
-                                    </div>
-                                    <div class="z-comp-checkbox" name="createReqVO$v2">
-                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",2,")>checked</#if>"
-                                             value="2"><i></i>学位证书
-                                        </div>
-                                    </div>
-                                    <div class="z-comp-checkbox" name="createReqVO$v3">
-                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",3,")>checked</#if>"
-                                             value="3"><i></i>资格证书
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v4">
-                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",4,")>checked</#if>"
-                                         value="4"><i></i>身份证
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v5">
-                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",5,")>checked</#if>"
-                                         value="5"><i></i>个人简历
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v6">
-                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",6,")>checked</#if>"
-                                         value="6"><i></i>学生证原/复印件
-                                    </div>
-                                </div>
-                                <div class="z-comp-checkbox" name="createReqVO$v7">
-                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",7,")>checked</#if>"
-                                         value="7"><i></i>其他材料
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-
                     </table>
                 </div>
 

+ 0 - 26
zjugis-business/src/main/resources/templates/Interview/js/index.js

@@ -123,7 +123,6 @@
             let mealName = postData[key];
             mealName.mssj = Date.parse(mealName.mssj + "");
             mealName.bdrq = Date.parse(mealName.bdrq + "");
-            mealName.zjjy = appendZJJYResult();
             postData.createReqVO = mealName;
         }
 
@@ -181,31 +180,6 @@
     }
 
 
-    /**
-     * 证件交验情况结果评价
-     * @returns {string}
-     */
-    function appendZJJYResult() {
-        var results = ","; // 初始化结果字符串
-
-        // 遍历每个复选框
-        for (var i = 1; i <= 7; i++) {
-            var checkboxName = "createReqVO$v" + i; // 构造复选框名称
-
-            // 使用 jQuery 选择器获取复选框元素
-            var checkbox = $('[name="' + checkboxName + '"] .z-checkbox-item');
-
-            // 检查复选框是否选中
-            if (checkbox.hasClass("checked")) {
-                // 如果选中,将复选框的值拼接到结果字符串中
-                results += checkbox.attr("value") + ",";
-            }
-        }
-
-        return results; // 返回拼接后的结果
-    }
-
-
     function selectStaffResign(userId, callback) {
         $.ajax({
             type: "GET",

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

@@ -69,7 +69,6 @@ styles=[ '/flow/css/formCommon.css' , '/OwCommon/OwCommon.css']>
                             <td style="width: 8%;">已招人数</td>
                             <td style="width: 12%;">任职要求</td>
                             <td style="width: 12%;">岗位职责</td>
-                            <td style="width: 12%;">落实情况</td>
                             <td style="width: 9%;">所属类别</td>
                             <td style="width: 13%;">替补人员</td>
                             <td style="width: 12%;">备注</td>

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

@@ -422,6 +422,53 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
                             </td>
                         </tr>
 
+                        <tr>
+                            <td class="th">
+                                <div class="form-label">证件交验情况:</div>
+                            </td>
+
+
+                            <td class="z-checkbox-column">
+                                <div class="z-form-control">
+                                    <div class="z-comp-checkbox" name="createReqVO$v1">
+                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",1,")>checked</#if>"
+                                             value="1"><i></i>学历证书
+                                        </div>
+                                    </div>
+                                    <div class="z-comp-checkbox" name="createReqVO$v2">
+                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",2,")>checked</#if>"
+                                             value="2"><i></i>学位证书
+                                        </div>
+                                    </div>
+                                    <div class="z-comp-checkbox" name="createReqVO$v3">
+                                        <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",3,")>checked</#if>"
+                                             value="3"><i></i>资格证书
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v4">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",4,")>checked</#if>"
+                                         value="4"><i></i>身份证
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v5">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",5,")>checked</#if>"
+                                         value="5"><i></i>个人简历
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v6">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",6,")>checked</#if>"
+                                         value="6"><i></i>学生证原/复印件
+                                    </div>
+                                </div>
+                                <div class="z-comp-checkbox" name="createReqVO$v7">
+                                    <div class="z-checkbox-item <#if (formEntity.zjjy!)? contains(",7,")>checked</#if>"
+                                         value="7"><i></i>其他材料
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+
 
                     </table>
                 </div>

+ 22 - 43
zjugis-business/src/main/resources/templates/Staff/js/index.js

@@ -66,6 +66,26 @@
         }
     }
 
+    function appendZJJYResult() {
+        var results = ","; // 初始化结果字符串
+
+        // 遍历每个复选框
+        for (var i = 1; i <= 7; i++) {
+            var checkboxName = "createReqVO$v" + i; // 构造复选框名称
+
+            // 使用 jQuery 选择器获取复选框元素
+            var checkbox = $('[name="' + checkboxName + '"] .z-checkbox-item');
+
+            // 检查复选框是否选中
+            if (checkbox.hasClass("checked")) {
+                // 如果选中,将复选框的值拼接到结果字符串中
+                results += checkbox.attr("value") + ",";
+            }
+        }
+
+        return results; // 返回拼接后的结果
+    }
+
     function buildQjsjSeq() {
         let elementsByName = document.getElementsByName("qjsj_seq");
         for (let i = 0; i < elementsByName.length; i++) {
@@ -293,6 +313,7 @@
                 mealName.rgssj = Date.parse(mealName.rgssj + "");
                 mealName.htqdsj = Date.parse(mealName.htqdsj + "");
                 mealName.htdqs = Date.parse(mealName.htdqs + "");
+                mealName.zjjy = appendZJJYResult();
                 postData.createReqVO = mealName;
             }
             if (key.startsWith("detailDO")) {
@@ -330,7 +351,6 @@
         z.ui.inputsearch("[name='createReqVO$nickname']").bindEvents({
             onAfterSelect: function (value, data) {
 
-                clearValue();//在选中之前先把输入框清空
                 var userId = null;
                 var cardId = null;
                 var birthday = null;
@@ -372,45 +392,6 @@
         });
     }
 
-    function clearValue(staff) {
-        $("[name='createReqVO$userId']").val('');
-        z.ui.input("[name='createReqVO$cardid']").setValue('');
-        z.ui.input("[name='createReqVO$mobilePhone']").setValue('');
-        z.ui.select("[name='createReqVO$sex']").setValue('');
-        z.ui.select("[name='createReqVO$nation']").setValue('');
-        z.ui.laydate("[name='createReqVO$birthday']").setValue('');
-        z.ui.select("[name='createReqVO$hyzk']").setValue('');
-        z.ui.select("[name='createReqVO$hkxz']").setValue('');
-        z.ui.select("[name='createReqVO$zzmm']").setValue('');
-        z.ui.input("[name='createReqVO$hkszd']").setValue('');
-        z.ui.input("[name='createReqVO$xjzdz']").setValue('');
-        z.ui.select("[name='createReqVO$drzw']").setValue('');
-        z.ui.select("[name='createReqVO$sfytd']").setValue('');
-        z.ui.laydate("[name='createReqVO$cjgzsj']").setValue('');
-        z.ui.input("[name='createReqVO$khyh']").setValue('');
-        z.ui.input("[name='createReqVO$yhzh']").setValue('');
-        z.ui.input("[name='createReqVO$byxx']").setValue('');
-        z.ui.laydate("[name='createReqVO$bysj']").setValue('');
-        z.ui.input("[name='createReqVO$major']").setValue('');
-        z.ui.select("[name='createReqVO$zgxl']").setValue('');
-        // z.ui.input("[name='createReqVO$jjlxrxm']").setValue('');
-        // z.ui.input("[name='createReqVO$jjlxrhm']").setValue('');
-        // z.ui.select("[name='createReqVO$jjlxrgx']").setValue('');
-
-        z.ui.selecttree("[name='qdgs']").setValue('')
-        $("[name='createReqVO$qdgsid']").val('');
-        $("[name='createReqVO$qdgs']").val('');
-
-        z.ui.selecttree("[name='deptName']").setValue('')
-        $("[name='createReqVO$deptName']").val('');
-        $("[name='createReqVO$deptId']").val('');
-
-        z.ui.selecttree("[name='zdr']").setValue('')
-        $("[name='createReqVO$zdr']").val('');
-        $("[name='createReqVO$zdrmc']").val('');
-    }
-
-
     function setValue(staff) {
         $("[name='createReqVO$userId']").val(staff.userId);
         z.ui.input("[name='createReqVO$cardid']").setValue(staff.cardid);
@@ -435,9 +416,6 @@
         z.ui.laydate("[name='createReqVO$bysj']").setValue(moment(staff.bysj).format('YYYY-MM-DD'));
         z.ui.input("[name='createReqVO$major']").setValue(staff.major);
         z.ui.select("[name='createReqVO$zgxl']").setValue(staff.zgxl + "");
-        // z.ui.input("[name='createReqVO$jjlxrxm']").setValue(staff.jjlxrxm);
-        // z.ui.input("[name='createReqVO$jjlxrhm']").setValue(staff.jjlxrhm);
-        // z.ui.select("[name='createReqVO$jjlxrgx']").setValue(staff.jjlxrgx + "");
 
         z.ui.selecttree("[name='qdgs']").setValue(staff.qdgsid)
         $("[name='createReqVO$qdgsid']").val(staff.qdgsid);
@@ -447,6 +425,7 @@
         z.ui.selecttree("[name='zdr']").setValue(staff.zdr)
         $("[name='createReqVO$zdr']").val(staff.zdr);
         $("[name='createReqVO$zdrmc']").val(staff.zdrmc);
+
     }
 
     function selectSYQ(cardId, callback) {