Merge remote-tracking branch 'origin/master'

h5app/src/components/postSelection.vue

@@ -211,6 +211,7 @@ export default defineComponent({
           const twoInfo = professionLevelList.value.find((x: any) => x.professionLevel == "2" && x.professionID == threeInfo.parentProfessionID);
           const oneInfo = professionLevelList.value.find((x: any) => x.professionLevel == "1" && x.professionID == twoInfo.parentProfessionID);
 
+          selectModelList[selectType.one].isSelect = false;
           selectModelList[selectType.one].disabled = false;
           selectModelList[selectType.one].professionName = oneInfo.professionName;
           selectModelList[selectType.one].professionID = oneInfo.professionID;
@@ -221,6 +222,7 @@ export default defineComponent({
               }));
           selectModelList[selectType.one].professionList.find((x: any) => x.professionID == oneInfo.professionID).isSelect = true;
 
+          selectModelList[selectType.two].isSelect = false;
           selectModelList[selectType.two].disabled = false;
           selectModelList[selectType.two].professionName = twoInfo.professionName;
           selectModelList[selectType.two].professionID = twoInfo.professionID;

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

@@ -130,7 +130,7 @@
               <div>
                 <ion-radio v-model:checked="isLongDate" justify="start" labelPlacement="end"
                            @click="changeLongDate" style="height:30px;">至长期</ion-radio>
-                <ion-datetime-button datetime="validDate" style="position:relative;right:110px;"></ion-datetime-button>
+                <ion-datetime-button datetime="validDate" style="position:relative;right:105px;"></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="validDate" name="validDate"
                                 v-model="dataModel.validDate"  :prefer-wheel="true"  @ionChange="changeValidDate"
@@ -143,7 +143,7 @@
 
             <div class="form-input">
               <ion-label>成立日期</ion-label>
-                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:115px;" ></ion-datetime-button>
+                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:110px;" ></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="establishmentTime" name="establishmentTime"
                                 v-model="dataModel.establishmentTime"  :prefer-wheel="true"

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

@@ -207,6 +207,7 @@ import {required} from "@vuelidate/validators";
 import {getSysDictionaryList} from "@/api/system/dictionary";
 import dayjs from "dayjs";
 import PostSelection from "@/components/postSelection.vue";
+import {useUserStore} from "@/store/modules/user";
 
 export default defineComponent({
   name: 'PostEdit',
@@ -220,6 +221,7 @@ export default defineComponent({
     const formState = reactive({
       dataModel: {
         companyID:null,
+        loginUserID:'',
         professionName:null,
         professionID:null,
         postName:null,
@@ -329,9 +331,11 @@ export default defineComponent({
       await getCultureRankList();
       await getWorkNationList();
       await getPostTagList();
+      const loginUserInfo = useUserStore().getUserInfo;
       const reqData = await getPostByID(postID);
       formState.dataModel = reqData;
       formState.dataModel.companyID = companyID;
+      formState.dataModel.loginUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       if(formState.dataModel.welfare == null){
         formState.dataModel.welfare = formState.dataModel.bonus;
       }

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

@@ -127,7 +127,7 @@
               <div>
                 <ion-radio v-model:checked="isLongDate" justify="start" labelPlacement="end"
                            @click="changeLongDate" style="height:30px;">至长期</ion-radio>
-                <ion-datetime-button datetime="validDate" style="position:relative;right:110px;"></ion-datetime-button>
+                <ion-datetime-button datetime="validDate" style="position:relative;right:105px;"></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="validDate" name="validDate" placeholder="营业执照有效期"
                                 v-model="dataModel.validDate"  :prefer-wheel="true"  @ionChange="changeValidDate"
@@ -141,7 +141,7 @@
             <div class="form-input">
               <ion-label>成立日期</ion-label>
               <div>
-                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:115px;"></ion-datetime-button>
+                <ion-datetime-button datetime="establishmentTime" style="position:relative;right:110px;"></ion-datetime-button>
                 <ion-modal :keep-contents-mounted="true" >
                   <ion-datetime id="establishmentTime" name="establishmentTime"
                                 v-model="dataModel.establishmentTime"  :prefer-wheel="true"

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

@@ -32,16 +32,6 @@
         <div class="bw-vue-form">
         <ion-list>
           <div class="form-title">求职意向</div>
-          <div class="form-select">
-            <ion-label>求职类型<span class="danger">*</span></ion-label>
-              <ion-select name="jobHuntType"  id="jobHuntType" okText="确定" cancelText="取消" v-model="dataModel.jobHuntType"
-                          interface="action-sheet" placeholder="请选择求职类型" style="width:100%;text-align: left;">
-                <ion-select-option v-for=" (it,key) in jobHuntTypeList" :key="key" :value="it.value">
-                  {{ 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>
             <div>
@@ -54,6 +44,16 @@
             </div>
             <!--            <ion-note slot="error">请选择求职岗位</ion-note>-->
           </div>
+          <div class="form-select">
+            <ion-label>求职类型<span class="danger">*</span></ion-label>
+              <ion-select name="jobHuntType"  id="jobHuntType" okText="确定" cancelText="取消" v-model="dataModel.jobHuntType"
+                          interface="action-sheet" placeholder="请选择求职类型" style="width:100%;text-align: left;">
+                <ion-select-option v-for=" (it,key) in jobHuntTypeList" :key="key" :value="it.value">
+                  {{ it.name }}
+                </ion-select-option>
+              </ion-select>
+<!--              <ion-note slot="error">求职类型不能为空</ion-note>-->
+          </div>
           <div class="form-select">
             <ion-label>人才类型<span class="danger">*</span></ion-label>
               <ion-select name="jobUserType"  id="jobUserType" okText="确定" cancelText="取消" v-model="dataModel.jobUserType"

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

@@ -421,7 +421,9 @@ export default defineComponent({
       const reqData = await getPostByID(postID);
       formState.dataModel = reqData;
       formState.dataModel.companyID = companyID;
-      formState.dataModel.welfare = formState.dataModel.bonus;
+      if(formState.dataModel.welfare == null){
+        formState.dataModel.welfare = formState.dataModel.bonus;
+      }
       console.log("初始化岗位信息",formState.dataModel);
     };
 

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

@@ -478,8 +478,6 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
-    const loginUserInfo = useUserStore().getUserInfo;
-    const curUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
     const isAllowCommit = ref(true);
     const expand = ref<boolean>(false);
     const loading = ref(true);
@@ -516,6 +514,7 @@ export default defineComponent({
     const baseInfoData = reactive({
       baseData:{
         jobUserID:null,
+        loginUserID:'',
         siteID:null,
         name:null,
         identityNumber: null,
@@ -573,9 +572,6 @@ export default defineComponent({
     });
     const baseDataValid = useVuelidate(baseDataRule,baseInfoData);
 
-    const expandChange= ()=>{
-      expand.value = !expand.value;
-    }
     // 删除警告弹窗开关
     const delAlertOpen = ref(false);
 
@@ -802,10 +798,13 @@ export default defineComponent({
       pageParams.jobUserID = jobUserID;
       baseInfoData.baseData.jobUserID = jobUserID;
       curStepData.value.statusVal = status;
+      const loginUserInfo = useUserStore().getUserInfo;
+      const curUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       //console.log("当前jobUserID",jobUserID);
       if(curStepData.value.statusVal==1){
         const reqData = await getJobUserById(jobUserID,curUserID);
         baseInfoData.baseData = reqData;
+        baseInfoData.baseData.loginUserID = curUserID;
         //console.log('baseData',baseInfoData.baseData);
         await getStreetList();
       }
@@ -887,7 +886,6 @@ export default defineComponent({
       infoAlertOpen,
       delLoading,
       infoAlterData,
-      expandChange,
       provinceChange,
       regionChange,
       onSetOccupationalID,

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

@@ -32,16 +32,6 @@
         <div class="bw-vue-form">
         <ion-list>
           <div class="form-title">求职意向</div>
-          <div class="form-select">
-            <ion-label>求职类型<span class="danger">*</span></ion-label>
-              <ion-select name="jobHuntType"  id="jobHuntType" okText="确定" cancelText="取消" v-model="dataModel.jobHuntType"
-                          interface="action-sheet" placeholder="请选择求职类型" style="width:100%;text-align: left;">
-                <ion-select-option v-for=" (it,key) in jobHuntTypeList" :key="key" :value="it.value">
-                  {{ 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>
             <div>
@@ -54,6 +44,16 @@
             </div>
             <!--            <ion-note slot="error">请选择求职岗位</ion-note>-->
           </div>
+          <div class="form-select">
+            <ion-label>求职类型<span class="danger">*</span></ion-label>
+              <ion-select name="jobHuntType"  id="jobHuntType" okText="确定" cancelText="取消" v-model="dataModel.jobHuntType"
+                          interface="action-sheet" placeholder="请选择求职类型" style="width:100%;text-align: left;">
+                <ion-select-option v-for=" (it,key) in jobHuntTypeList" :key="key" :value="it.value">
+                  {{ it.name }}
+                </ion-select-option>
+              </ion-select>
+<!--              <ion-note slot="error">求职类型不能为空</ion-note>-->
+          </div>
           <div class="form-select">
             <ion-label>人才类型<span class="danger">*</span></ion-label>
               <ion-select name="jobUserType"  id="jobUserType" okText="确定" cancelText="取消" v-model="dataModel.jobUserType"
@@ -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 {useUserStore} from "@/store/modules/user";
 
 interface huntModel {
   dataModel: any;
@@ -180,6 +181,7 @@ export default defineComponent({
     const workYearTypeList = ref<SelectProps[]>([]);
     const jobHuntData = reactive<huntModel>({dataModel:{
         jobUserID:null,
+        loginUserID:'',
         jobHuntType:null,
         jobUserType:null,
         professionID:null,
@@ -296,10 +298,12 @@ export default defineComponent({
       await getJobHuntTypeList();
       await getJobUserTypeList();
       await getWorkYearTypeList();
+      const loginUserInfo = useUserStore().getUserInfo;
       const reqData = await getJobHuntByID(jobHuntID);
       curStepData.value.statusVal = status;
       jobHuntData.dataModel = reqData;
       jobHuntData.dataModel.jobUserID = jobUserID;
+      jobHuntData.dataModel.loginUserID = loginUserInfo.userID == undefined?"":loginUserInfo.userID;
       console.log("初始化求职意向 ",jobHuntData.dataModel);
       loading.value = false;
     };

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

@@ -30,7 +30,7 @@
           <div class="form-input">
             <ion-label>岗位名称<span class="danger">*</span></ion-label>
             <ion-item :class="[v$.dataModel.professionName.$error?'ion-invalid':'ion-valid']">
-              <ion-input placeholder="请选择岗位" label-placement="stacked" :clear-input="true"
+              <ion-input readonly placeholder="请选择岗位" label-placement="stacked" :clear-input="true"
                          v-model="dataModel.professionName" class="custom">
               </ion-input>
 <!--              <picker :ProfessionID="dataModel.professionID" aria-disabled="false"  @SetProfessionID="onSetProfessionID"></picker>-->

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/EducationServiceImpl.java

@@ -67,8 +67,6 @@ public class EducationServiceImpl implements EducationService {
             dbData.setCollegeDirection(data.getCollegeDirection());
             dbData.setMajor(data.getMajor());
             dbData.setIntroduce(data.getIntroduce());
-            dbData.setCreateTime(new Date());
-            dbData.setCreateUserID(userId);
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
             result = pcEducationMapper.updateByPrimaryKey(dbData);