3 İşlemeler 46e4bdf8f9 ... f2281c553d

Yazar SHA1 Mesaj Tarih
  lifanagju_citu f2281c553d Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner-admin into dev 2 ay önce
  lifanagju_citu ed57802dc6 意向职位改为级联 2 ay önce
  lifanagju_citu 3846fe3929 变量名称修改 2 ay önce

+ 4 - 6
src/utils/transform/date.js

@@ -29,13 +29,11 @@ export const getTimeStamp = (str) => {
 export const timestampToAge = (timestamp) => {
   if (!timestamp) return null
   const birthDate = new Date(timestamp);
-  const currentDate = new Date();
-  let age = currentDate.getFullYear() - birthDate.getFullYear();
-  const monthDiff = currentDate.getMonth() - birthDate.getMonth();
+  const today = new Date();
+  let age = today.getFullYear() - birthDate.getFullYear();
+  const monthDiff = today.getMonth() - birthDate.getMonth();
   // 如果当前月份小于出生月份,或者月份相同但日期未到生日
-  if (monthDiff < 0 || (monthDiff === 0 && currentDate.getDate() < birthDate.getDate())) {
-    age--;
-  }
+  if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) age--;
   return age;
 }
 

+ 4 - 14
src/views/menduner/system/person/index.vue

@@ -121,22 +121,12 @@
         />
       </el-form-item>
       <el-form-item label="意向职位" prop="positionIds">
-        <el-select
+        <el-cascader
           v-model="queryParams.positionIds"
-          placeholder="请选择意向职位类型"
-          clearable
-          multiple
-          :collapse-tags="true"
-          :collapse-tags-tooltip="true"
+          :options="positionTreeData"
+          :props="{ label: 'nameCn', value: 'id', emitPath: false }"
           class="!w-240px"
-        >
-          <el-option
-            v-for="dict in positionTreeData"
-            :key="dict.id"
-            :label="dict.nameCn"
-            :value="dict.id"
-          />
-        </el-select>
+        />
       </el-form-item>
       <el-form-item label="所在城市" prop="areaIds">
         <el-cascader 

+ 5 - 15
src/views/menduner/system/talentMap/maintenance/gather/components/search.vue

@@ -51,7 +51,7 @@
         <el-cascader
           v-model="queryParams.areaIds" 
           :options="areaTreeData" 
-          :props="{ label: 'name', value: 'id', multiple: true, emitPath: false, checkStrictly: true  }"
+          :props="{ label: 'name', value: 'id', multiple: true, emitPath: false }"
           collapse-tags
           collapse-tags-tooltip
           class="!w-160px"
@@ -61,29 +61,19 @@
         <el-cascader
           v-model="queryParams.workAreaIds" 
           :options="areaTreeData" 
-          :props="{ label: 'name', value: 'id', multiple: true, emitPath: false, checkStrictly: true  }"
+          :props="{ label: 'name', value: 'id', multiple: true, emitPath: false }"
           collapse-tags
           collapse-tags-tooltip
           class="!w-160px"
         />
       </el-form-item>
       <el-form-item label="意向职位" prop="positionIds">
-        <el-select
+        <el-cascader
           v-model="queryParams.positionIds"
-          placeholder="请选择"
-          clearable
-          multiple
-          collapse-tags
-          collapse-tags-tooltip
+          :options="positionTreeData"
+          :props="{ label: 'nameCn', value: 'id', emitPath: false }"
           class="!w-160px"
-        >
-          <el-option
-            v-for="dict in positionTreeData"
-            :key="dict?.id"
-            :label="dict?.nameCn"
-            :value="dict?.id"
           />
-        </el-select>
       </el-form-item>
 
       <el-form-item>