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

src/views/recruit/enterprise/search/recommend/index.vue

@@ -74,7 +74,7 @@ const query = ref({
 })
 const selectItems = ref({
   label: '招聘中职位',
-  placeholder: '请选择招聘中职位',
+  placeholder: '请选择【招聘中】职位',
   clearable: true,
   width: 600,
   items: []
@@ -106,7 +106,8 @@ const getJobList = async () => {
     const list = dealDictArrayData([], data)
     selectItems.value.items = list.map(e => {
       const salary = e.payFrom && e.payTo ? `${e.payFrom}-${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-      return { label: `${formatName(e.name)}_${e.areaName ? e.area?.str : '全国'} ${salary}_${e.status === '0' ? '招聘中' : '已关闭'}`, value: e.id, data: e }
+      // return { label: `${formatName(e.name)}_${e.areaName ? e.area?.str : '全国'} ${salary}_${e.status === '0' ? '招聘中' : '已关闭'}`, value: e.id, data: e }
+      return { label: `${formatName(e.name)}_${e.areaName ? e.area?.str : '全国'} ${salary}`, value: e.id, data: e }
     })
   }
 }

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

@@ -91,6 +91,22 @@ const inputChange = async({ idName: key, values }) => { // areaIds
   // await getCompanyData()
 }
 
+const getDataFun = async (params) => {
+  const { list, total: number } = await getEnterpriseSearch(params)
+  if (!list.length) {
+    items.value = []
+    total.value = 0
+    return
+  }
+  total.value = number
+  items.value = list.map(e => {
+    e.enterprise = dealDictObjData({}, e.enterprise)
+    if (e.jobList && e.jobList.length) e.job = dealDictObjData({}, e.jobList[0])
+    return e
+  })
+}
+
+
 const noParams = ref(true)
 const getCompanyData = async () => {
   noParams.value = true
@@ -102,22 +118,12 @@ const getCompanyData = async () => {
   if (noParams.value === true) {
     items.value = []
     total.value = 0
+    // getDataFun(pages.value) // 没有筛选条件则展示最新企业列表
     return
   }
   const params = { ...query.value, ...pages.value }
   if (params?.name) params.name = decodeURIComponent(params.name)
-  const { list, total: number } = await getEnterpriseSearch(params)
-  if (!list.length) {
-    items.value = []
-    total.value = 0
-    return
-  }
-  total.value = number
-  items.value = list.map(e => {
-    e.enterprise = dealDictObjData({}, e.enterprise)
-    if (e.jobList && e.jobList.length) e.job = dealDictObjData({}, e.jobList[0])
-    return e
-  })
+  getDataFun(params)
 }
 
 const handleClear = () => {

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

@@ -64,6 +64,16 @@ let routeQuery = (route?.query && route.query && Object.keys(route?.query).lengt
 const noParams = ref(true)
 const headSearchText = ref(routeQuery?.content ? routeQuery?.content.includes('&') ? decodeURIComponent(routeQuery.content) : routeQuery.content : '')
 
+const getDataFun = async (params) => {
+  const { list, total: number } = await getJobAdvertisedSearch(params)
+  items.value = list.map(e => {
+    e.job = { ...e.job, ...dealDictObjData({}, e.job) }
+    e.enterprise = { ...e.enterprise, ...dealDictObjData({}, e.enterprise) }
+    return e
+  })
+  total.value = number
+}
+
 // 职位搜索
 const getData = async () => {
   let pageReqVO = { ...pageInfo, areaIds: [] }
@@ -87,18 +97,12 @@ const getData = async () => {
     noParams.value = true
     items.value = []
     total.value = 0
+    // getDataFun(pageInfo) // 没有筛选条件则展示最新职位列表
     return
   }
   pageReqVO = { ...pageReqVO, ...routerParams }
   noParams.value = false
-  //
-  const { list, total: number } = await getJobAdvertisedSearch(pageReqVO)
-  items.value = list.map(e => {
-    e.job = { ...e.job, ...dealDictObjData({}, e.job) }
-    e.enterprise = { ...e.enterprise, ...dealDictObjData({}, e.enterprise) }
-    return e
-  })
-  total.value = number
+  getDataFun(pageReqVO)
 }
 getData()