app-bug调整

h5app/src/views/pages/company/editPost.vue

@@ -354,8 +354,8 @@ export default defineComponent({
       let errorMessage = "";
       let hasMinSalary = false;
       let hasTrailMinSalary = false;
-      let curMinSalary = 0;
-      let curTrailMinSalary = 0;
+      let curMinSalary = 0.0;
+      let curTrailMinSalary = 0.0;
       if(dayjs(formState.dataModel.startTime).isAfter(dayjs(formState.dataModel.endTime))){
         errorMessage +="招聘结束日期不能早于开始日期！";
         isCommit.value = false;
@@ -368,7 +368,7 @@ export default defineComponent({
       }
       if (formState.dataModel.minSalary!=null) {
         hasMinSalary = true;
-        curMinSalary = formState.dataModel.minSalary;
+        curMinSalary = parseFloat(formState.dataModel.minSalary);
         if(formState.dataModel.minSalary<0){
           errorMessage +="岗位最低月薪不能小于0！";
           isCommit.value = false;
@@ -376,7 +376,7 @@ export default defineComponent({
       }
       if (formState.dataModel.trailMinSalary!=null) {
         hasTrailMinSalary = true;
-        curTrailMinSalary = formState.dataModel.trailMinSalary;
+        curTrailMinSalary = parseFloat(formState.dataModel.trailMinSalary);
         if(formState.dataModel.trailMinSalary<0){
           errorMessage +="试用期最低月薪不能小于0！";
           isCommit.value = false;
@@ -388,7 +388,7 @@ export default defineComponent({
           isCommit.value = false;
         }
         if(hasMinSalary){
-          if(formState.dataModel.maxSalary < curMinSalary){
+          if(parseFloat(formState.dataModel.maxSalary) < curMinSalary){
             errorMessage +="岗位最高月薪不能小于岗位最低月薪！";
             isCommit.value = false;
           }
@@ -400,7 +400,7 @@ export default defineComponent({
           isCommit.value = false;
         }
         if(hasTrailMinSalary){
-          if(formState.dataModel.trailMaxSalary < curTrailMinSalary){
+          if(parseFloat(formState.dataModel.trailMaxSalary) < curTrailMinSalary){
             errorMessage +="试用期最高月薪不能小于试用期最低月薪！";
             isCommit.value = false;
           }

h5app/src/views/pages/jobUserInfo/educationEdit.vue

@@ -180,7 +180,7 @@ export default defineComponent({
     }
 
     const getCultureRankList = async function(){
-      const data :any = await getSysDictionaryList("CultureLevel");
+      const data :any = await getSysDictionaryList("HighestDegree");
       cultureRankList.value = data;
     }
 

h5app/src/views/pages/jobUserInfo/jobHuntEdit.vue

@@ -78,21 +78,21 @@
             </div>
           </div>
           <div style="overflow: hidden;width:100%;"></div>
-          <div class="form-select">
+          <div class="form-input">
             <ion-label>工作年限<span class="danger">*</span></ion-label>
-            <ion-select name="workYear"  id="workYear" okText="确定" cancelText="取消" v-model="dataModel.workYear"
-                          interface="action-sheet" placeholder="请选择工作年限"  style="width:100%;text-align: left;">
-                <ion-select-option v-for=" (it,key) in workYearTypeList" :key="key" :value="it.value">
-                  {{ it.name }}
-                </ion-select-option>
-              </ion-select>
-<!--              <ion-note slot="error">工作年限不能为空</ion-note>-->
+            <ion-input name="workYear" id="workYear" style="text-align: left;" class="custom"
+                       placeholder="请输入工作年限" v-model="dataModel.workYear" ></ion-input>
+            <!--              <ion-note slot="error">工作年限不能为空</ion-note>-->
           </div>
-          <div class="form-input">
+          <div class="form-select">
             <ion-label>期望工作地区<span class="danger">*</span></ion-label>
-            <ion-input name="areaWork" id="areaWork" style="text-align: left;" class="custom"
-                       placeholder="请输入期望工作地区" v-model="dataModel.areaWork" ></ion-input>
-<!--              <ion-note slot="error">期望工作地区不能为空</ion-note>-->
+            <ion-select name="areaWork"  id="areaWork" okText="确定" cancelText="取消" v-model="dataModel.areaWork"
+                        interface="action-sheet" placeholder="请选择期望工作地区"  style="width:100%;text-align: left;">
+              <ion-select-option v-for=" (it,key) in workAreaList" :key="key" :value="it.name">
+                {{ it.name }}
+              </ion-select-option>
+            </ion-select>
+            <!--              <ion-note slot="error">期望工作地区不能为空</ion-note>-->
           </div>
           <div class="form-input">
             <ion-label>可到职日期<span class="danger">*</span></ion-label>
@@ -138,6 +138,7 @@ import {getSysDictionaryList} from '@/api/system/dictionary';
 import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
 import PostSelection from "@/components/postSelection.vue";
+import {get} from "@/api/common";
 
 interface huntModel {
   dataModel: any;
@@ -178,6 +179,7 @@ export default defineComponent({
     const jobHuntTypeList = ref<SelectProps[]>([]);
     const jobUserTypeList = ref<SelectProps[]>([]);
     const workYearTypeList = ref<SelectProps[]>([]);
+    const workAreaList = ref([]);
     const jobHuntData = reactive<huntModel>({dataModel:{
         jobUserID:null,
         jobHuntType:null,
@@ -234,6 +236,10 @@ export default defineComponent({
       const data :any = await getSysDictionaryList("WorkYearType");
       workYearTypeList.value = data;
     }
+    const getWorkAreaList = async function(){
+      const result :any = await get('system/area/getCityList',{});
+      workAreaList.value = result;
+    }
 
     const onSetProfessionID = (data: any)=>{
       jobHuntData.dataModel.professionID = data.value;
@@ -242,23 +248,29 @@ export default defineComponent({
     const ifInputAllValid = ()=>{
       let errorMessage = "";
       let hasMinSalary = false;
-      let curMinSalary = 0;
+      let curMinSalary = 0.0;
+      if (jobHuntData.dataModel.workYear!=null) {
+        if(jobHuntData.dataModel.workYear<0){
+          errorMessage +="工作年限不能小于0！";
+          isCommit.value = false;
+        }
+      }
       if (jobHuntData.dataModel.minSalary!=null) {
         hasMinSalary = true;
-        curMinSalary = jobHuntData.dataModel.minSalary;
+        curMinSalary = parseFloat(jobHuntData.dataModel.minSalary);
         if(jobHuntData.dataModel.minSalary<0){
-          errorMessage +="最低期望月薪不能小于0！";
+          errorMessage +="最低月薪要求不能小于0！";
           isCommit.value = false;
         }
       }
       if (jobHuntData.dataModel.maxSalary!=null) {
         if(jobHuntData.dataModel.maxSalary<0){
-          errorMessage +="最高期望月薪不能小于0！";
+          errorMessage +="最高月薪要求不能小于0！";
           isCommit.value = false;
         }
         if(hasMinSalary){
-          if(jobHuntData.dataModel.maxSalary < curMinSalary){
-            errorMessage +="最高期望月薪不能小于最低期望月薪！";
+          if(parseFloat(jobHuntData.dataModel.maxSalary) < curMinSalary){
+            errorMessage +="最高月薪要求不能小于最低月薪要求！";
             isCommit.value = false;
           }
         }
@@ -297,6 +309,7 @@ export default defineComponent({
       await getJobHuntTypeList();
       await getJobUserTypeList();
       await getWorkYearTypeList();
+      await getWorkAreaList();
       const reqData = await getJobHuntByID(jobHuntID);
       curStepData.value.statusVal = status;
       curStepData.value.loginUserID = userID;
@@ -326,6 +339,7 @@ export default defineComponent({
       jobUserTypeList,
       jobHuntTypeList,
       workYearTypeList,
+      workAreaList,
       setOpen,
       onSetProfessionID,
       onSave,

h5app/src/views/pages/jobUserInfo/postEdit.vue

@@ -294,21 +294,21 @@ export default defineComponent({
       let errorMessage = "";
       let hasMinSalary = false;
       let hasTrailMinSalary = false;
-      let curMinSalary = 0;
-      let curTrailMinSalary = 0;
+      let curMinSalary = 0.0;
+      let curTrailMinSalary = 0.0;
       if(dayjs(formState.dataModel.startTime).isAfter(dayjs(formState.dataModel.endTime))){
         errorMessage +="招聘结束日期不能早于开始日期！";
         isCommit.value = false;
       }
       if(formState.dataModel.recruitCount !=null){
         if(formState.dataModel.recruitCount<0){
-          errorMessage +="招聘数量不能小于0！<br/>";
+          errorMessage +="招聘数量不能小于0！";
           isCommit.value = false;
         }
       }
       if (formState.dataModel.minSalary!=null) {
         hasMinSalary = true;
-        curMinSalary = formState.dataModel.minSalary;
+        curMinSalary = parseFloat(formState.dataModel.minSalary);
         if(formState.dataModel.minSalary<0){
           errorMessage +="岗位最低月薪不能小于0！";
           isCommit.value = false;
@@ -316,7 +316,7 @@ export default defineComponent({
       }
       if (formState.dataModel.trailMinSalary!=null) {
         hasTrailMinSalary = true;
-        curTrailMinSalary = formState.dataModel.trailMinSalary;
+        curTrailMinSalary = parseFloat(formState.dataModel.trailMinSalary);
         if(formState.dataModel.trailMinSalary<0){
           errorMessage +="试用期最低月薪不能小于0！";
           isCommit.value = false;
@@ -328,7 +328,7 @@ export default defineComponent({
           isCommit.value = false;
         }
         if(hasMinSalary){
-          if(formState.dataModel.maxSalary < curMinSalary){
+          if(parseFloat(formState.dataModel.maxSalary) < curMinSalary){
             errorMessage +="岗位最高月薪不能小于岗位最低月薪！";
             isCommit.value = false;
           }
@@ -340,7 +340,7 @@ export default defineComponent({
           isCommit.value = false;
         }
         if(hasTrailMinSalary){
-          if(formState.dataModel.trailMaxSalary < curTrailMinSalary){
+          if(parseFloat(formState.dataModel.trailMaxSalary) < curTrailMinSalary){
             errorMessage +="试用期最高月薪不能小于试用期最低月薪！";
             isCommit.value = false;
           }

h5app/src/views/pages/jobUserInfo/userEdit.vue

@@ -41,7 +41,7 @@
             </div>
             <div class="form-select">
               <ion-label>性别<span class="danger">*</span></ion-label>
-              <ion-select name="sex" id="sex" okText="确定" cancelText="取消" v-model="baseData.sex"
+              <ion-select disabled name="sex" id="sex" okText="确定" cancelText="取消" v-model="baseData.sex"
                           interface="action-sheet"  placeholder="请选择性别" style="width:100%;text-align:left;" >
                 <ion-select-option v-for=" (it,key) in genderList" :key="key"  :value="it.value" >{{ it.name }}</ion-select-option>
               </ion-select>
@@ -212,7 +212,7 @@
               <!--          </div>-->
               <div class="form-select" >
                 <ion-label>出生日期</ion-label>
-                <ion-datetime-button datetime="birthDay" style="position:absolute;left:10px;"></ion-datetime-button>
+                <ion-datetime-button disabled datetime="birthDay" style="position:absolute;left:10px;"></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true">
                   <ion-datetime name="birthDay" id="birthDay" placeholder="日期"
                                 v-model="baseData.birthDay"  :prefer-wheel="true"
@@ -249,15 +249,15 @@
                   </ion-select-option>
                 </ion-select>
               </div>
-              <div class="form-select">
-                <ion-label>血型</ion-label>
-                <ion-select name="bloodTypeID"  id="bloodTypeID" okText="确定" cancelText="取消" v-model="baseData.bloodTypeID"
-                            interface="action-sheet" placeholder="请选择血型" style="width:100%;text-align:left;">
-                  <ion-select-option v-for=" (it,key) in bloodTypeList" :key="key" :value="it.value">
-                    {{ it.name }}
-                  </ion-select-option>
-                </ion-select>
-              </div>
+<!--              <div class="form-select">-->
+<!--                <ion-label>血型</ion-label>-->
+<!--                <ion-select name="bloodTypeID"  id="bloodTypeID" okText="确定" cancelText="取消" v-model="baseData.bloodTypeID"-->
+<!--                            interface="action-sheet" placeholder="请选择血型" style="width:100%;text-align:left;">-->
+<!--                  <ion-select-option v-for=" (it,key) in bloodTypeList" :key="key" :value="it.value">-->
+<!--                    {{ it.name }}-->
+<!--                  </ion-select-option>-->
+<!--                </ion-select>-->
+<!--              </div>-->
               <div class="form-input">
                 <ion-label>身高(cm)</ion-label>
                 <ion-input name="height" id="height"  style="text-align: left;"  class="custom" :clear-input="true"
@@ -266,7 +266,7 @@
               <div class="form-input">
                 <ion-label>视力</ion-label>
                 <ion-input name="vision" id="vision"  style="text-align: left;" class="custom" :clear-input="true"
-                           placeholder="如1.0" v-model="baseData.vision" ></ion-input>
+                           placeholder="如5.0" v-model="baseData.vision" ></ion-input>
               </div>
               <div class="form-input">
                 <ion-label>体重(kg)</ion-label>
@@ -517,18 +517,18 @@ export default defineComponent({
         siteID:null,
         name:null,
         identityNumber: null,
-        sex: null,
+        sex: 1,
         userMobile: null,
         address: null,
         jobStatusID: null,
         keyPersonTypeID: null,
         politicsStatusID:null,
         birthPlace:null,
-        birthDay:null,
+        birthDay:dayjs().format("YYYY-MM-DD"),
         familyNatureID:null,
         cultureRank:null,
         healthID:null,
-        boolTypeID:null,
+        //bloodTypeID:null,
         height:null,
         vision:null,
         weight:null,
@@ -840,6 +840,18 @@ export default defineComponent({
       }
     });
 
+    watch(() => baseInfoData.baseData.identityNumber, () => {
+      if(baseInfoData.baseData.identityNumber != null && String(baseInfoData.baseData.identityNumber).length == 18){
+        const identReg = /^[1-9]{1}[0-9]{14}$|^[1-9]{1}[0-9]{16}([0-9]|[xX])$/;
+        if(identReg.test(baseInfoData.baseData.identityNumber)){
+          const birthDayStr = String(baseInfoData.baseData.identityNumber).substring(6,14);
+          const sexStr = String(baseInfoData.baseData.identityNumber).substring(16,17);
+          baseInfoData.baseData.sex = parseInt(sexStr)%2 == 0 ? 2 : 1; //双女单男
+          baseInfoData.baseData.birthDay = dayjs(birthDayStr).format("YYYY-MM-DD");
+        }
+      }
+    });
+
     const reload = (jobUserID:any,status:any,userId:any,openId:any) => {
       pageParams.pageIndex = 1;
       expand.value = false;
@@ -921,6 +933,7 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
+ion-select#sex.md.select-disabled.legacy-select::after{display: none;}
 ion-select#siteID.md.select-disabled.legacy-select::after{display: none;}
 ion-select#regionCode.md.select-disabled.legacy-select::after{display: none;}
 .custom{

h5app/src/views/pages/jobhunt/edit.vue

@@ -41,9 +41,11 @@
             </div>
             <div class="form-select">
               <ion-label>性别<span class="danger">*</span></ion-label>
-              <ion-select name="sex" id="sex" okText="确定" cancelText="取消" v-model="baseData.sex"
+              <ion-select disabled name="sex" id="sex" okText="确定" cancelText="取消" v-model="baseData.sex"
                           interface="action-sheet"  placeholder="请选择性别" style="width:100%;text-align:left;" >
-                <ion-select-option v-for=" (it,key) in genderList" :key="key"  :value="it.value" >{{ it.name }}</ion-select-option>
+                <ion-select-option v-for=" (it,key) in genderList" :key="key"  :value="it.value" >
+                  {{ it.name }}
+                </ion-select-option>
               </ion-select>
 <!--              <ion-note slot="error">性别不能为空</ion-note>-->
             </div>
@@ -209,7 +211,7 @@
 <!--          </div>-->
           <div class="form-select" >
             <ion-label>出生日期</ion-label>
-            <ion-datetime-button datetime="birthDay" style="position:absolute;left:10px;"></ion-datetime-button>
+            <ion-datetime-button disabled datetime="birthDay" style="position:absolute;left:10px;"></ion-datetime-button>
             <ion-modal :keep-contents-mounted="true">
               <ion-datetime name="birthDay" id="birthDay" placeholder="日期"
                             v-model="baseData.birthDay"  :prefer-wheel="true"
@@ -246,15 +248,15 @@
               </ion-select-option>
             </ion-select>
           </div>
-          <div class="form-select">
-            <ion-label>血型</ion-label>
-            <ion-select name="bloodTypeID"  id="bloodTypeID" okText="确定" cancelText="取消" v-model="baseData.bloodTypeID"
-                        interface="action-sheet" placeholder="请选择血型" style="width:100%;text-align:left;">
-              <ion-select-option v-for=" (it,key) in bloodTypeList" :key="key" :value="it.value">
-                {{ it.name }}
-              </ion-select-option>
-            </ion-select>
-          </div>
+<!--          <div class="form-select">-->
+<!--            <ion-label>血型</ion-label>-->
+<!--            <ion-select name="bloodTypeID"  id="bloodTypeID" okText="确定" cancelText="取消" v-model="baseData.bloodTypeID"-->
+<!--                        interface="action-sheet" placeholder="请选择血型" style="width:100%;text-align:left;">-->
+<!--              <ion-select-option v-for=" (it,key) in bloodTypeList" :key="key" :value="it.value">-->
+<!--                {{ it.name }}-->
+<!--              </ion-select-option>-->
+<!--            </ion-select>-->
+<!--          </div>-->
           <div class="form-input">
             <ion-label>身高(cm)</ion-label>
             <ion-input name="height" id="height"  style="text-align: left;"  class="custom" :clear-input="true"
@@ -263,7 +265,7 @@
           <div class="form-input">
             <ion-label>视力</ion-label>
             <ion-input name="vision" id="vision"  style="text-align: left;" class="custom" :clear-input="true"
-                       placeholder="如1.0" v-model="baseData.vision" ></ion-input>
+                       placeholder="如5.0" v-model="baseData.vision" ></ion-input>
           </div>
           <div class="form-input">
             <ion-label>体重(kg)</ion-label>
@@ -518,18 +520,18 @@ export default defineComponent({
         siteID:null,
         name:null,
         identityNumber: null,
-        sex: null,
+        sex: 1,
         userMobile: null,
         address: null,
         jobStatusID: null,
         keyPersonTypeID: null,
         politicsStatusID:null,
         birthPlace:null,
-        birthDay:null,
+        birthDay:dayjs().format("YYYY-MM-DD"),
         familyNatureID:null,
         cultureRank:null,
         healthID:null,
-        boolTypeID:null,
+        //bloodTypeID:null,
         height:null,
         vision:null,
         weight:null,
@@ -835,6 +837,18 @@ export default defineComponent({
       }
     });
 
+    watch(() => baseInfoData.baseData.identityNumber, () => {
+      if(baseInfoData.baseData.identityNumber != null && String(baseInfoData.baseData.identityNumber).length == 18){
+        const identReg = /^[1-9]{1}[0-9]{14}$|^[1-9]{1}[0-9]{16}([0-9]|[xX])$/;
+        if(identReg.test(baseInfoData.baseData.identityNumber)){
+          const birthDayStr = String(baseInfoData.baseData.identityNumber).substring(6,14);
+          const sexStr = String(baseInfoData.baseData.identityNumber).substring(16,17);
+          baseInfoData.baseData.sex = parseInt(sexStr)%2 == 0 ? 2 : 1; //双女单男
+          baseInfoData.baseData.birthDay = dayjs(birthDayStr).format("YYYY-MM-DD");
+        }
+      }
+    });
+
     const reload = (jobUserID:any,status:any) => {
       pageParams.pageIndex = 1;
       expand.value = false;
@@ -915,6 +929,7 @@ export default defineComponent({
 });
 </script>
 <style lang="less">
+ion-select#sex.md.select-disabled.legacy-select::after{display: none;}
 ion-select#siteID.md.select-disabled.legacy-select::after{display: none;}
 ion-select#regionCode.md.select-disabled.legacy-select::after{display: none;}
 .custom{

h5app/src/views/pages/jobhunt/educationEdit.vue

@@ -179,7 +179,7 @@ export default defineComponent({
     }
 
     const getCultureRankList = async function(){
-      const data :any = await getSysDictionaryList("CultureLevel");
+      const data :any = await getSysDictionaryList("HighestDegree");
       cultureRankList.value = data;
     }
 

h5app/src/views/pages/jobhunt/jobHuntEdit.vue

@@ -78,20 +78,20 @@
             </div>
           </div>
           <div style="overflow: hidden;width:100%;"></div>
-          <div class="form-select">
+          <div class="form-input">
             <ion-label>工作年限<span class="danger">*</span></ion-label>
-            <ion-select name="workYear"  id="workYear" okText="确定" cancelText="取消" v-model="dataModel.workYear"
-                          interface="action-sheet" placeholder="请选择工作年限"  style="width:100%;text-align: left;">
-                <ion-select-option v-for=" (it,key) in workYearTypeList" :key="key" :value="it.value">
-                  {{ it.name }}
-                </ion-select-option>
-              </ion-select>
+            <ion-input name="workYear" id="workYear" style="text-align: left;" class="custom"
+                       placeholder="请输入工作年限" v-model="dataModel.workYear" ></ion-input>
 <!--              <ion-note slot="error">工作年限不能为空</ion-note>-->
           </div>
-          <div class="form-input">
+          <div class="form-select">
             <ion-label>期望工作地区<span class="danger">*</span></ion-label>
-            <ion-input name="areaWork" id="areaWork" style="text-align: left;" class="custom"
-                       placeholder="请输入期望工作地区" v-model="dataModel.areaWork" ></ion-input>
+            <ion-select name="areaWork"  id="areaWork" okText="确定" cancelText="取消" v-model="dataModel.areaWork"
+                        interface="action-sheet" placeholder="请选择期望工作地区"  style="width:100%;text-align: left;">
+              <ion-select-option v-for=" (it,key) in workAreaList" :key="key" :value="it.name">
+                {{ it.name }}
+              </ion-select-option>
+            </ion-select>
 <!--              <ion-note slot="error">期望工作地区不能为空</ion-note>-->
           </div>
           <div class="form-input">
@@ -139,6 +139,7 @@ import {alertController, onIonViewDidEnter} from "@ionic/vue";
 import dayjs from "dayjs";
 import PostSelection from "@/components/postSelection.vue";
 import {useUserStore} from "@/store/modules/user";
+import {get} from "@/api/common";
 
 interface huntModel {
   dataModel: any;
@@ -179,6 +180,8 @@ export default defineComponent({
     const jobHuntTypeList = ref<SelectProps[]>([]);
     const jobUserTypeList = ref<SelectProps[]>([]);
     const workYearTypeList = ref<SelectProps[]>([]);
+    const workAreaList = ref([]);
+
     const jobHuntData = reactive<huntModel>({dataModel:{
         jobUserID:null,
         loginUserID:'',
@@ -236,6 +239,10 @@ export default defineComponent({
       const data :any = await getSysDictionaryList("WorkYearType");
       workYearTypeList.value = data;
     }
+    const getWorkAreaList = async function(){
+      const result :any = await get('system/area/getCityList',{});
+      workAreaList.value = result;
+    }
 
     const onSetProfessionID = (data: any)=>{
       jobHuntData.dataModel.professionID = data.value;
@@ -245,23 +252,29 @@ export default defineComponent({
     const ifInputAllValid = ()=>{
       let errorMessage = "";
       let hasMinSalary = false;
-      let curMinSalary = 0;
+      let curMinSalary = 0.0;
+      if (jobHuntData.dataModel.workYear!=null) {
+        if(jobHuntData.dataModel.workYear<0){
+          errorMessage +="工作年限不能小于0！";
+          isCommit.value = false;
+        }
+      }
       if (jobHuntData.dataModel.minSalary!=null) {
         hasMinSalary = true;
-        curMinSalary = jobHuntData.dataModel.minSalary;
+        curMinSalary = parseFloat(jobHuntData.dataModel.minSalary);
         if(jobHuntData.dataModel.minSalary<0){
-          errorMessage +="最低期望月薪不能小于0！";
+          errorMessage +="最低月薪要求不能小于0！";
           isCommit.value = false;
         }
       }
       if (jobHuntData.dataModel.maxSalary!=null) {
         if(jobHuntData.dataModel.maxSalary<0){
-          errorMessage +="最高期望月薪不能小于0！";
+          errorMessage +="最高月薪要求不能小于0！";
           isCommit.value = false;
         }
         if(hasMinSalary){
-          if(jobHuntData.dataModel.maxSalary < curMinSalary){
-            errorMessage +="最高期望月薪不能小于最低期望月薪！";
+          if(parseFloat(jobHuntData.dataModel.maxSalary) < curMinSalary){
+            errorMessage +="最高月薪要求不能小于最低月薪要求！";
             isCommit.value = false;
           }
         }
@@ -298,6 +311,7 @@ export default defineComponent({
       await getJobHuntTypeList();
       await getJobUserTypeList();
       await getWorkYearTypeList();
+      await getWorkAreaList();
       const loginUserInfo = useUserStore().getUserInfo;
       const reqData = await getJobHuntByID(jobHuntID);
       curStepData.value.statusVal = status;
@@ -328,6 +342,7 @@ export default defineComponent({
       jobUserTypeList,
       jobHuntTypeList,
       workYearTypeList,
+      workAreaList,
       setOpen,
       onSetProfessionID,
       onSave,

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -68,7 +68,11 @@ public class JobUserController {
         if (data == null) {
             data = new JobUserVo();
             data.setJobUserID(UUID.randomUUID().toString());
+            data.setJobStatusID(3);
             data.setSocialSecurityCard("");
+            data.setNation(1);
+            data.setPoliticsStatusID(13);
+            data.setFamilyNatureID(13);
             PcSiteUserExample siteUserExp = new PcSiteUserExample();
             siteUserExp.or().andUserIDEqualTo(loginUserID);
             //siteUserExp.or().andUserIDEqualTo(accountService.getLoginUserID());