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

components.d.ts

@@ -28,7 +28,6 @@ declare module 'vue' {
     CtSearch: typeof import('./src/components/CtSearch/index.vue')['default']
     CtTable: typeof import('./src/components/CtTable/index.vue')['default']
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
-    CtTooltip: typeof import('./src/components/CtTooltip/index.vue')['default']
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
     ElCascader: typeof import('element-plus/es')['ElCascader']
@@ -75,7 +74,4 @@ declare module 'vue' {
     VerifySlide: typeof import('./src/components/Verifition/Verify/VerifySlide.vue')['default']
     WangEditor: typeof import('./src/components/FormUI/wangEditor/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

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

@@ -114,10 +114,6 @@ const getCompanyData = async () => {
 
 const handleClear = () => {
   clear.value = true
-  query.value = {
-    name: content.value,
-    areaIds: query.value.areaIds
-  }
   if (query.value.name || query.value.areaIds?.length) {
     dealRouteQuery(query.value)
     // getCompanyData()

src/views/recruit/personal/position/components/conditionFilter.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%;">
     <cityCascadeSelect v-if="showCitySelect" @inputChange="inputChange"></cityCascadeSelect>
     <div class="d-flex" style="flex-wrap: wrap;">
       <template v-for="item in list" :key="item.key">
@@ -19,7 +19,7 @@
         ></component>
       </template>
     </div>
-    <div v-if="showSelectList?.length">
+    <div>
       <div style="margin-top: 20px; border-top: 1px solid #eee;">
         <div v-for="item in showSelectList" :key="item.key" style="margin: 4px 8px 4px 0px;">
           <template v-if="item.checkedItems?.length">
@@ -37,9 +37,9 @@
           </template>
         </div>
       </div>
-      <div style="text-align: right;">
-        <span class="clearFilterCriteria" @click="emits('reset')">{{ $t('common.clearFilterCriteria') }}</span>
-      </div>
+    </div>
+    <div class="text-end mt-3">
+      <span class="clearFilterCriteria" @click="emits('reset')">{{ $t('common.clearFilterCriteria') }}</span>
     </div>
   </div>
 </template>

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

@@ -11,7 +11,7 @@
           ></headSearch>
         </div>
         <!-- <cityFilter class="mx-5 mb-3" ref="cityFilterRef" @change="handleQueryChange"></cityFilter> -->
-        <div class="d-flex justify-space-between mx-5 mb-3">
+        <div class="d-flex justify-space-between mx-5">
           <conditionFilter ref="conditionFilterRef" showCitySelect :showFilterList="showFilterList" @reset="handleReset" @change="handleQueryChange"></conditionFilter>
         </div>
       </div>
@@ -132,7 +132,9 @@ const handleQueryChange = (key, val) => {
 
 // 清空筛选条件
 const handleReset = () => {
-  // routeQuery = {}
+  headSearchText.value = ''
+  if (routeQuery.areaIds) delete routeQuery.areaIds
+  if (routeQuery.content) delete routeQuery.content
   showFilterList.forEach(e => {if (routeQuery[e.key]) delete routeQuery[e.key]})
   updateRouter()
 }