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

src/api/menduner/system/jobFair/manage/index.ts

@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+// 招聘会管理 VO
+export interface JobFairManageVO {
+  id: number // id
+  type: string // 类型
+  title: string // 标题
+  slogan: string // 口号
+  headImg: string // 头图
+  backgroundImg: string // 背景图
+  bottomImg: string // 底图
+  pcHeadImg: string // 头图_PC
+  pcBackgroundImg: string // 背景图_PC
+  pcBottomImg: string // 底图_PC
+  insideColour: string // 内部小区块色号
+  jobColour: string // 职位背景色号
+  backgroundColour: string // 背景色色号
+  shareImg: string // 分享背景图
+  startTime: Date // 开始时间
+  endTime: Date // 结束时间
+  vipRequire: string // 什么等级的vip可以参与
+}
+
+// 招聘会管理 API
+export const JobFairManageApi = {
+  // 查询招聘会管理分页
+  getJobFairPage: async (params: any) => {
+    return await request.get({ url: `/menduner/system/job-fair/page`, params })
+  },
+
+  // 查询招聘会管理详情
+  getJobFair: async (id: string) => {
+    return await request.get({ url: `/menduner/system/job-fair/get?id=` + id })
+  },
+
+  // 新增招聘会管理
+  createJobFair: async (data: JobFairManageVO) => {
+    return await request.post({ url: `/menduner/system/job-fair/create`, data })
+  },
+
+  // 修改招聘会管理
+  updateJobFair: async (data: JobFairManageVO) => {
+    return await request.put({ url: `/menduner/system/job-fair/update`, data })
+  },
+
+  // 删除招聘会管理
+  deleteJobFair: async (id: number) => {
+    return await request.delete({ url: `/menduner/system/job-fair/delete?id=` + id })
+  },
+
+  // 导出招聘会管理 Excel
+  exportJobFair: async (params) => {
+    return await request.download({ url: `/menduner/system/job-fair/export-excel`, params })
+  }
+}

src/api/menduner/system/jobFair/white/index.ts

@@ -8,17 +8,17 @@ export const JobFairWhiteApi = {
   },
 
   // 添加企业白名单
-  addJobFairWhiteList: async (enterpriseName: string) => {
-    return await request.put({ url: `/menduner/system/job-fair/add-white-list2?enterpriseName=${enterpriseName}` })
+  addJobFairWhiteList: async (data: any) => {
+    return await request.put({ url: `/menduner/system/job-fair/add-white-list2`, data })
   },
 
   // 移除企业白名单
-  removeJobFairWhiteList: async (enterpriseName: string) => {
-    return await request.put({ url: `/menduner/system/job-fair/remove-white-list2?enterpriseName=${enterpriseName}` })
+  removeJobFairWhiteList: async (data: any) => {
+    return await request.put({ url: `/menduner/system/job-fair/remove-white-list2`, data })
   },
 
   // 导出参加双选会职位 Excel
-  exportJobFairWhiteList: async () => {
-    return await request.download({ url: `/menduner/system/job-fair/detail/export-excel` })
+  exportJobFairWhiteList: async (jobFairId) => {
+    return await request.download({ url: `/menduner/system/job-fair/detail/export-excel?jobFairId=${jobFairId}` })
   }
 }

src/layout/components/Message/src/Message.vue

@@ -5,6 +5,7 @@ import * as NotifyMessageApi from '@/api/system/notify/message'
 defineOptions({ name: 'Message' })
 
 const { push } = useRouter()
+const popoverRef = ref()
 const activeName = ref('notice')
 const unreadCount = ref(0) // 未读消息数量
 const list = ref<any[]>([]) // 消息列表
@@ -12,8 +13,9 @@ const list = ref<any[]>([]) // 消息列表
 // 获得消息列表
 const getList = async () => {
   list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
+
   // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
-  unreadCount.value = 0
+  // unreadCount.value = 0
 }
 
 // 获得未读消息数
@@ -23,11 +25,24 @@ const getUnreadCount = async () => {
   })
 }
 
+// 标记为已读
+const handleRead = async (item) => {
+  if (item.readStatus) return
+  await NotifyMessageApi.updateNotifyMessageRead(item.id)
+  await getUnreadCount()
+  await getList()
+}
+
 // 跳转我的站内信
 const goMyList = () => {
-  push({
-    name: 'MyNotifyMessage'
-  })
+  unref(popoverRef).hide?.() // 关闭弹窗
+  push({ name: 'MyNotifyMessage' })
+}
+
+// 触发弹窗
+const handlePopover = async () => {
+  getUnreadCount()
+  await getList()
 }
 
 // ========== 初始化 =========
@@ -39,44 +54,49 @@ onMounted(() => {
     () => {
       getUnreadCount()
     },
-    1000 * 60 * 2
+    1000 * 60 * 2 // 2 分钟
   )
 })
 </script>
 <template>
   <div class="message">
-    <ElPopover :width="400" placement="bottom" trigger="click">
+    <ElPopover ref="popoverRef" :width="400" placement="bottom" trigger="click">
       <template #reference>
-        <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
-        </ElBadge>
+        <div @click="handlePopover">
+          <ElBadge :value="unreadCount" :show-zero="false" :max="99" class="item">
+            <Icon :size="18" class="cursor-pointer" icon="ep:bell" />
+          </ElBadge>
+        </div>
       </template>
       <ElTabs v-model="activeName">
-        <ElTabPane label="我的站内信" name="notice">
-          <el-scrollbar class="message-list">
+        <ElTabPane label="通知" name="notice">
+          <el-scrollbar v-if="list.length > 0" class="message-list">
             <template v-for="item in list" :key="item.id">
               <div class="message-item">
-                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
+                <img alt="" class="message-icon" src="https://minio.menduner.com/dev/1e6893918ef378ca280360078dfe74ade10b27101c89865261824b46de7d34a6.png" />
                 <div class="message-content">
-                  <span class="message-title">
+                  <div class="message-title">
                     {{ item.templateNickname }}：{{ item.templateContent }}
-                  </span>
-                  <span class="message-date">
-                    {{ formatDate(item.createTime) }}
-                  </span>
+                  </div>
+                  <div class="flex justify-between items-center">
+                    <span class="message-date">{{ formatDate(item.createTime) }}</span>
+                    <el-button link type="primary" @click="handleRead(item)"><Icon icon="ep:check" class="mr-5px" /> 标记为已读</el-button>
+                  </div>
                 </div>
               </div>
             </template>
           </el-scrollbar>
+          <el-empty v-else description="暂无消息" />
         </ElTabPane>
       </ElTabs>
       <!-- 更多 -->
-      <div style="margin-top: 10px; text-align: right">
+      <div class="text-right m-t-10px">
         <XButton preIcon="ep:view" title="查看全部" type="primary" @click="goMyList" />
       </div>
     </ElPopover>
   </div>
 </template>
+
 <style lang="scss" scoped>
 .message-empty {
   display: flex;
@@ -95,7 +115,7 @@ onMounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 20px 0;
+    padding: 15px 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {
@@ -103,14 +123,14 @@ onMounted(() => {
     }
 
     .message-icon {
-      width: 40px;
-      height: 40px;
+      width: 50px;
+      height: 50px;
       margin: 0 20px 0 5px;
     }
 
     .message-content {
-      display: flex;
-      flex-direction: column;
+      // display: flex;
+      // flex-direction: column;
 
       .message-title {
         margin-bottom: 5px;

src/router/modules/remaining.ts

@@ -521,6 +521,24 @@ const remainingRouter: AppRouteRecordRaw[] = [
       }
     ]
   },
+  {
+    path: '/jobFair',
+    component: Layout,
+    name: 'jobFairManage',
+    meta: { hidden: true },
+    children: [
+      {
+        path: 'jobFair/detail/:id',
+        name: 'JobFairDetail',
+        meta: {
+          title: '招聘会详情',
+          noCache: true,
+          hidden: true
+        },
+        component: () => import('@/views/menduner/system/jobFair/manage/details/index.vue')
+      }
+    ]
+  },
   {
     path: '/order',
     component: Layout,

src/views/menduner/system/jobFair/manage/JobFairManageForm.vue

@@ -0,0 +1,155 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="110px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="formData.title" :rows="3" type="textarea" placeholder="请输入标题" />
+      </el-form-item>
+      <el-form-item label="PC背景图" prop="pcHeadImg">
+        <UploadImg v-model="formData.pcHeadImg" height="150px" width="300px" :fileSize="10" :validSpecifications="true" :maxWidth="800" :maxHeight="300" />
+        <div class="flex" style="color: orange; align-items: center;"><Icon :size="20" icon="ep:warning" class="mr-3px" />提示：请上传宽800px*高300px规格的图片</div>
+      </el-form-item>
+      <el-form-item label="小程序背景图" prop="headImg">
+        <UploadImg v-model="formData.headImg" height="150px" width="300px" :fileSize="10" :validSpecifications="true" :maxWidth="750" :maxHeight="350" />
+        <div class="flex" style="color: orange; align-items: center;"><Icon :size="20" icon="ep:warning" class="mr-3px" />提示：请上传宽750px*高350px规格的图片</div>
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker v-model="formData.startTime" type="date" value-format="x" placeholder="选择开始时间" />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker v-model="formData.endTime" type="date" value-format="x" placeholder="选择结束时间" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.MENDUNER_STATUS)"
+            :key="dict.value"
+            :label="dict.value.toString()"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { JobFairManageApi, JobFairManageVO } from '@/api/menduner/system/jobFair/manage'
+
+/** 招聘会管理 表单 */
+defineOptions({ name: 'JobFairManageForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  type: 1,
+  title: undefined,
+  // slogan: undefined,
+  headImg: undefined,
+  pcHeadImg: undefined,
+  // bottomImg: undefined,
+  // pcHeadImg: undefined,
+  // pcBackgroundImg: undefined,
+  // pcBottomImg: undefined,
+  // insideColour: undefined,
+  // jobColour: undefined,
+  // backgroundColour: undefined,
+  // shareImg: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  status: '0',
+  // vipRequire: undefined
+})
+const formRules = reactive({
+  headImg: [{ required: true, message: '小程序背景图不能为空', trigger: 'change' }],
+  pcHeadImg: [{ required: true, message: 'PC背景图不能为空', trigger: 'change' }],
+  title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+  startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
+  endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await JobFairManageApi.getJobFair(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as JobFairManageVO
+    if (formType.value === 'create') {
+      await JobFairManageApi.createJobFair(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await JobFairManageApi.updateJobFair(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    type: 1,
+    title: undefined,
+    // slogan: undefined,
+    headImg: undefined,
+    pcHeadImg: undefined,
+    // bottomImg: undefined,
+    // pcHeadImg: undefined,
+    // pcBackgroundImg: undefined,
+    // pcBottomImg: undefined,
+    // insideColour: undefined,
+    // jobColour: undefined,
+    // backgroundColour: undefined,
+    // shareImg: undefined,
+    startTime: undefined,
+    endTime: undefined,
+    status: '0',
+    // vipRequire: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/menduner/system/jobFair/manage/details/index.vue

@@ -0,0 +1,161 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <CardTitle :title="jobFairInfo.title?.replace(/<\/?p[^>]*>/gi, '')" />
+    <el-form
+      class="-mb-15px m-t-20px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+      @submit.prevent
+    >
+      <el-form-item label="企业名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入企业名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button type="primary" plain @click="handleAdd"><Icon icon="ep:plus" class="mr-5px" /> 新增</el-button>
+        <el-button v-if="showExport" type="primary" plain @click="handleExport"><Icon icon="ep:download" class="mr-5px" /> 导出参加招聘会职位列表</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true">
+      <el-table-column label="招聘会标题" align="center" prop="jobFair.title">
+        <template #default="scope">
+          <div v-html="scope.row.jobFair.title"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="企业名称" align="center" prop="name" />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleRemoveWhiteList(scope.row.name)"
+          >
+            移出白名单
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <JobFairForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { JobFairWhiteApi } from '@/api/menduner/system/jobFair/white'
+import JobFairForm from './jobFairForm.vue'
+import download from '@/utils/download'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { ElMessage } from 'element-plus'
+import { JobFairManageApi } from '@/api/menduner/system/jobFair/manage'
+
+/** 招聘会 列表 */
+defineOptions({ name: 'JobFairDetails' })
+
+const message = useMessage() // 消息弹窗
+
+const loading = ref(true) // 列表的加载中
+const list = ref([]) // 列表的数据
+const total = ref(0)
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  jobFairId: ''
+})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await JobFairWhiteApi.getJobFairWhiteList(queryParams.value)
+    total.value = data.total
+    list.value = data.list
+  } finally {
+    loading.value = false
+  }
+}
+
+/* 查询招聘会详情 */
+const jobFairInfo = ref({})
+const getJobFairDetail = async () => {
+  try {
+    const data = await JobFairManageApi.getJobFair(queryParams.value.jobFairId)
+    jobFairInfo.value = data
+  } catch {}
+}
+
+const handleQuery = () => {
+  queryParams.value.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const queryFormRef = ref()
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+const formRef = ref()
+const handleAdd = () => {
+  formRef.value.open(queryParams.value.jobFairId)
+}
+
+// 移出白名单
+const handleRemoveWhiteList = async (enterpriseName: string) => {
+  try {
+    await message.confirm(`确定要将【${enterpriseName}】移出白名单吗？`)
+    await JobFairWhiteApi.removeJobFairWhiteList({ enterpriseName, jobFairId: queryParams.value.jobFairId })
+    message.success('移出成功')
+    getList()
+  } catch (err) {}
+}
+
+const showExport = ref(true) // 导出参加招聘会职位列表
+const exportLoading = ref(false) // 导出的加载中
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await JobFairWhiteApi.exportJobFairWhiteList(queryParams.value.jobFairId)
+    download.excel(data, '招聘会职位列表.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 */
+const { currentRoute } = useRouter() // 路由
+const { delView } = useTagsViewStore() // 视图操作
+const route = useRoute()
+const { id } = route.params
+onMounted(() => {
+  if (!id) {
+    ElMessage.warning('参数错误，招聘会编号不能为空！')
+    delView(unref(currentRoute))
+    return
+  }
+  queryParams.value.jobFairId = id
+  getList()
+  getJobFairDetail()
+})
+</script>

src/views/menduner/system/jobFair/manage/details/jobFairForm.vue

@@ -0,0 +1,98 @@
+<template>
+  <Dialog title="添加白名单" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="企业名称" prop="enterpriseName">
+        <!-- <el-select v-model="formData.enterpriseName" filterable clearable allow-create default-first-option :reserve-keyword="false" placeholder="请输入企业名称进行查找">
+          <el-option v-for="(item, index) in enterpriseList" :key="index" :label="item.name" :value="item.name" />
+        </el-select> -->
+        <el-select-v2
+          v-model="formData.enterpriseName"
+          :options="enterpriseList"
+          placeholder="请输入企业名称进行查找"
+          allow-create
+          filterable
+          :props="{ label: 'name', value: 'name' }"
+          clearable
+        />
+        <div style="display: flex; color: orange; align-items: center;"><Icon :size="20" icon="ep:warning" class="mr-3px" />提示：此处输入搜索匹配的是企业全称</div>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script setup lang="ts">
+import { JobFairWhiteApi } from '@/api/menduner/system/jobFair/white'
+import { EnterpriseUserBindApi } from '@/api/menduner/system/enterprise/userBind'
+
+/** 招聘会 表单 */
+defineOptions({ name: 'JobFairDetailsForm' })
+
+const message = useMessage() // 消息弹窗
+
+const enterpriseList = ref([])
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  enterpriseName: '',
+  jobFairId: ''
+})
+const formRules = reactive({
+  enterpriseName: [{ required: true, message: '请选择要添加的企业', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (id: string) => {
+  resetForm()
+  formData.value.jobFairId = id
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+// 企业列表
+const getEnterpriseListData = async () => {
+  try {
+    const data = await EnterpriseUserBindApi.getEnterpriseList()
+    enterpriseList.value = data
+  } catch (err) {}
+}
+getEnterpriseListData()
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  
+  // 提交请求
+  formLoading.value = true
+  try {
+    await JobFairWhiteApi.addJobFairWhiteList(formData.value)
+    message.success('添加成功')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    enterpriseName: '',
+    jobFairId: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/menduner/system/jobFair/manage/index.vue

@@ -0,0 +1,216 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['menduner:system:job-fair:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <!-- <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['menduner:system:job-fair:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true">
+      <el-table-column label="标题" align="center" prop="title" width="220">
+        <template #default="scope">
+          <div v-html="scope.row.title"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="小程序背景图" align="center" prop="headImg">
+        <template #default="scope">
+          <el-image v-if="scope.row.pcHeadImg" :src="scope.row.headImg" lazy preview-teleported :preview-src-list="[scope.row.headImg]" fit="contain" />
+        </template>
+      </el-table-column>
+      <el-table-column label="PC背景图" align="center" prop="pcHeadImg">
+        <template #default="scope">
+          <el-image v-if="scope.row.pcHeadImg" :src="scope.row.pcHeadImg" lazy preview-teleported :preview-src-list="[scope.row.pcHeadImg]" fit="contain" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MENDUNER_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="开始时间" align="center" prop="startTime" :formatter="dateFormatter" />
+      <el-table-column label="结束时间" align="center" prop="endTime" :formatter="dateFormatter" />
+      <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" />
+      <el-table-column label="操作" align="center" fixed="right" min-width="100">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row.id)">白名单</el-button>
+          <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['menduner:system:job-fair:update']">编辑</el-button>
+          <!-- <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['menduner:system:job-fair:delete']">删除</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <JobFairManageForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+// import download from '@/utils/download'
+import { DICT_TYPE } from '@/utils/dict'
+import { JobFairManageApi, JobFairManageVO } from '@/api/menduner/system/jobFair/manage'
+import JobFairManageForm from './JobFairManageForm.vue'
+
+/** 招聘会管理 列表 */
+defineOptions({ name: 'JobFair' })
+
+// const message = useMessage() // 消息弹窗
+// const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<JobFairManageVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  // type: undefined,
+  title: undefined,
+  // slogan: undefined,
+  startTime: [],
+  endTime: [],
+  // vipRequire: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+// const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await JobFairManageApi.getJobFairPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+// const handleDelete = async (id: number) => {
+//   try {
+//     // 删除的二次确认
+//     await message.delConfirm()
+//     // 发起删除
+//     await JobFairManageApi.deleteJobFair(id)
+//     message.success(t('common.delSuccess'))
+//     // 刷新列表
+//     await getList()
+//   } catch {}
+// }
+
+/** 导出按钮操作 */
+// const handleExport = async () => {
+//   try {
+//     // 导出的二次确认
+//     await message.exportConfirm()
+//     // 发起导出
+//     exportLoading.value = true
+//     const data = await JobFairManageApi.exportJobFair(queryParams)
+//     download.excel(data, '招聘会管理.xls')
+//   } catch {
+//   } finally {
+//     exportLoading.value = false
+//   }
+// }
+
+/** 打开招聘会详情 */
+const { push } = useRouter()
+const openDetail = (id) => {
+  push({ name: 'JobFairDetail', params: { id } })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/menduner/system/talentMap/details/index.vue

@@ -240,8 +240,14 @@ const handleDetail = async (userId) => {
 }
 
 // 新增人才
+const arrKey = ['eduList', 'workList', 'trainList']
 const handleSave = async () => {
   if (result.value?.resume) delete result.value.resume
+  if (!fileUrl.value) {
+    arrKey.forEach(key => {
+      if (result.value[key] && result.value[key].length) result.value[key].forEach(item => delete item.id)
+    })
+  }
   console.log(result.value, 'result-add')
 
   // 效验基本信息中必填项是否有填写