冲突合并

src/layout/company/navBar.vue

@@ -117,7 +117,7 @@ const handleToVip = () => {
 const handleLogoClick = () => { window.open('/recruitHome') } // 点击logo
 
 const enterpriseClick = (tabKey = 1) => {
-  const path = '/recruit/enterprise/informationManagement/informationSettings'
+  const path = '/recruit/enterprise/entInfoSetting'
   router.push({ path, query: { tabKey } })
 }
 
@@ -130,8 +130,8 @@ const enterpriseList = ref([])
 
 const menuList = ref([
   // { title: t('enterprise.account.myAccount'), icon: 'mdi-account', change: () => router.push({ path: '/recruit/enterprise/memberCenter/myAccount' }) },
-  // { title: t('vipPackage.purchasePackage'), icon: 'mdi-gift-outline', change: () => window.open('/recruit/enterprise/memberCenter/myMembers') },
-  // { title: t('enterprise.personalInformationSettings'), icon: 'mdi-account-cog', change: () => router.push({ path: '/recruit/enterprise/informationSettings' }) },
+  // { title: t('vipPackage.purchasePackage'), icon: 'mdi-gift-outline', change: () => window.open('/recruit/enterprise/purchasePackage') },
+  // { title: t('enterprise.personalInformationSettings'), icon: 'mdi-account-cog', change: () => router.push({ path: '/recruit/enterprise/staffInfoSetting' }) },
   // { title: t('setting.switchToOtherCompany'), icon: 'mdi-home-switch', hidden: enterpriseList.value?.length < 2, change: () => handleSwitchToAnotherEnterprise },
   // { title: t('enterprise.registeringNewEnterprise'), icon: 'mdi-home-plus-outline', change: () => handleRegisteringNewEnterprise },
   // { title: t('setting.switchToJobSeeker'), icon: 'mdi-swap-horizontal', change: handleLogout },

src/layout/enterprise.vue

@@ -44,6 +44,8 @@ const key = computed(() => {
 
 const whiteList = [
   '/recruit/enterprise/resumeManagement/talentPool/details/details',
+  '/recruit/enterprise/talentPool/details/details',
+  '/recruit/enterprise/purchasePackage',
   '/recruit/enterprise/systemManagement/groupAccount/invite/0',
   '/recruit/enterprise/systemManagement/groupAccount/invite/1'
 ]

src/permission.js

@@ -18,16 +18,20 @@ router.beforeEach(async (to, from, next) => {
   start()
   // loadStart()
   if (to.path === '/enterpriseVerification') {
-    useUserStore().changeRole()
+    const res = JSON.parse(localStorage.getItem('emailLoginInfo') || "false")
+    const obj = res ? { ...res, type: 'emailLogin' } : {}
+    useUserStore().changeRole(obj)
     next()
   } else if (getToken(tokenIndex)) {
     // 企业信息完成度提示
     if (localStorage.getItem('checkEnterpriseBaseInfoFalseHref')) {
       const href = localStorage.getItem('checkEnterpriseBaseInfoFalseHref')
       localStorage.setItem('checkEnterpriseBaseInfoFalseHref', '')
-      Confirm('系统提示', '企业信息设置未完善，是否前往完善？').then(() => {
-        window.location.href = href
-      })
+      setTimeout(() => {
+        Confirm('系统提示', '企业信息设置未完善，是否前往完善？').then(() => {
+          window.location.href = href
+        })
+      }, 4000);
     }
     if (to.path === '/login') {
       next({ path: '/recruitHome' })

src/router/modules/components/recruit/enterprise.js

@@ -18,45 +18,73 @@ const enterprise = [
   {
     path: '/recruit/enterprise',
     show: true,
-    redirect: '/recruit/enterprise/resumeManagement/talentPool',
+    redirect: '/recruit/enterprise/talentRecruitment',
   },
   {
-    path: '/recruit/enterprise/resumeManagement',
-    redirect: '/recruit/enterprise/resumeManagement/talentPool',
     component: Layout,
-    name: 'Resume Management',
+    name: 'Talent Recruitment',
     meta: {
-      title: '简历管理',
-      enName: 'Resume Management',
+      title: '人才招聘',
+      enName: 'Talent Recruitment',
       icon: 'mdi-account-settings-outline'
     },
     children: [
       {
-        path: '/recruit/enterprise/resumeManagement/talentPool',
+        path: '/recruit/enterprise/talentRecruitment',
         meta: {
-          title: '人才库',
-          enName: 'Talent Pool'
+          title: '简历管理',
+          enName: 'Resume Management'
         },
-        component: () => import('@/views/recruit/enterprise/resumeManagement/talentPool/index.vue')
+        component: () => import('@/views/recruit/enterprise/talentRecruitment/index.vue')
       },
       {
-        path: '/recruit/enterprise/resumeManagement/talentPool/details/:id',
+        path: '/recruit/enterprise/chatTools',
+        meta: {
+          title: '在线沟通',
+          enName: 'Online Communication',
+        },
+        component: () => import('@/views/recruit/enterprise/chatTools/index.vue')
+      },
+      {
+        path: '/recruit/enterprise/interviewManagement',
+        meta: {
+          title: '面试管理',
+          enName: 'Interview management',
+          // icon: 'mdi-account-multiple-check'
+        },
+        component: () => import('@/views/recruit/enterprise/interviewManagement/index.vue')
+      }
+    ]
+  },
+  {
+    path: '/recruit/enterprise/talentPool',
+    component: Layout,
+    name: 'Elite Reserve',
+    meta: {
+      title: '精英储备',
+      enName: 'Job Management',
+      icon: 'mdi-format-list-bulleted-square'
+    },
+    children: [
+      {
+        path: '/recruit/enterprise/talentPool',
+        show: true,
+        meta: {
+          title: '职位列表',
+          enName: 'Job list'
+        },
+        component: () => import('@/views/recruit/enterprise/talentPool/index.vue')
+      },
+      {
+        path: '/recruit/enterprise/talentPool/details/:id',
         show: true, // 侧边栏不展示
-        component: () => import('@/views/recruit/enterprise/resumeManagement/talentPool/components/details'),
+        component: () => import('@/views/recruit/enterprise/talentPool/components/details'),
         name: 'talentPoolDetails',
         meta: {
           title: '人才详情',
           hideSide: true
         }
       },
-      {
-        path: '/recruit/enterprise/resumeManagement/elite',
-        meta: {
-          title: '精英人才',
-          enName: 'Elite talents'
-        },
-        component: () => import('@/views/recruit/enterprise/resumeManagement/elite/index.vue')
-      }
     ]
   },
   {
@@ -96,23 +124,6 @@ const enterprise = [
       }
     ]
   },
-  {
-    path: '/recruit/enterprise/resumeManagement/talentMap',
-    component: Layout,
-    name: 'Talent Map',
-    meta: {
-      title: '人才地图',
-      enName: 'Talent Map',
-      icon: 'mdi-map-check'
-    },
-    children: [
-      {
-        path: '/recruit/enterprise/resumeManagement/talentMap',
-        show: true,
-        component: () => import('@/views/recruit/enterprise/resumeManagement/talentMap/index.vue')
-      }
-    ]
-  },
   {
     path: '/recruit/enterprise/hirePosition',
     component: Layout,
@@ -150,36 +161,19 @@ const enterprise = [
     ]
   },
   {
-    path: '/recruit/enterprise/chatTools',
+    path: '/recruit/enterprise/talentMap',
     component: Layout,
-    name: 'chatTools',
-    meta: {
-      title: '聊天工具',
-      enName: 'Chat Tools',
-      icon: 'mdi-bell-outline'
-    },
-    children: [
-      {
-        path: '/recruit/enterprise/chatTools',
-        show: true,
-        component: () => import('@/views/recruit/enterprise/chatTools/index.vue')
-      }
-    ]
-  },
-  {
-    path: '/recruit/enterprise/interviewManagement',
-    component: Layout,
-    name: 'interviewManagement',
+    name: 'Talent Map',
     meta: {
-      title: '面试管理',
-      enName: 'Interview management',
-      icon: 'mdi-account-multiple-check'
+      title: '人才地图',
+      enName: 'Talent Map',
+      icon: 'mdi-map-check'
     },
     children: [
       {
-        path: '/recruit/enterprise/interviewManagement',
+        path: '/recruit/enterprise/talentMap',
         show: true,
-        component: () => import('@/views/recruit/enterprise/interviewManagement/index.vue')
+        component: () => import('@/views/recruit/enterprise/talentMap/index.vue')
       }
     ]
   },
@@ -200,36 +194,6 @@ const enterprise = [
       }
     ]
   },
-  {
-    path: '/recruit/enterprise/informationManagement',
-    component: Layout,
-    redirect: '/recruit/enterprise/informationManagement/informationSettings',
-    name: 'informationManagement',
-    meta: {
-      title: '信息管理',
-      enName: 'Information Management',
-      icon: 'mdi-tune'
-    },
-    children: [
-      {
-        path: '/recruit/enterprise/informationManagement/informationSettings',
-        meta: {
-          title: '企业信息设置',
-          isAdmin: true,
-          enName: 'Enterprise Information Settings'
-        },
-        component: () => import('@/views/recruit/enterprise/informationManagement/informationSettings.vue')
-      },
-      {
-        path: '/recruit/enterprise/informationSettings',
-        meta: {
-          title: '个人信息设置',
-          enName: 'Personal information settings'
-        },
-        component: () => import('@/views/recruit/enterprise/informationSetting/index.vue')
-      }
-    ]
-  },
   {
     path: '/recruit/enterprise/systemManagement',
     component: Layout,
@@ -242,6 +206,7 @@ const enterprise = [
       isAdmin: true // 企业管理员菜单
     },
     children: [
+      // 集团 
       {
         path: '/recruit/enterprise/systemManagement/groupAccount',
         meta: {
@@ -268,6 +233,8 @@ const enterprise = [
       //   },
       //   component: () => import('@/views/recruit/enterprise/systemManagement/userManagement/index.vue')
       // },
+
+      // 岗位管理 
       {
         path: '/recruit/enterprise/systemManagement/postManagement',
         meta: {
@@ -292,6 +259,24 @@ const enterprise = [
         },
         component: () => import('@/views/recruit/enterprise/systemManagement/postManagement/save.vue')
       },
+      // 企业信息 
+      {
+        path: '/recruit/enterprise/entInfoSetting',
+        meta: {
+          title: '企业信息',
+          enName: 'Group Account '
+        },
+        component: () => import('@/views/recruit/enterprise/entInfoSetting/index.vue')
+      },
+      // 员工信息 
+      {
+        path: '/recruit/enterprise/staffInfoSetting',
+        meta: {
+          title: '员工信息',
+          enName: 'Group Account '
+        },
+        component: () => import('@/views/recruit/enterprise/staffInfoSetting/index.vue')
+      },
     ]
   },
   {

src/store/user.js

@@ -56,8 +56,10 @@ export const useUserStore = defineStore('user',
           data.account = data.phone
           passwordLogin(data).then(res => {
             if (data.isEnterprise) { // 企业邮箱登录
-              this.changeRole('emailLogin', res)
+              localStorage.setItem('emailLoginInfo', JSON.stringify(res))
+              window.location.href = '/enterpriseVerification'
             } else {
+              // 个人手机号登录
               setToken(res.accessToken)
               setRefreshToken(res.refreshToken)
               this.accountInfo = res
@@ -122,9 +124,9 @@ export const useUserStore = defineStore('user',
         localStorage.clear()
       },
       // 切换为招聘者
-      async changeRole (type, res) {
+      async changeRole (res) {
         let data
-        if (type === 'emailLogin') {
+        if (res?.type === 'emailLogin') {
           data = res
         } else {
           // 先退出个人登录
@@ -140,9 +142,9 @@ export const useUserStore = defineStore('user',
         await this.getEnterpriseInfo()
         await this.getEnterpriseUserAccountInfo()
         updateEventList(false)
-        Snackbar.success('切换成功')
+        Snackbar.success(res?.type === 'emailLogin' ? '登录成功' : '切换成功')
         await this.checkEnterpriseBaseInfo() // 校验企业必填信息
-        window.location.href = '/enterprise'
+        setTimeout(() => { window.location.href = '/enterprise' }, 1000)
       },
       // 获取当前登录的企业用户信息
       async getEnterpriseInfo () {
@@ -171,10 +173,10 @@ export const useUserStore = defineStore('user',
           const data = await getEnterpriseBaseInfo()
           // 检验必填信息
           const keyArr = ['industryId', 'financingStatus', 'scale', 'introduce', 'logoUrl'] // 必填信息列表
-          let href = '/recruit/enterprise/informationManagement/informationSettings'
+          let href = '/recruit/enterprise/entInfoSetting'
           const valid = Object.keys(data).length && keyArr.every(e => {
             const bool = data[e] && data[e] !== 0
-            if (!bool && e === 'logoUrl') href = '/recruit/enterprise/informationManagement/informationSettings?tabKey=2'
+            if (!bool && e === 'logoUrl') href = '/recruit/enterprise/entInfoSetting?tabKey=2'
             return bool
           })
           if (!valid) {

src/views/login/components/passwordPage.vue

@@ -72,6 +72,8 @@ const loginData = reactive({
 
 // 设置默认账号密码便于开发快捷登录
 if (window.location.hostname === 'localhost' || window.location.hostname === '192.168.3.152') {
+  // loginData.phone = '18400000022@qq.com'
+  // loginData.password = '12345678'
   loginData.phone = '13229740092'
   loginData.password = 'Citu123456'
 }

src/views/login/index.vue

@@ -79,7 +79,7 @@ const handleLogin = async () => {
       const isEnterprise = pattern.test(params.phone)
       params.isEnterprise = isEnterprise
     }
-    if (params.isEnterprise) router.push({ path: '/enterpriseVerification' }) // 先跳转到会使用企业token的路由
+    // if (params.isEnterprise) router.push({ path: '/enterpriseVerification' }) // 先跳转到会使用企业token的路由
     await userStore[api](params)
     // 跳转
     if (params.isEnterprise) return // 企业邮箱登录

src/views/recruit/components/message/index.vue

@@ -39,7 +39,7 @@
               color="primary"
               class="mb-2"
               :active="val.channel.channelID === info?.channel?.channelID"
-              :title="val.userInfoVo ? (val.userInfoVo.userInfoResp.name ? val.userInfoVo.userInfoResp.name : '游客') : '系统消息'"
+              :title="val.userInfoVo ? (val.userInfoVo.userInfoResp?.name ? val.userInfoVo.userInfoResp.name : '游客') : '系统消息'"
               :subtitle="timesTampChange(+val.timestamp.padEnd(13, '0'))"
             >
               <template v-slot:title="{ title }">

src/views/recruit/entRegister/register.vue

@@ -1,13 +1,10 @@
 <template>
-  <div class="login-box pb-5">
-    <div :class="isMobile? 'mobileBox' : 'default-width'">
-      <v-btn v-if="pageType === 1" class="my-2" color="black" variant="text" size="large" @click="router.go(-1)">{{ `<< 返回` }}</v-btn>
-      <v-btn v-else class="my-2" color="primary" variant="text" size="large" @click="router.push('/recruitHome')">{{ `<< 回到首页` }}</v-btn>
-    </div>
+  <div class="login-box py-5">
     <v-card class="pa-5" :class="isMobile? 'mobileBox' : 'default-width'" :elevation="isMobile? '0' : '3'">
       <!-- 标题 -->
-      <div class="resume-header">
-        <div class="resume-title">{{ $t('enterprise.registeringNewEnterprise') }}</div>
+      <div class="mt-3">
+        <v-btn v-if="pageType !== 'noLoginToRegister'" color="black" variant="text" @click="router.push('/recruitHome')">{{ `<< 回到首页` }}</v-btn>
+        <div v-else style="height: 30px;"></div>
       </div>
       <!-- 表单 -->
       <div class="CtFormClass" :style="{width: isMobile ? '' : '600px'}">
@@ -15,6 +12,8 @@
           <span class="mr-5">《审核不通过》</span>
           <span>原因：{{ failureReason }}</span>
         </div>
+        <!-- 标题 -->
+        <div class="mb-10 mt-n8" style="font-size: 22px; font-weight: bold; text-align: center;">{{ $t('enterprise.registeringNewEnterprise') }}</div>
         <CtForm ref="CtFormRef" :items="formItems" style="width: 100%;">
           <template #prepare>
             <v-checkbox
@@ -133,7 +132,7 @@ const formItems = ref({
       type: 'text',
       key: 'email',
       value: '',
-      label: '联系邮箱（可用于企业登录） *',
+      label: '联系邮箱（可用于企业招聘登录） *',
       rules: [
         value => {
           if (value) return true
@@ -150,15 +149,17 @@ const formItems = ref({
       type: 'text',
       key: 'password',
       value: '',
-      label: '设置邮箱登录密码',
-      placeholder: '若想使用邮箱登录，请设置密码'
+      label: '邮箱登录密码（用于企业招聘邮箱登录） *',
+      placeholder: '请输入邮箱登录密码（用于企业招聘邮箱登录）',
+      rules: [v => !!v || '请输入邮箱登录密码（用于企业招聘邮箱登录）']
     },
     {
       type: 'text',
       key: 'passwordConfirm',
       value: '',
-      label: '确认邮箱登录密码',
-      placeholder: '请输入与上面邮箱登录相同的密码'
+      label: '请再次输入邮箱登录密码 *',
+      placeholder: '请再次输入邮箱登录密码',
+      rules: [v => !!v || '请再次输入邮箱登录密码']
     },
     {
       type: 'textarea',

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

@@ -99,7 +99,7 @@ watch(
 // 人才详情
 const handleToPersonDetail = ({ userId, id }) => {
   if (!userId || !id) return
-  window.open(`/recruit/enterprise/resumeManagement/talentPool/details/${userId}?id=${id}`)
+  window.open(`/recruit/enterprise/talentPool/details/${userId}?id=${id}`)
 }
 
 // 入职

src/views/recruit/enterprise/resumeManagement/talentMap/index.vue → src/views/recruit/enterprise/talentMap/index.vue

@@ -98,9 +98,9 @@ const getData = async () => {
   const obj = { ...pageInfo, ...query }
   // console.log('obj', obj)
   loading.value = true
-  const { list, total: number } = await getRecruitPersonMapPage(obj)
-  total.value = number
-  dataList.value = list?.length ? dealDictArrayData([], list) : []
+  const res = await getRecruitPersonMapPage(obj)
+  total.value = res?.total ? res.total-0 : 0
+  dataList.value = res?.list?.length ? dealDictArrayData([], res?.list) : []
   loading.value = false
 }
 getData()

src/views/recruit/enterprise/resumeManagement/talentPool/index copy.vue → src/views/recruit/enterprise/talentPool/index copy.vue

@@ -105,7 +105,7 @@ import Snackbar from '@/plugins/snackbar'
 import TextUI from '@/components/FormUI/TextInput'
 import FilterPage from './components/filter.vue'
 import { dealDictArrayData } from '@/utils/position'
-import { getTalentPoolPage } from '@/api/recruit/enterprise/resumeManagement/talentPool'
+import { getTalentPoolPage } from '@/api/recruit/enterprise/talentPool'
 import { removeFormTalentPool } from '@/api/recruit/enterprise/personnel'
 
 
@@ -282,7 +282,7 @@ const openDrawer = () => {
 // 人才详情
 const talentPoolDetails = ({ userId, id }) => {
   if (!userId || !id) return
-  window.open(`/recruit/enterprise/resumeManagement/talentPool/details/${userId}?id=${id}`)
+  window.open(`/recruit/enterprise/talentPool/details/${userId}?id=${id}`)
 }
 </script>
 

src/views/recruit/enterprise/resumeManagement/talentPool/index.vue → src/views/recruit/enterprise/talentPool/index.vue

@@ -64,7 +64,7 @@ import { computed, reactive, ref } from 'vue'
 import Snackbar from '@/plugins/snackbar'
 import FilterPage from './components/filter.vue'
 import { dealDictArrayData } from '@/utils/position'
-import { getTalentPoolPage } from '@/api/recruit/enterprise/resumeManagement/talentPool'
+import { getTalentPoolPage } from '@/api/recruit/enterprise/talentPool'
 import { removeFormTalentPool } from '@/api/recruit/enterprise/personnel'
 import { timesTampChange } from '@/utils/date'
 import { getUserAvatar } from '@/utils/avatar'
@@ -82,11 +82,9 @@ const pageInfo = reactive({ pageNo: 1, pageSize: 10 })
 // 获取数据
 const getData = async () => {
   const obj = { ...pageInfo, ...query }
-  console.log('obj', obj)
-  const { list, total: number } = await getTalentPoolPage(pageInfo)
+  const { list, total: number } = await getTalentPoolPage(obj)
   total.value = number
   dataList.value = list?.length ? dealDictArrayData([], list) : []
-  console.log('items.value', dataList.value)
 }
 getData()
 
@@ -148,7 +146,7 @@ const badgeIcon = computed(() => (item) => {
 // 人才详情
 const talentPoolDetails = ({ userId, id }) => {
   if (!userId || !id) return
-  window.open(`/recruit/enterprise/resumeManagement/talentPool/details/${userId}?id=${id}`)
+  window.open(`/recruit/enterprise/talentPool/details/${userId}?id=${id}`)
 }
 </script>
 

src/views/recruit/enterprise/resumeManagement/elite/components/table.vue → src/views/recruit/enterprise/talentRecruitment/components/table.vue

@@ -117,7 +117,7 @@ watch(
 // 人才详情
 const handleToPersonDetail = ({ userId, id }) => {
   if (!userId || !id) return
-  window.open(`/recruit/enterprise/resumeManagement/talentPool/details/${userId}?id=${id}`)
+  window.open(`/recruit/enterprise/talentPool/details/${userId}?id=${id}`)
 }
 
 // 加入人才库