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

src/utils/position.js

@@ -8,6 +8,7 @@ const dictObj = reactive({
   industry: [], // 行业
   edu: [], // 学历
   exp: [], // 工作经验
+  sex: [],
   area: [], // 地区
   jobStatus: [], // 求职状态
   marital: [], // 婚姻状态
@@ -19,6 +20,7 @@ const dictList = ref([
   { type: 'menduner_scale', value: 'scale', key: 'scale', label: 'scaleName' },
   { type: 'menduner_job_seek_status', value: 'jobStatus', key: 'jobStatus', label: 'jobStatusName' },
   { type: 'menduner_marital_status', value: 'marital', key: 'maritalStatus', label: 'maritalStatusName' },
+  { type: 'menduner_sex', value: 'sex', key: 'sex', label: 'sexName' },
   { type: 'menduner_industry_type', value: 'industry', key: 'industryId', label: 'industryName', params: {}, apiType: 'industryList', nameKey: 'nameCn', valueKey: 'id' },
   { type: 'menduner_education_type', value: 'edu', key: 'eduType', label: 'eduName' },
   { type: 'menduner_exp_type', value: 'exp', key: 'expType', label: 'expName' },

src/views/headhunting/components/content.vue

@@ -51,7 +51,7 @@
           <div class="country-offices__office-content">
             <div class="country-office__office-link">
               <h3 style="font-size: 40px; margin-bottom: 10px;">{{ val.name }}</h3>
-              <p>{{ val.desc }}</p>
+              <!-- <p>{{ val.desc }}</p> -->
             </div>
             <div class="country-offices__office-image" :style="{'background-image': `url('${val.url}')` }"></div>
             <div class="country-offices__office-overlay"></div>
@@ -60,7 +60,7 @@
       </ul>
     </div>
     <!-- 行业的观点 -->
-    <div class="articles common-width">
+    <!-- <div class="articles common-width">
       <div class="line"></div>
       <h2 class="text-center">行业的观点</h2>
       <div class="d-flex article-box">
@@ -78,7 +78,7 @@
           </div>
         </div>
       </div>
-    </div>
+    </div> -->
     <!-- 联系我们 -->
     <ContactPage></ContactPage>
   </div>
@@ -119,11 +119,11 @@ const consultant = [
   { country: '北京', enName: '姚嘉庆女士（Julia Yao）', id: 'julia', avatar: 'https://minio.citupro.com/dev/menduner/consultant/julie.png' }
 ]
 // 我们的见解
-const articles = [
-  { title: '女性领导力崛起：《走进中国女性高管的职场现状》', id: 'china-needs-more-women-in-executive-leadership', url: 'https://cn.spencerstuart.com/-/media/2023/march/chinaneedsmorewomen/web-cnwomen-mar23.jpg' },
-  { title: '纷繁复杂世界中的领导力：为未来的首席执行官做好规划', id: 'leadership-for-a-complex-world-planning-for-the-ceo-of-the-future', url: 'https://cn.spencerstuart.com/-/media/2023/september/ceofuture/thmb-ceoofthefuture-sept2023-616x434.jpg' },
-  { title: '全球视角下的CFO角色演变：跨领域高管的洞察与应对策略', id: 'the-evolution-of-the-cfo-role-from-a-global-perspective', url: 'https://cn.spencerstuart.com/-/media/search-images/placeholder-hdr.jpg' }
-]
+// const articles = [
+//   { title: '女性领导力崛起：《走进中国女性高管的职场现状》', id: 'china-needs-more-women-in-executive-leadership', url: 'https://cn.spencerstuart.com/-/media/2023/march/chinaneedsmorewomen/web-cnwomen-mar23.jpg' },
+//   { title: '纷繁复杂世界中的领导力：为未来的首席执行官做好规划', id: 'leadership-for-a-complex-world-planning-for-the-ceo-of-the-future', url: 'https://cn.spencerstuart.com/-/media/2023/september/ceofuture/thmb-ceoofthefuture-sept2023-616x434.jpg' },
+//   { title: '全球视角下的CFO角色演变：跨领域高管的洞察与应对策略', id: 'the-evolution-of-the-cfo-role-from-a-global-perspective', url: 'https://cn.spencerstuart.com/-/media/search-images/placeholder-hdr.jpg' }
+// ]
 
 const handleClick = (type, id) => {
   if (!type && !id) return

src/views/headhunting/components/nav.vue

@@ -22,8 +22,7 @@ defineOptions({ name: 'headhunting-nav'})
 const emit = defineEmits(['click'])
 const navList = [
   { title: '我们的服务', path: '/headhunting/service' },
-  // { title: '我们的顾问', path: '' },
-  { title: '候选人', path: '' }
+  { title: '候选人', path: '/login' }
 ]
 </script>
 

src/views/recruit/personal/PersonalCenter/inviteRecord/index.vue

@@ -24,6 +24,8 @@
 defineOptions({ name: 'inviteRecord'})
 import { ref } from 'vue'
 import { getInviteRecord } from '@/api/integral.js'
+import { dealDictObjData } from '@/utils/position'
+import { timesTampChange } from '@/utils/date'
 
 const total = ref(0)
 const items = ref([])
@@ -32,20 +34,30 @@ const query = ref({
   pageSize: 10
 })
 const headers = [
-  { title: '用户名', key: 'name', sortable: false },
-  { title: '用户名', key: 'name', sortable: false },
-  { title: '性别', key: 'sex', sortable: false },
-  { title: '求职状态', key: 'jobStatus', sortable: false },
-  { title: '工作经验', key: 'expType', sortable: false },
-  { title: '学历', key: 'eduType', sortable: false }
+  { title: '邀请时间', key: 'user.createTime', sortable: false, value: item => timesTampChange(item.user.createTime) },
+  { title: '用户名', key: 'person.name', sortable: false },
+  { title: '联系电话', key: 'user.phone', sortable: false },
+  { title: '性别', key: 'person.sexName', sortable: false },
+  { title: '求职状态', key: 'person.jobStatusName', sortable: false },
+  { title: '工作经验', key: 'person.expName', sortable: false },
+  { title: '学历', key: 'person.eduName', sortable: false }
 ]
 
 
 const getData = async () => {
   const res = await getInviteRecord(query.value)
-  console.log(res, 'getData')
+  if (!res.list) {
+    items.value = []
+    total.value = 0
+    return
+  }
+  items.value = res.list.map(e => {
+    e.person = dealDictObjData({}, e.person)
+    return e
+  })
+  total.value = res.total
 }
-// getData()
+getData()
 
 const handleChangePage = (e) => {
   query.value.pageNo = e.page