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

src/components/FormUI/datePicker/index.vue

@@ -1,7 +1,7 @@
 <template>
-  <div :style="{ width: item.width ? item.width + 'px' : '100%' }">
+  <div :style="{ width: item?.width ? item?.width + 'px' : '100%' }">
     <div class="d-flex align-center">
-      <div class="form-label" :style="{'width': item.labelWidth + 'px'}">{{ item.label }}</div>
+      <div v-if="item?.label" class="form-label" :style="{'width': item.labelWidth + 'px'}">{{ item.label }}</div>
       <el-config-provider :locale="zhCn">
         <el-date-picker
           style="flex: 1;"
@@ -51,8 +51,14 @@ watch(() => props.modelValue,
 
 // 过去的日期不可选
 const disabledDates = (date) => {
+  // 未来的日期不可选
+  if (props.item?.disabledFutureDates) {
+    return date.getTime() > Date.now()
+  }
+
   const currentDate = new Date()
   if (!props.item.disabledDate) return false
+  // 过去的日期不可选
   currentDate.setDate(currentDate.getDate() - 1)
   return date.getTime() < currentDate.getTime()
 }

src/views/recruit/enterprise/statistics/overallAnalysis.vue

@@ -10,7 +10,7 @@
       <div class="d-flex align-center ml-7">
         <span>自定义日期</span>
         <div class="ml-5">
-          <date-picker v-model="date" :options="{ range: true, clearable: true, placeholder: '请选择要查看的时间范围', change: handleChangeDate, format: 'timestamp' }"></date-picker>
+          <date-picker v-model="date" :item="{ mode: 'daterange', clearable: true, placeholder: '请选择要查看的时间范围', format: 'YYYY/MM/DD', width: 250, disabledFutureDates: true }" @change="handleChangeDate"></date-picker>
         </div>
       </div>
       <div class="ml-10" style="width: 300px;">
@@ -44,6 +44,7 @@ import ResumeAnalysis from './components/resume.vue'
 import { convertTimestampsToDayRange } from '@/utils/date'
 import { analysisExport } from '@/api/recruit/enterprise/statistics'
 import download from '@/utils/download'
+import DatePicker from '@/components/FormUI/datePicker'
 
 const tab = ref(1)
 const date = ref(null)

src/views/recruit/personal/PersonalCenter/resume/online/components/basicInfo.vue

@@ -234,6 +234,7 @@ const items = ref({
       value: '2000-01-01',
       defaultValue: new Date(2000, 1, 1),
       label: '出生日期 *',
+      disabledFutureDates: true,
       col: 6,
       format: 'YYYY/MM/DD',
       outlined: true,
@@ -363,6 +364,7 @@ const items = ref({
       mode: 'month',
       key: 'firstWorkTime',
       value: '2000-01',
+      disabledFutureDates: true,
       defaultValue: new Date(2000, 1),
       format: 'YYYY/MM',
       labelWidth: 130,

src/views/recruit/personal/PersonalCenter/resume/online/components/educationExp.vue

@@ -173,6 +173,7 @@ const formItems = ref({
       format: 'YYYY/MM',
       labelWidth: 120,
       label: '开始时间 *',
+      disabledFutureDates: true,
       col: 6,
       rules: [v => !!v || '请选择起始时间']
     },
@@ -182,6 +183,7 @@ const formItems = ref({
       mode: 'month', // 时间类型 year month date time
       value: null,
       format: 'YYYY/MM',
+      disabledFutureDates: true,
       labelWidth: 120,
       label: '结束时间 *',
       col: 6,

src/views/recruit/personal/PersonalCenter/resume/online/components/projectExperience.vue

@@ -70,6 +70,7 @@ const items = ref({
       format: 'YYYY-MM',
       labelWidth: 140,
       col: 6,
+      disabledFutureDates: true,
       flexStyle: 'mr-3'
     },
     {
@@ -78,6 +79,7 @@ const items = ref({
       format: 'YYYY-MM',
       mode: 'month',
       value: null,
+      disabledFutureDates: true,
       label: '项目结束时间 *',
       col: 6,
       flexStyle: 'mr-3',

src/views/recruit/personal/PersonalCenter/resume/online/components/trainingExperience.vue

@@ -84,6 +84,7 @@ const items = ref({
       labelWidth: 140,
       format: 'YYYY/MM',
       label: '培训开始时间 *',
+      disabledFutureDates: true,
       col: 6,
       flexStyle: 'mr-3',
       rules: [v => !!v || '请选择培训开始时间']
@@ -96,6 +97,7 @@ const items = ref({
       format: 'YYYY/MM',
       labelWidth: 140,
       label: '培训结束时间 *',
+      disabledFutureDates: true,
       col: 6,
       rules: [v => !!v || '请选择培训结束时间']
     },

src/views/recruit/personal/PersonalCenter/resume/online/components/workExperience.vue

@@ -153,6 +153,7 @@ const formItems = ref({
       value: null,
       label: '开始时间 *',
       labelWidth: 120,
+      disabledFutureDates: true,
       format: 'YYYY/MM',
       col: 6,
       rules: [v => !!v || '请选择起始时间']
@@ -165,6 +166,7 @@ const formItems = ref({
       value: null,
       format: 'YYYY/MM',
       label: '结束时间 *',
+      disabledFutureDates: true,
       col: 6,
       labelWidth: 120,
       rules: [v => !!v || '请选择结束时间']