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

src/views/recruit/enterprise/entInfoSetting/informationSettingsComponents/basicInfo.vue

@@ -144,6 +144,7 @@ const formItems = ref({
       key: 'openTime',
       dateType: 'date', // 时间类型 year month date time
       value: null,
+      default: '2000-01-01',
       label: '开业时间',
       col: 6,
       flexStyle: 'mr-3',
@@ -218,6 +219,8 @@ const getBaseInfo = async () => {
     query.industryId = data.industryId
     if (item.key === 'industryId') {
       item.value = industryList.value.find(e => e.id === data[item.key])?.nameCn
+    } else if (item.key === 'openTime') {
+      item.value = data[item.key] ? data[item.key] : item.default
     } else item.value = data[item.key]
     // 完成度展示
     if (item.value === undefined || item.value === null || item.value === '') completeStatus = false

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

@@ -32,7 +32,7 @@
           </template>
           <jobTypeCard class="jobTypeCardBox" :select="[query.positionId].filter(Boolean)" :isSingle="true" @handleJobClick="handleJobClickItem"></jobTypeCard>
         </v-menu>
-        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">岗位模板</v-btn>
+        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">岗位模版</v-btn>
       </template>
     </CtForm>
 
@@ -174,7 +174,7 @@ const handleJobClickItem = (list, name) => {
   positionId.value = name
 }
 
-// 岗位模板
+// 岗位模版
 import Confirm from '@/plugins/confirm'
 import Snackbar from '@/plugins/snackbar'
 import { useI18n } from '@/hooks/web/useI18n'; const { t } = useI18n()

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

@@ -13,7 +13,7 @@
           </template>
           <jobTypeCard class="jobTypeCardBox" :select="[query.positionId].filter(Boolean)" :isSingle="true" @handleJobClick="handleJobClickItem"></jobTypeCard>
         </v-menu>
-        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">岗位模板</v-btn>
+        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">岗位模版</v-btn>
       </template>
     </CtForm>
   </div>

src/views/recruit/enterprise/talentMap/index.vue

@@ -37,15 +37,15 @@
         {{ val }}
         <v-icon class="ml-1" style="margin-top: 1px;" @click="deleteChip(index)">mdi-close</v-icon>
       </v-btn>
-      <v-btn
+      <!-- <v-btn
         class="mr-3 my-2 py-0 px-0"
         density="comfortable"
         color="primary" variant="tonal"
         @click="moreLabels"
       >
-        <!-- {{ chosenLabels?.length ? '选择其他人才标签' : '人才标签'}} -->
         <v-icon>mdi-plus-box</v-icon>
-      </v-btn>
+      </v-btn> -->
+      <v-btn icon="mdi-plus" class="mr-8" v-bind="props" variant="outlined" size="x-small" @click="moreLabels"></v-btn>
       <span v-if="chosenLabels?.length" class="my-2" style="font-size: 14px;cursor: pointer;color: var(--color-999);" @click="resetLabel">清空标签</span>
     </template>
     <!-- 人员信息表单 -->
@@ -87,7 +87,7 @@
       :limit="pageInfo.pageSize"
       @handleChange="handleChangePage"
     ></CtPagination>
-    <Empty v-if="!init && !total" :message="tipsText" :elevation="false" class="mt-15"></Empty>
+    <Empty v-if="!init && !total" :message="loading ? '加载中...' : '没有找到对应人才信息，请换个条件搜索'" :elevation="false" class="mt-15"></Empty>
   </v-card>
   <CtDialog :visible="showMore" titleClass="text-h6" title="选择人才标签" @close="showMore = false" @submit="handleSubmit">
     <div style="width: 80%; margin: 0 auto; min-height: 400px;">
@@ -110,7 +110,7 @@ import { computed, reactive, ref } from 'vue'
 
 const loading = ref(false)
 
-const content = ref('')
+const content = ref('经理')
 const pageInfo = reactive({ pageNo: 1, pageSize: 10 })
 const dataList = ref([])
 const total = ref(0)
@@ -119,12 +119,12 @@ const headers = [
   { title: '求职状态', key: 'jobStatusName', sortable: false },
   // { title: '求职类型', key: 'jobName', sortable: false },
   { title: '电话号码', key: 'phone', sortable: false },
-  { title: '常用邮箱', key: 'email', sortable: false },
+  // { title: '常用邮箱', key: 'email', sortable: false },
   // { title: '微信二维码', key: 'wxCode', sortable: false },
   { title: '出生日期', key: 'birthday', sortable: false, value: item =>  timesTampChange(item.birthday, 'Y-M-D') },
   { title: '婚姻状况', key: 'maritalStatusName', sortable: false },
   { title: '所在城市', key: 'areaName', sortable: false },
-  { title: '户籍地', key: 'regName', sortable: false },
+  // { title: '户籍地', key: 'regName', sortable: false },
   { title: '首次工作时间', key: 'firstWorkTime', sortable: false, value: item =>  timesTampChange(item.firstWorkTime, 'Y-M-D') },
   // { title: '个人优势', key: 'advantage', sortable: false },
   { title: '工作年限', key: 'expName', sortable: false },

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

@@ -230,7 +230,7 @@ const items = ref({
     {
       type: 'datePicker',
       key: 'birthday',
-      value: null,
+      value: '2000-01-01',
       label: '出生日期 *',
       col: 6,
       outlined: true,
@@ -389,7 +389,7 @@ const items = ref({
       type: 'datePicker',
       dateType: 'month',
       key: 'firstWorkTime',
-      value: null,
+      value: '2000-01',
       label: '首次工作时间',
       col: 6,
       outlined: true

src/views/recruit/personal/recommend/index.vue

@@ -8,7 +8,8 @@
       <div class="d-flex">
         <div class="mt-3">
           <positionList :items="items" @selectChange="selectChange"></positionList>
-          <div :class="['loading', {'defaultLink-i': !loadingType}]" @click="handleChangePage">{{ loadingText[loadingType] }}</div>
+          <div class="loading defaultLink-i" @click="router.push('/recruit/personal/position')">加载更多</div>
+          <div v-if="showLoadingMore" :class="['loading', {'defaultLink-i': !loadingType}]" @click="handleChangePage">{{ loadingText[loadingType] }}</div>
         </div>
         <div class="position-details ml-1" style="flex: 1; overflow: hidden;">
           <div class="position-content">
@@ -34,7 +35,9 @@ import { getPromotedPosition } from '@/api/position'
 import { dealDictArrayData } from '@/utils/position'
 import positionList from './components/positionList'
 import positionItemDetail from '@/views/recruit/personal/position/components/details.vue'
+import { useRouter } from 'vue-router'; const router = useRouter()
 
+const showLoadingMore = ref(false) // 只展示默认pageSize数据，加载更多跳转到职位列表
 const jobId = ref('')
 const showRecommendDetails = ref(false)
 const selectChange = (item) => {
@@ -68,7 +71,7 @@ const getList = async () => {
 getList()
 
 const handleChangePage = () => {
-  if (loadingType.value) return
+  if (loadingType.value) return // 没有更多数据了
   // 加载更多
   query.pageNum++
   getList()