Jelajahi Sumber

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

lifanagju_citu 7 bulan lalu
induk
melakukan
098b0f7705
31 mengubah file dengan 45 tambahan dan 159 penghapusan
  1. 1 1
      index.html
  2. 1 1
      src/layout/company/slider.vue
  3. 1 1
      src/layout/index.vue
  4. 3 3
      src/layout/personal/footer.vue
  5. 2 2
      src/layout/personal/navBar.vue
  6. 1 1
      src/layout/personal/slider.vue
  7. 1 1
      src/store/dict.js
  8. 1 1
      src/utils/getText.js
  9. 1 1
      src/utils/position.js
  10. 1 1
      src/utils/statisticsHeaders.js
  11. 1 1
      src/views/entrances/components/slider.vue
  12. 4 4
      src/views/headhunting/components/contact.vue
  13. 0 1
      src/views/headhunting/components/content.vue
  14. 1 2
      src/views/headhunting/components/serviceContent.vue
  15. 1 1
      src/views/headhunting/details.vue
  16. 1 1
      src/views/headhunting/drill/article.vue
  17. 2 2
      src/views/headhunting/drill/consultant.vue
  18. 2 2
      src/views/headhunting/drill/service.vue
  19. 1 1
      src/views/headhunting/index.vue
  20. 1 1
      src/views/headhunting/service.vue
  21. 2 2
      src/views/recruit/components/message/index.vue
  22. 9 2
      src/views/recruit/enterprise/interviewManagement/components/invite.vue
  23. 1 1
      src/views/recruit/enterprise/personnelManagement/components/screen.vue
  24. 0 117
      src/views/recruit/enterprise/resume/components/public.vue
  25. 1 1
      src/views/recruit/enterprise/resume/components/screen.vue
  26. 0 2
      src/views/recruit/enterprise/resume/components/table.vue
  27. 1 1
      src/views/recruit/enterprise/systemManagement/groupAccount/components/simplePageForm.vue
  28. 1 1
      src/views/recruit/enterprise/talentMap/components/filter copy.vue
  29. 1 1
      src/views/recruit/enterprise/talentPool/components/filter.vue
  30. 1 1
      src/views/recruit/personal/PersonalCenter/resume/online/components/basicInfo.vue
  31. 1 1
      src/views/recruit/personal/shareJob/form/simpleInfo.vue

+ 1 - 1
index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN">
 
 <head>
   <meta charset="UTF-8" />

+ 1 - 1
src/layout/company/slider.vue

@@ -6,7 +6,7 @@
         <v-tooltip :text="item.tips" location="start" activator="parent">
           <div v-if="item.showImg" class="ma-3" style="text-align: center">
             <v-img cover aspect-ratio="1/1" src="https://minio.citupro.com/dev/menduner/official-account-code4.jpg" :width="170" style="height: 170px;"></v-img>
-            <span class="tips-text">关注门墩儿微信公众号</span>
+            <span class="tips-text">关注menduner公众号</span>
           </div>
           <span v-else>{{ item.tips }}</span>
         </v-tooltip>

+ 1 - 1
src/layout/index.vue

@@ -19,7 +19,7 @@ defineOptions({ name: 'personal-layout-index' })
 
 // 不展示侧边栏名单
 const whiteList = ['/login', '/privacyPolicy', '/userAgreement', '/register', '/recruit/personal/advertisement/introduce']
-const footerWhiteList = ['/recruit/personal/message', '/recruit/personal/advertisement/introduce', '/about']
+const footerWhiteList = ['/recruit/personal/message', '/recruit/personal/advertisement/introduce', '/about', '/headhunting', '/headhunting/service', '/headhunting/service/details']
 const router = useRouter()
 
 const sharedState = useSharedState()

+ 3 - 3
src/layout/personal/footer.vue

@@ -17,13 +17,13 @@
         </div>
       </div>
       <div class="right size d-flex">
-        <div>
+        <div class="d-flex flex-column align-center">
           <v-img :width="100" cover aspect-ratio="16/9" src="https://minio.citupro.com/dev/menduner/official-account-code4.jpg" style="height: 100px;"></v-img>
-          <div class="mt-2" style="text-align: center;">微信公众号</div>
+          <div class="mt-2">关注menduner公众号</div>
         </div>
         <div class="ml-5">
           <v-img :width="100" cover aspect-ratio="16/9" src="https://minio.citupro.com/dev/menduner/miniProgram.jpg" style="height: 100px;"></v-img>
-          <div class="mt-2" style="text-align: center;">小程序</div>
+          <div class="mt-2" style="text-align: center;">微信小程序</div>
         </div>
       </div>
     </div>

+ 2 - 2
src/layout/personal/navBar.vue

@@ -7,8 +7,9 @@
     >
       <div class="innerBox d-flex justify-space-between">
         <div>
-          <div class="nav-logo mr-5 mt-1 cursor-pointer" @click="router.push('/recruitHome')">
+          <div class="nav-logo mr-3 mt-1 cursor-pointer d-flex align-center" @click="router.push('/recruitHome')">
             <v-img src="../../assets/logo.png"  aspect-ratio="16/9" cover :width="90" style="height: 40px"></v-img>
+            <span class="ml-2" style="margin-top: 6px;" :class="{'active-route' : route.path === '/recruitHome'}">首页</span>
           </div>
           <!-- <div class="nav-city">
             <p class="nav-city-box">
@@ -99,7 +100,6 @@
             <message-notification v-if="showBall" :path="paths[3]" class="commonHover2" :class="{'active-route': routeActive === 3}"></message-notification>
           </div>
         </div>
-        
       </div>
     </v-toolbar>
 

+ 1 - 1
src/layout/personal/slider.vue

@@ -6,7 +6,7 @@
         <v-tooltip :text="item.tips" location="start" activator="parent">
           <div v-if="item.showImg" class="ma-3" style="text-align: center">
             <v-img cover aspect-ratio="1/1" src="https://minio.citupro.com/dev/menduner/official-account-code4.jpg" :width="170" style="height: 170px;"></v-img>
-            <span class="tips-text">关注门墩儿微信公众号</span>
+            <span class="tips-text">关注menduner公众号</span>
           </div>
           <span v-else>{{ item.tips }}</span>
         </v-tooltip>

+ 1 - 1
src/store/dict.js

@@ -12,7 +12,7 @@ const list = [
   { type: 'menduner_exp_type' },
   { type: 'menduner_sex' },
   { type: 'menduner_job_type' },
-  { type: 'menduner_job_status' },
+  { type: 'menduner_job_seek_status' },
   { type: 'menduner_marital_status' },
   { type: 'menduner_pay_unit' },
   { type: 'menduner_financing_status' },

+ 1 - 1
src/utils/getText.js

@@ -15,7 +15,7 @@ export const getBaseInfoDictOfName = async (index = 0, baseInfo, value, addKeyNa
     { dictType: 'menduner_exp_type', itemText: 'label', itemValue: 'value' },
     { dictType: 'menduner_sex', itemText: 'label', itemValue: 'value' },
     { dictType: 'menduner_job_type', itemText: 'label', itemValue: 'value' },
-    { dictType: 'menduner_job_status', itemText: 'label', itemValue: 'value' },
+    { dictType: 'menduner_job_seek_status', itemText: 'label', itemValue: 'value' },
     { dictType: 'menduner_marital_status', itemText: 'label', itemValue: 'value' },
   ]
   const e = test[index]

+ 1 - 1
src/utils/position.js

@@ -17,7 +17,7 @@ const dictList = ref([
   { type: 'menduner_pay_unit', value: 'payUnit', key: 'payUnit', label: 'payName' },
   { type: 'menduner_financing_status', value: 'financing', key: 'financingStatus', label: 'financingName' },
   { type: 'menduner_scale', value: 'scale', key: 'scale', label: 'scaleName' },
-  { type: 'menduner_job_status', value: 'jobStatus', key: 'jobStatus', label: 'jobStatusName' },
+  { type: 'menduner_job_seek_status', value: 'jobStatus', key: 'jobStatus', label: 'jobStatusName' },
   { type: 'menduner_marital_status', value: 'marital', key: 'maritalStatus', label: 'maritalStatusName' },
   { type: 'menduner_industry_type', value: 'industry', key: 'industryId', label: 'industryName', params: {}, apiType: 'industryList', nameKey: 'nameCn', valueKey: 'id' },
   { type: 'menduner_education_type', value: 'edu', key: 'eduType', label: 'eduName' },

+ 1 - 1
src/utils/statisticsHeaders.js

@@ -3,7 +3,7 @@ import { getDict } from '@/hooks/web/useDictionaries'
 
 // 求职状态
 let jobStatus = []
-getDict('menduner_job_status').then(({data}) => {
+getDict('menduner_job_seek_status').then(({data}) => {
   jobStatus = data
 })
 

+ 1 - 1
src/views/entrances/components/slider.vue

@@ -6,7 +6,7 @@
         <v-tooltip :text="item.tips" location="start" activator="parent">
           <div v-if="item.showImg" class="ma-3" style="text-align: center">
             <v-img cover aspect-ratio="1/1" src="https://minio.citupro.com/dev/menduner/official-account-code4.jpg" :width="170" style="height: 170px;"></v-img>
-            <span class="tips-text">关注门墩儿微信公众号</span>
+            <span class="tips-text">关注menduner公众号</span>
           </div>
           <span v-else>{{ item.tips }}</span>
         </v-tooltip>

+ 4 - 4
src/views/headhunting/components/contact.vue

@@ -18,7 +18,7 @@
             <div style="width: 120px; height: 120px; margin: auto;">
               <v-img class="ml-2" cover aspect-ratio="1/1" src="https://minio.citupro.com/dev/menduner/official-account-code4.jpg" width="120" height="120"></v-img>
             </div>
-            <div class="tips-text ml-4">门墩儿公众号</div>
+            <div class="font-size-15 ml-4 mt-1">关注menduner公众号</div>
           </div>
         </div>
       </div>
@@ -40,7 +40,7 @@ defineOptions({ name: 'contactPage'})
 }
 .social-media {
   margin: auto;
-  margin-bottom: 100px;
+  padding-bottom: 100px;
   &-header {
     position: relative;
     text-transform: uppercase;
@@ -69,8 +69,8 @@ defineOptions({ name: 'contactPage'})
     width: 50%;
     color: #4c4c4e;
     .social-contact {
-      padding: 28px 26px;
-      background-color: #f5f7f9;
+      padding: 20px 20px;
+      background-color: #e8f0f7;
     }
   }
   .right {

+ 0 - 1
src/views/headhunting/components/content.vue

@@ -40,7 +40,6 @@
         <div v-for="(val, i) in consultant" :key="i" class="consultant-item" @click="handleClick('consultant', val.id)">
           <div class="consultant-item__img" :style="{'background-image': `url('${val.avatar}')`, 'width': '100%', 'height': '100%' }"></div>
           <div class="consultant-item__name">{{ val.enName }}</div>
-          <p class="consultant-item__country">{{ val.country }}</p>
         </div>
       </div>
     </div>

+ 1 - 2
src/views/headhunting/components/serviceContent.vue

@@ -14,8 +14,7 @@
     <div class="common-width service">
       <h2>我们的服务</h2>
       <div class="d-flex font-size-16 content-box mt-5">
-        <div>凭借全方位服务及在各行业、职能和地域等方面的深厚专业知识,我们协助企业建立高绩效的董事会及执行团队,并帮助其提升效率,为企业带来实质性变化。</div>
-        <div class="ml-15">我们通过提供专业见解,与您携手制定可靠的领导力决策,打造成绩斐然、充满活力的成长型企业。</div>
+        我们深知卓越的领导力是企业业绩增长的关键。我们专注于为企业提供精准的人才洞见,助力企业在人才招聘、培养和晋升方面做出明智选择,从而优化高管团队的整体表现,推动企业持续发展。
       </div>
       <div class="service-content mt-5">
         <div class="service-item" v-for="(item, index) in service" :key="index" 

+ 1 - 1
src/views/headhunting/details.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <navBar @click="handleClickNav"></navBar>
-    <div>
+    <div class="white-bgc">
       <service v-if="query.type === 'service' || query.type === 'industry'" :id="query.key" :type="query.type" class="content-box"></service>
       <consultant v-if="query.type === 'consultant'" :id="query.key" class="content-box"></consultant>
       <ArticleDrill v-if="query.type === 'article'" :id="query.key"></ArticleDrill>

+ 1 - 1
src/views/headhunting/drill/article.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="color: #4c4c4e;">
+  <div style="color: #4c4c4e; height: calc(100vh - 151px);">
     <div v-if="data.isBgFull" class="bg-full" :style="{'background-image': `url('${data.bgUrl}')`}">
       <div class="width content-box">
         <h1>{{ data.title }}</h1>

+ 2 - 2
src/views/headhunting/drill/consultant.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="color: #4c4c4e;">
-    <div class="mt-5">
+    <div class="pt-5">
       <v-breadcrumbs :items="paths" class="pa-0 ma-0"></v-breadcrumbs>
     </div>
     <div class="d-flex mt-10 justify-space-between">
@@ -11,7 +11,7 @@
       <div class="mt-10">
         <h1 class="name">{{ data.title }}</h1>
         <p class="tips mt-3">Consultant</p>
-        <p class="country">{{ data.country }}</p>
+        <!-- <p class="country">{{ data.country }}</p> -->
         <ul v-if="data?.edu" class="mt-5">
           <li v-for="(edu, index) in data.edu" :key="index">{{ edu }}</li>
         </ul>

+ 2 - 2
src/views/headhunting/drill/service.vue

@@ -1,6 +1,6 @@
 <template>
-  <div style="color: #4c4c4e;">
-    <div class="mt-5">
+  <div style="color: #4c4c4e; height: calc(100vh - 151px);">
+    <div class="pt-5">
       <v-breadcrumbs :items="paths" class="pa-0 ma-0"></v-breadcrumbs>
     </div>
     <h1 class="my-5">{{ data.title }}</h1>

+ 1 - 1
src/views/headhunting/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="white-bgc">
     <navBar @click="handleClickNav"></navBar>
     <Content></Content>
   </div>

+ 1 - 1
src/views/headhunting/service.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="white-bgc">
     <navBar @click="handleClickNav"></navBar>
     <Content></Content>
   </div>

+ 2 - 2
src/views/recruit/components/message/index.vue

@@ -143,18 +143,18 @@
     <div class="color-666" style="font-size: 13px;">* 仅支持.doc, .docx, .pdf文件</div>
   </CtDialog>
 
+  <!-- 面试邀请 -->
   <CtDialog :visible="showInvite" :widthType="2" titleClass="text-h6" title="邀请面试" @close="showInvite = false" @submit="handleSubmit">
     <InvitePage v-if="showInvite" ref="inviteRef" :item-data="itemData" :position="positionList"></InvitePage>
   </CtDialog>
 
+  <!-- 选择附件简历投递 -->
   <CtDialog :visible="showResume" :widthType="2" titleClass="text-h6" title="发送简历" @close="showResume = false; selectResume = null " @submit="handleSubmitResume">
-    
     <div style="position: relative; min-height: 200px">
       <v-radio-group v-model="selectResume">
         <v-radio v-for="val in resumeList" :key="val.id" :value="val.id" :label="val.title" color="primary"></v-radio>
       </v-radio-group>
     </div>
-    
   </CtDialog>
 </template>
 

+ 9 - 2
src/views/recruit/enterprise/interviewManagement/components/invite.vue

@@ -39,6 +39,12 @@ const disabledDates = (date) => {
   return date.getTime() < currentDate.getTime()
 }
 
+const handleChangeJob = (e) => {
+  const obj = props.position.find(item => item.value === e)
+  if (!obj && !obj?.data) return
+  formItems.value.options.find(k => k.key === 'address').value = obj.data?.address
+}
+
 const CtFormRef = ref()
 const formItems = ref({
   options: [
@@ -58,7 +64,8 @@ const formItems = ref({
       itemText: 'label',
       itemValue: 'value',
       rules: [v => !!v || '请选择招聘职位'],
-      items: props.position
+      items: props.position,
+      change: handleChangeJob
     },
     {
       type: 'text',
@@ -70,7 +77,7 @@ const formItems = ref({
     {
       type: 'text',
       key: 'invitePhone',
-      value: null,
+      value: localStorage.getItem('entBaseInfo') ? JSON.parse(localStorage.getItem('entBaseInfo')).phone : '',
       label: '联系电话 *',
       outlined: true,
       rules: [v => !!v || '请填写联系电话']

+ 1 - 1
src/views/recruit/enterprise/personnelManagement/components/screen.vue

@@ -68,7 +68,7 @@ const list = ref([
     title: '求职状态',
     defaultTitle: '求职状态',
     key: 'jobStatus',
-    dictTypeName: 'menduner_job_status',
+    dictTypeName: 'menduner_job_seek_status',
     selected: [],
     items: []
   }

+ 0 - 117
src/views/recruit/enterprise/resume/components/public.vue

@@ -1,117 +0,0 @@
-<template>
-  <CtForm ref="CtFormRef" :items="formItems" style="height: 520px;">
-    <template #time="{ item }">
-      <VueDatePicker 
-        v-model="item.value"
-        placeholder="面试时间 *"
-        class="mb-4"
-        model-type="timestamp"
-        select-text="确认"
-        cancel-text="取消"
-        :time-picker-inline="true"
-        locale="zh-CN"
-        :text-input="{ format: 'MM.dd.yyyy HH:mm' }" />
-    </template>
-  </CtForm>
-</template>
-
-<script setup>
-defineOptions({ name: 'invite-public'})
-import { ref } from 'vue'
-
-const props = defineProps({
-  itemData: {
-    type: Object,
-    default: () => {}
-  }
-})
-
-const CtFormRef = ref()
-const formItems = ref({
-  options: [
-    {
-      type: 'ifRadio',
-      key: 'type',
-      value: '0',
-      label: '发送方式 *',
-      width: 90,
-      items: [
-        { label: '短信', value: '0' },
-        { label: '邮箱', value: '1' }
-      ]
-    },
-    {
-      slotName: 'time',
-      key: 'time',
-      value: null,
-      rules: [v => !!v || '请选择面试时间'],
-    },
-    {
-      type: 'text',
-      key: 'position',
-      value: '',
-      noParam: true,
-      disabled: true,
-      label: '面试岗位'
-    },
-    {
-      type: 'text',
-      key: 'address',
-      value: '',
-      label: '面试地点 *',
-      rules: [v => !!v || '请输入面试地点'],
-    },
-    {
-      type: 'text',
-      key: 'invitePhone',
-      value: null,
-      label: '联系电话 *',
-      outlined: true,
-      rules: [v => !!v || '请填写联系电话']
-    },
-    {
-      type: 'textarea',
-      key: 'remark',
-      value: '',
-      label: '备注事项',
-      counter: 140,
-      rules: [
-        value => {
-          if (value?.length <= 140) return true
-          return '请输入备注事项,最多140字'
-        }
-      ]
-    }
-  ]
-})
-
-if (Object.keys(props.itemData).length) {
-  const obj = formItems.value.options.find(e => e.key === 'position')
-  obj.value = `${props.itemData?.job?.name}${props.itemData?.job?.areaName ? '_' + props.itemData?.job?.areaName : ''} ${props.itemData?.job?.payFrom ? props.itemData?.job?.payFrom + '-' : ''}${props.itemData?.job?.payTo}${props.itemData?.job?.payName ? '/' + props.itemData?.job?.payName : ''}`
-  formItems.value.options.find(e => e.key === 'address').value = props.itemData.job?.address
-}
-
-const getQuery = () => {
-  const obj = {
-    type: 1,
-    jobId: props.itemData.job.id,
-    userId: props.itemData.userId,
-    latitude: props.itemData.job?.latitude,
-    longitude: props.itemData.job?.longitude
-  }
-  formItems.value.options.forEach(item => {
-    if (item.noParam) return
-    obj[item.key] = item.value
-  })
-  return obj
-}
-
-defineExpose({
-  CtFormRef,
-  getQuery
-})
-</script>
-
-<style scoped lang="scss">
-
-</style>

+ 1 - 1
src/views/recruit/enterprise/resume/components/screen.vue

@@ -75,7 +75,7 @@ const list = ref([
     title: '求职状态',
     defaultTitle: '求职状态',
     key: 'jobStatus',
-    dictTypeName: 'menduner_job_status',
+    dictTypeName: 'menduner_job_seek_status',
     selected: [],
     items: []
   }

+ 0 - 2
src/views/recruit/enterprise/resume/components/table.vue

@@ -44,7 +44,6 @@
     <!-- 邀请面试 -->
     <CtDialog :visible="showInvite" :widthType="2" titleClass="text-h6" title="面试信息" @close="handleEditClose" @submit="handleEditSubmit">
       <InvitePage v-if="showInvite" ref="inviteRef" :itemData="itemData"></InvitePage>
-      <!-- <PublicPage v-if="showInvite && inviteType" ref="publicRef" :item-data="itemData"></PublicPage> -->
     </CtDialog>
   </div>
 </template>
@@ -63,7 +62,6 @@ import InvitePage from './invite.vue'
 import { getUserAvatar } from '@/utils/avatar'
 import { talkToUser, defaultTextEnt } from '@/hooks/web/useIM'
 import { useRouter } from 'vue-router'; const router = useRouter()
-// import PublicPage from './public.vue'
 
 const { t } = useI18n()
 const emit = defineEmits(['refresh'])

+ 1 - 1
src/views/recruit/enterprise/systemManagement/groupAccount/components/simplePageForm.vue

@@ -40,7 +40,7 @@ const items = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
-      dictTypeName: 'menduner_job_status',
+      dictTypeName: 'menduner_job_seek_status',
       rules: [v => !!v || '请选择求职状态'],
       items: []
     },

+ 1 - 1
src/views/recruit/enterprise/talentMap/components/filter copy.vue

@@ -169,7 +169,7 @@ const formItems = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
-      dictTypeName: 'menduner_job_status',
+      dictTypeName: 'menduner_job_seek_status',
       items: []
     },
     {

+ 1 - 1
src/views/recruit/enterprise/talentPool/components/filter.vue

@@ -234,7 +234,7 @@ const formItems = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
-      dictTypeName: 'menduner_job_status',
+      dictTypeName: 'menduner_job_seek_status',
       items: []
     },
     {

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

@@ -312,7 +312,7 @@ const items = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
-      dictTypeName: 'menduner_job_status',
+      dictTypeName: 'menduner_job_seek_status',
       rules: [v => !!v || '请选择求职状态'],
       items: []
     },

+ 1 - 1
src/views/recruit/personal/shareJob/form/simpleInfo.vue

@@ -40,7 +40,7 @@ const items = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
-      dictTypeName: 'menduner_job_status',
+      dictTypeName: 'menduner_job_seek_status',
       rules: [v => !!v || '请选择求职状态'],
       items: []
     },