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

src/views/recruit/personal/company/components/areaType.vue

@@ -49,7 +49,8 @@ const getAreaList = async () => {
     e.active = false
     return e
   })
-  items.value = [{ id: -1, name: '全国', active: true }, ...list]
+  // items.value = [{ id: -1, name: '全国', active: true }, ...list]
+  items.value = list
   // 刷新回显
   if (routeQuery?.areaIds) {
     const obj = items.value.find(e => e.id === routeQuery.areaIds)

src/views/recruit/personal/company/components/scaleType.vue

@@ -49,7 +49,8 @@ getDict('menduner_scale').then(({ data }) => {
     e.active = false
     return e
   })
-  items.value = [{ value: -1, label: '不限', active: true }, ...list]
+  // items.value = [{ value: -1, label: '不限', active: true }, ...list]
+  items.value = list
   // 刷新回显
   if (routeQuery.scale) {
     const obj = items.value.find(e => e.value === routeQuery.scale)

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

@@ -6,8 +6,8 @@
         <headSearch placeholder="搜索公司关键字" @handleSearch="val => handleSearch(val, 'name')"></headSearch>
         <div class="px-5 mt-3 clear-parent">
           <areaType :isClear="clear" @handleClick="handleSearch"></areaType>
-          <financingStatus class="my-5" :isClear="clear" @clear="clear = false" @handleClick="handleSearch"></financingStatus>
-          <scaleType :isClear="clear" @clear="clear = false" @handleClick="handleSearch"></scaleType>
+          <!-- <financingStatus class="my-5" :isClear="clear" @clear="clear = false" @handleClick="handleSearch"></financingStatus> -->
+          <scaleType class="mt-5" :isClear="clear" @clear="clear = false" @handleClick="handleSearch"></scaleType>
           <div class="clear" @click="handleClear">清空筛选条件</div>
         </div>
       </div>
@@ -34,7 +34,7 @@ import { getEnterpriseSearch } from '@/api/enterprise'
 import { dealDictObjData } from '@/utils/position'
 import headSearch from '@/components/headSearch'
 import scaleType from './components/scaleType'
-import financingStatus from './components/financingStatus.vue'
+// import financingStatus from './components/financingStatus.vue'
 import areaType from './components/areaType'
 import companyItem from './components/companyItem'
 import MPagination from '@/components/CtPagination'
@@ -104,10 +104,14 @@ const handleClear = () => {
     pageNo: 1,
     pageSize: 12
   }
-  if (content.value) router.push(`${route.path}?name=${content.value}`)
-  else router.push(route.path)
-  //
-  getCompanyData()
+  if (content.value) {
+    router.push(`${route.path}?name=${content.value}`)
+    getCompanyData()
+  } else {
+    router.push(route.path)
+    items.value = []
+    total.value = 0
+  }
 }
 
 // 刷新页面时url中带有参数请求检索接口