Merge branch 'jobFair' of https://git.citupro.com/zhengnaiwen_citu/menduner into jobFair

src/components/CtForm/index.vue

@@ -8,7 +8,7 @@
             <template v-if="item.slotTitle">
               <div :class="item.class" :style="item.slotTitleStyle">{{ item.slotTitle }}</div>
             </template>
-            <div class="d-flex mb-2" :class="item.flexStyle || 'flex-row'">
+            <div class="d-flex mb-2" :class="item.flexStyle || 'flex-row', item.appendClass">
               <!-- <span>{{ item.value }}</span> -->
               <textUI
                 v-if="['text', 'password', 'number', 'phoneNumber'].includes(item.type)"

src/views/recruit/enterprise/positionManagement/components/baseInfo.vue

@@ -2,7 +2,7 @@
   <div>
     <CtForm ref="formPageRef" :items="items" style="width: 650px;">
       <template #bizId="{ item }">
-        <div>
+        <div style="position: relative;">
           <v-checkbox-btn
             v-model="jobFairCheckbox"
             color="primary"
@@ -14,6 +14,11 @@
             hide-details
             @update:modelValue="v => jobFairCheckboxChange(v, item)"
           ></v-checkbox-btn>
+          <div class="bizTips">
+            <div>* 该职位如需加入到招聘会中，请勾选上方选项并选择要加入的【招聘会】</div>
+            <div>* 未选择【招聘会】将会作为普通职位发布收费！</div>
+            <!-- <div>* 未选择【招聘会】将会作为普通职位发布收费或扣除对应职位发布数！</div> -->
+          </div>
         </div>
       </template>
       <template #positionId="{ item }">
@@ -82,6 +87,7 @@ const items = ref({
   options: [
     {
       slotName: 'bizId',
+      appendClass: 'pb-8',
       type: 'autocomplete',
       key: 'bizId',
       value: null,
@@ -306,4 +312,12 @@ defineExpose({
   display: block;
   width: 120px;
 }
+.bizTips {
+  width: 650px;
+  position: absolute;
+  left: -460px;
+  color: var(--v-error-base);
+  margin-top: 8px;
+  font-size: 14px;
+}
 </style>

src/views/recruit/personal/PersonalCenter/resume/online/components/educationExp.vue

@@ -55,7 +55,7 @@ import { getDict } from '@/hooks/web/useDictionaries'
 import { timesTampChange } from '@/utils/date'
 import { saveResumeEduExp, getResumeEduExp, deleteResumeEduExp, schoolSearchByName, schoolMajorByName } from '@/api/recruit/personal/resume'
 import Confirm from '@/plugins/confirm'
-import { getText, dealCanBeInputtedSave, dealCanBeInputtedValueAndLabel } from '@/utils/getText'
+import { getText, dealCanBeInputtedSave, dealCanBeInputtedValueAndLabel, formatName } from '@/utils/getText'
 import { debounce } from 'lodash'
 import { nextTick, reactive, ref } from 'vue'
 const emit = defineEmits(['complete'])
@@ -242,8 +242,13 @@ const getData = async () => {
   // 完成度展示
   emit('complete', { status: Boolean(data?.length), id: 'educationExp' })
   dataList.value = data?.length ? data.map(e => {
-    if (e.schoolId) e.schoolId = e.schoolId.toString()
-    return e
+    return {
+      ...e,
+      schoolId: e.schoolId ? e.schoolId.toString() : null,
+      content: formatName(e.content),
+      major: formatName(e.major),
+      schoolName: formatName(e.schoolName),
+    }
   }) : []
 }
 getData()

src/views/recruit/personal/PersonalCenter/resume/online/components/selfEvaluation.vue

@@ -33,6 +33,8 @@ import { saveResumeAdvantage } from '@/api/recruit/personal/resume'
 import Snackbar from '@/plugins/snackbar'
 import { useUserStore } from '@/store/user'
 import DOMPurify from 'dompurify'
+import { formatName } from '@/utils/getText'
+
 const emit = defineEmits(['complete'])
 
 const isEdit = ref(false)
@@ -43,7 +45,7 @@ const useStore = useUserStore()
 const getData = async () => {
   await useStore.getUserBaseInfos(JSON.parse(localStorage.getItem('userInfo'))?.id)
   const baseInfo = JSON.parse(localStorage.getItem('baseInfo'))
-  advantage.value = baseInfo?.advantage || ''
+  advantage.value = formatName(baseInfo?.advantage || '')
   // 完成度展示
   emit('complete', { status: Boolean(advantage.value), id: 'selfEvaluation' })
 }

src/views/recruit/personal/PersonalCenter/resume/online/components/trainingExperience.vue

@@ -50,6 +50,7 @@ import { saveResumeTrainExp, getResumeTrainExp, deleteResumeTrainExp } from '@/a
 import CtForm from '@/components/CtForm'
 import Snackbar from '@/plugins/snackbar'
 import Confirm from '@/plugins/confirm'
+import { formatName } from '@/utils/getText'
 const emit = defineEmits(['complete'])
 
 const isEdit = ref(false)
@@ -157,7 +158,14 @@ const getResumeTrainExpData = async () => {
   const data = await getResumeTrainExp()
   // 完成度展示
   emit('complete', { status: Boolean(data?.length), id: 'trainingExperience' })
-  trainExp.value = data
+  trainExp.value = data?.length ? data.map(e => {
+    return {
+      ...e,
+      content: formatName(e.content),
+      course: formatName(e.course),
+      orgName: formatName(e.orgName),
+    }
+  }) : []
 }
 getResumeTrainExpData()
 

src/views/recruit/personal/PersonalCenter/resume/online/components/workExperience.vue

@@ -71,7 +71,7 @@ import { getDict } from '@/hooks/web/useDictionaries'
 import { timesTampChange } from '@/utils/date'
 import { saveResumeWorkExp, getResumeWorkExp, deleteResumeWorkExp, enterpriseSearchByName } from '@/api/recruit/personal/resume'
 import Confirm from '@/plugins/confirm'
-import { dealCanBeInputtedSave, dealCanBeInputtedValueAndLabel } from '@/utils/getText'
+import { dealCanBeInputtedSave, dealCanBeInputtedValueAndLabel, formatName } from '@/utils/getText'
 // import { debounce } from 'lodash'
 import { nextTick, reactive, ref } from 'vue'
 const emit = defineEmits(['complete'])
@@ -221,8 +221,13 @@ const getData = async () => {
   // 完成度展示
   emit('complete', { status: Boolean(data?.length), id: 'workExperience' })
   dataList.value = data?.length ? data.map(e => {
-    if (e.enterpriseId) e.enterpriseId = e.enterpriseId.toString()
-    return e
+    return {
+      ...e,
+      enterpriseId: e.enterpriseId ? e.enterpriseId.toString() : null,
+      content: formatName(e.content),
+      enterpriseName: formatName(e.enterpriseName),
+      positionName: formatName(e.positionName),
+    }
   }) : []
 }
 getData()