Xiao_123 11 miesięcy temu
rodzic
commit
a7f0585c94

+ 1 - 1
components.d.ts

@@ -21,7 +21,7 @@ declare module 'vue' {
     CtPagination: typeof import('./src/components/CtPagination/index.vue')['default']
     CtSearch: typeof import('./src/components/CtSearch/index.vue')['default']
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
-    DatePicker: typeof import('./src/components/FormUI/datePicker/index.vue')['default']
+    DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

+ 14 - 8
src/components/Enterprise/components/positions.vue

@@ -4,7 +4,7 @@
       <div class="font-weight-bold position-category-left">职位类别:</div>
       <div class="position-category-right">
         <span 
-          :class="['category-item', {'default-active': k.active}]" 
+          :class="['category-item', {'default-active': k.active}, {'font-weight-bold': k.active}]" 
           v-for="k in positionCategory" 
           :key="k.id"
           @click="handleClickCategory(k)"
@@ -42,7 +42,8 @@
       @click="handlePosition(val)"
     >
       <div>
-        <p :class="['name', {'default-active': val.active }]">{{ val.job.name }}</p>
+        <p v-if="val.job.name.includes('style')" :class="['name', {'default-active': val.active }]" v-html="val.job.name"></p>
+        <p v-else :class="['name', {'default-active': val.active }]">{{ val.job.name }}</p>
         <div style="line-height: 40px;">
           <span v-for="k in desc" :key="k.mdi" class="mr-5">
             <v-icon color="#666" size="15">{{ k.mdi }}</v-icon>
@@ -134,7 +135,7 @@ const getPoAr = async () => {
   // 职位类别回显
   if (routeQuery?.positionId) {
     positionCategory.value.map(e => e.active = false)
-    positionCategory.value.find(e => e.id === Number(routeQuery.positionId)).active = true
+    positionCategory.value.find(e => e.id === routeQuery.positionId).active = true
   }
 }
 getPoAr()
@@ -150,14 +151,18 @@ const handleClickCategory = (k) => {
 
 const dealRouteQuery = () => {
   const arr = Object.keys(query).map(e => {
-    return `${e}=${query[e]}`
-  })
-  const str = arr.join('&')
-  if (str) router.push(`${route.path}?${str}`)
+    if (Array.isArray(query[e]) && !query[e].length) {
+      delete query[e]
+    }
+    if (!query[e]) delete query[e]
+    if (e !== 'pageSize' && e !== 'pageNo' && e !== 'enterpriseId') return `${e}=${query[e]}`
+  }).filter(Boolean)
+  const str = ['key=recruitmentPositions', ...arr].join('&')
+  if (str) router.replace(`${route.path}?${str}`)
 }
 
 const handleSearch = (key, { values }) => {
-  if (values === -1 || !values || values[0] === -1) delete query[key]
+  if (values === -1 || !values || values[0] === -1 || !values.length) delete query[key]
   else query[key] = values
   dealRouteQuery()
   getPositionList(true)
@@ -172,6 +177,7 @@ const getPositionList = async (isSearch) => {
     ...pageInfo.value,
     enterpriseId: props.info.enterprise.id
   }
+  delete query.key
   if (isSearch) query.pageNo = 1
   const { list: arr, total: number } = await getJobAdvertisedSearch(query)
   total.value = number

+ 2 - 2
src/views/recruit/position/components/conditionFilter/areaType.vue

@@ -49,8 +49,8 @@ if (query && query?.areaIds) {
   }
 
 const handle = (val) => {
-  const obj = selectedItems.value.find(e => e === val.id)
-  title.value = val.id === -1 ? '工作地点' : '工作地点(1)'
+  const obj = selectedItems.value.includes(val.id)
+  title.value = obj ? '工作地点' : (val.id === -1 ? '工作地点' : '工作地点(1)')
   selectedItems.value = obj ? [] : [val.id]
   emits('inputChange', { values: selectedItems.value })
 }

+ 1 - 1
vite.config.mjs

@@ -51,6 +51,6 @@ export default defineConfig({
     ],
   },
   server: {
-    port: 3000,
+    port: 3000
   },
 })