Merge branch 'master' of http://116.63.33.55/git/zlhbw

wxdks/src/main/resources/static/page/js/basic/recruitManage.js

@@ -85,7 +85,11 @@ layui.config({
 });
 
 function initRecruitPage(){
+    // 招聘若干
+   // somePeople()
+    // 薪资面议
    faceDes();
+
     $("#addRecruit").click(function () {
         $('#submit').attr('data-type', 'add');
         emptyForm();
@@ -127,7 +131,7 @@ function initRecruitPage(){
                     },
                 });
             }else {
-                layer.msg("请检查输入金额")
+                layer.msg("下限必填或金额输入不正确！")
             }
         } else if (submitType === 'edit') {
             if (salaryState) {
@@ -152,7 +156,7 @@ function initRecruitPage(){
                     },
                 });
             } else {
-                layer.msg("请检查输入金额")
+                layer.msg("下限必填或金额输入不正确")
             }
         }
         return false;
@@ -220,7 +224,16 @@ function initRecruitPage(){
     initRecruitSelects('work_experience', '工作经验', $('#workExperience'));
 }
 
-
+// function somePeople() {
+//     form.on('checkbox(somePeo)', function (){
+//         if ($(this).is(":checked")) {
+//             $('#recruitNum').val('');
+//             $('#recruitNum').attr("disabled", 'disabled');
+//         }else {
+//             $('#recruitNum').removeAttr("disabled");
+//         }
+//     })
+// }
 function faceDes() {
     form.on('checkbox(faceDes)', function (){
         if ($(this).is(":checked")) {
@@ -253,6 +266,8 @@ function checkSalary(minSalary, maxSalary) {
         }
     } else if (!minSalary && maxSalary) {
         return !state;
+    } else if (!minSalary){
+        return !state;
     }
     return state;
 }

wxdks/src/main/resources/static/page/recruitManage.html

@@ -200,14 +200,24 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label"><span class="font-red">*</span>招聘人数:</label>
+            <label class="layui-form-label">招聘人数:</label>
             <div class="layui-input-block">
-                <input type="text" name="recruitNum" id="recruitNum" maxlength="500"
-                       lay-verify="required" class="layui-input"
-                       onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" placeholder="请输入招聘人数"
+                <input type="text" name="recruitNum" id="recruitNum" maxlength="500" onkeyup="this.value=this.value.replace(/[^0-9]|^0/g,'')"
+                        class="layui-input" placeholder="请输入招聘人数(如不填默认人数为若干)"
                        autocomplete="off">
             </div>
         </div>
+<!--        <div class="layui-form-item">-->
+<!--            <label class="layui-form-label"><span class="font-red">*</span>招聘人数:</label>-->
+<!--            <div class="layui-input-block">-->
+<!--                <div class="layui-form-item layui-input-inline">-->
+<!--                    <input lay-verify="required" class="layui-input"  type="text" name="recruitNum" id="recruitNum"  value=""-->
+<!--                           onkeyup="this.value=this.value.replace(/[^0-9]/g,'')" placeholder="请输入招聘人数"-->
+<!--                           autocomplete="off">-->
+<!--                    <input type="checkBox" id="somePeo" name="somePeo" lay-filter="somePeo" value="" title="若干" />-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="layui-form-item layui-input-inline">
             <label class="layui-form-label">学历要求:</label>
             <div class="layui-input-block">
@@ -229,24 +239,14 @@
             <div class="layui-input-block">
                 <div class="layui-form-item layui-input-inline">
                     <input class="layui-input" type="text" lay-verify="minSalary" name="minSalary" id="minSalary" value=""
-                           onkeyup="this.value=this.value.replace(/[^0-9]/g,'')">
+                           onkeyup="this.value=this.value.replace(/[^0-9]|^0/g,'')">
                     <span class="job_xz_line">—</span>
                     <input class="layui-input" type="text" lay-verify="maxSalary" name="maxSalary" id="maxSalary" value=""
-                           onkeyup="this.value=this.value.replace(/[^0-9]/g,'')">
-<!--                    <span id="faceDes">面议</span>-->
+                           onkeyup="this.value=this.value.replace(/[^0-9]|^0/g,'')">
                     <input type="checkBox" id="faceDes" name="faceDes" lay-filter="faceDes" value="" title="面议" />
                 </div>
-<!--                <div> -->
-<!--                </div>-->
             </div>
         </div>
-<!--        <div class="layui-form-item layui-input-inline">-->
-<!--            <label class="layui-form-label"><span class="font-red">*</span>薪资范围:</label>-->
-<!--            <div class="layui-input-block">-->
-<!--                <select name="salary" lay-filter="salary" id="salary" lay-verify="required">-->
-<!--                </select>-->
-<!--            </div>-->
-<!--        </div>-->
         <div class="layui-form-item">
             <label class="layui-form-label"><span class="font-red">*</span>联系人:</label>
             <div class="layui-input-block">

wxdks/src/main/resources/static/zlhbw/jrwm/jrwm.html

@@ -102,7 +102,9 @@
                 </div>
 
                 <div class="xz-input">
-                    <input class="xinzi" type="text" name="qsxz" id="" value="" /> — <input class="xinzi" type="text" name="jsxz" id="" value="" />
+                    <input class="xinzi" type="text" name="qsxz" id="" value="" onkeyup="this.value=this.value.replace(/[^0-9]|^0/g,'')" />
+                    —
+                    <input class="xinzi" type="text" name="jsxz" id="" value="" onkeyup="this.value=this.value.replace(/[^0-9]|^0/g,'')" />
                 </div>
                 <button type="button" class="xzconfirm">确定</button>
             </div>

wxdks/src/main/resources/static/zlhbw/jrwm/jrwm.js

@@ -157,8 +157,8 @@ function initPageClick() {
 	$('.xzconfirm').on('click', function () {
 		var qsxz = $('input[name=qsxz]').val();
 		var jsxz = $('input[name=jsxz]').val();
-		condition.minSalary = qsxz.indexOf('k') != -1 ? parseInt((qsxz.split('K')[0])*1000) : qsxz;
-		condition.maxSalary = jsxz.indexOf('k') != -1 ? parseInt((jsxz.split('K')[0])*1000) : jsxz;
+		condition.minSalary = qsxz.search(/k|K/g) != -1 ? parseInt((qsxz.split(/k|K/g)[0])*1000) : qsxz;
+		condition.maxSalary = jsxz.search(/k|K/g) != -1 ? parseInt((jsxz.split(/k|K/g)[0])*1000) : jsxz;
 		console.log("minSalary:"+condition.minSalary);
 		console.log("maxSalary:"+condition.maxSalary);
 		getRecruitList();
@@ -177,10 +177,12 @@ function initPageClick() {
 function initPageEvent() {
 	form.on('select(nature-select)', function (event) {
 		condition.orgNature = event.value;
+		getRecruitList();
 	})
 
 	form.on('select(scale-select)', function (event) {
 		condition.scale = event.value;
+		getRecruitList();
 	})
 }
 
@@ -223,7 +225,7 @@ function getRecruitList() {
 								'<p class="zp-enterprise">' + obj.orgName + '</p>' +
 								'<div class="zp-second">' +
 									'<span class="zprs">' +
-										'招聘人数：' + obj.recruitNum + '人丨' +
+										'招聘人数：' + (obj.recruitNum ? obj.recruitNum + '人' : '若干') + '丨' +
 										'工作经验：' + (obj.workExp ? obj.workExp : '不限') + ' 丨 ' +
 										'学历：' + (obj.edu ? obj.edu : '不限') + ' 丨' +
 										'地点：' + (obj.address ? obj.address : '暂无') +

wxdks/src/main/resources/static/zlhbw/zpxq/zpxq.html

@@ -61,7 +61,7 @@
             <div class="current_location">当前位置：</div>
             <li class="crumb" onclick="window.open('../index.html','_self')">首页</li>
             <span class="icon_crumb">&gt;</span>
-            <li class="crumb" onclick="window.open('../jrwm/jrwm.html')">加入我们</li>
+            <li class="crumb" onclick="window.open('../jrwm/jrwm.html', '_self')">加入我们</li>
             <span class="icon_crumb">&gt;</span>
             <li class="crumb">详情</li>
         </ul>

wxdks/src/main/resources/static/zlhbw/zpxq/zpxq.js

@@ -55,3 +55,14 @@ function initPage() {
 function numberToChar(num) {
     return (num / 1000) + 'k';
 }
+
+// $(".crumbs .crumb").click(function(){
+//     const loctext = $(this).text();
+//     if(loctext == '首页'){
+//         window.location.href = PAGE_BASIC + "/zlhbw/index.html";
+//     }else if (loctext == '加入我们'){
+//         window.location.href = PAGE_BASIC + "/zlhbw/jrwm/jrwm.html";
+//     }else {
+//         location.reload();
+//     }
+// })