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

src/version.js

@@ -1,2 +1,2 @@
 // 版本号
-export const vue_version = 'v25.02.11.1749'
+export const vue_version = 'v25.02.13.1831'

src/views/recruit/enterprise/interviewManagement/components/invite.vue

@@ -18,6 +18,8 @@ const props = defineProps({
     default: () => []
   }
 })
+// 过滤已关闭的职位
+const positionList = ref(props.position.filter(e => e.status !== '1'))
 
 const handleChangeJob = (e) => {
   const obj = props.position.find(item => item.value === e)
@@ -51,7 +53,7 @@ const formItems = ref({
       itemText: 'label',
       itemValue: 'value',
       rules: [v => !!v || '请选择招聘职位'],
-      items: props.position,
+      items: positionList.value,
       change: handleChangeJob
     },
     {

src/views/recruit/enterprise/interviewManagement/index.vue

@@ -161,7 +161,7 @@ const getPositionList = async () => {
   const list = dealDictArrayData([], data)
   positionItems.value = list.map(e => {
     const salary = e.payFrom && e.payTo ? `${e.payFrom ? e.payFrom + '-' : ''}${e.payTo}${e.payName ? '/' + e.payName : ''}` : '面议'
-    return { label: `${formatName(e.name)}_${e.areaName ? e.area?.str ?? '全国' : '全国'} ${salary}_${e.status === 0 ? '招聘中' : '已关闭'}`, value: e.id }
+    return { label: `${formatName(e.name)}_${e.areaName ? e.area?.str ?? '全国' : '全国'} ${salary}_${Number(e.status) === 0 ? '招聘中' : '已关闭'}`, value: e.id, status: e.status }
   })
 }
 getPositionList()

src/views/recruit/enterprise/jobFair/index.vue

@@ -11,7 +11,7 @@
       </div>
     </v-card>
   </v-card>
-  <Empty v-else />
+  <Empty v-else message="暂无进行中的招聘会，去看看其他吧~" />
 </template>
 
 <script setup>

src/views/recruit/enterprise/resume/components/screen.vue

@@ -2,7 +2,7 @@
   <div class="d-flex align-center justify-space-between">
     <div class="d-flex align-center">
       <CommonStyle v-for="(val, i) in list" :key="i" :btnTitle="val.title">
-        <v-list>
+        <v-list v-if="val.items.length">
           <v-list-item
             v-for="(item, index) in val.items"
             :key="index"
@@ -14,6 +14,9 @@
             <v-list-item-title>{{ item.label }}</v-list-item-title>
           </v-list-item>
         </v-list>
+        <v-list v-else>
+          <v-list-item title="暂无数据"></v-list-item>
+        </v-list>
       </CommonStyle>
       <div class="mr-5 d-flex align-center" v-if="props.tab === 0">
         <v-radio-group v-model="bounty" inline style="height: 28px;" @update:modelValue="handleChangeBounty">

src/views/recruit/enterprise/resume/components/table.vue

@@ -112,7 +112,7 @@ const headers = ref([
   { title: '工作经验', key: 'person.expName', sortable: false },
   { title: '最高学历', key: 'person.eduName', sortable: false },
   { title: '应聘职位', key: 'job.name', sortable: false, value: item => formatName(item.job.name) },
-  { title: '投递简历时间', key: 'createTime', sortable: false },
+  { title: '操作时间', key: 'createTime', sortable: false },
   { title: '状态', key: 'status', sortable: false },
   { title: '操作', value: 'actions', sortable: false }
 ])