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

src/api/common/index.js

@@ -159,6 +159,13 @@ export const getAreaListData = async (params) => {
   })
 }
 
+// 获取-技能列表
+export const getSkillList = async () => {
+  return await request.get({
+    url: '/app-api/menduner/system/skill/list'
+  })
+}
+
 // 获取地区获取地区map
 export const getAreaMapData = async (params) => {
   return await request.get({

src/api/recruit/personal/resume/index.js

@@ -104,13 +104,6 @@ export const getResumeProjectExp = async () => {
   })
 }
 
-// 获取-技能列表
-export const getSkillList = async () => {
-  return await request.get({
-    url: '/app-api/menduner/system/skill/list'
-  })
-}
-
 // 获取-技能树形
 export const getSkillTree = async () => {
   return await request.get({

src/hooks/web/useDictionaries.js

@@ -1,6 +1,7 @@
 import {
   getDictData,
   getIndustryListData,
+  getSkillList,
   getIndustryTreeData,
   getAreaListData,
   getAreaMapData,
@@ -39,6 +40,7 @@ export const getDict = (type, params, apiType = 'dict') => {
         areaTreeData: getAreaTreeData, // 区域tree
         industryTreeData: getIndustryTreeData, // 行业tree
         industryList: getIndustryListData,
+        skillList: getSkillList,
         areaList: getAreaListData,
         areaMap: getAreaMapData,
         positionData: getPositionData

src/views/recruit/enterprise/talentPool/components/details.vue

@@ -77,13 +77,13 @@ import { useRouter, useRoute } from 'vue-router'
 
 const route = useRoute()
 const router = useRouter()
-const operateItems = [
-  { text: '邀请面试', icon: 'mdi-account-check' },
-  { text: '不合适', icon: 'mdi-close-circle-outline' },
-  { text: '发起对话', icon: 'mdi-chat-processing-outline' },
-  { text: '加入人才库', icon: 'mdi-tab-plus' },
-  { text: '操作记录', icon: 'mdi-clock-edit-outline' },
-]
+// const operateItems = [
+//   { text: '邀请面试', icon: 'mdi-account-check' },
+//   { text: '不合适', icon: 'mdi-close-circle-outline' },
+//   { text: '发起对话', icon: 'mdi-chat-processing-outline' },
+//   { text: '加入人才库', icon: 'mdi-tab-plus' },
+//   { text: '操作记录', icon: 'mdi-clock-edit-outline' },
+// ]
 
 // 获取人才详情
 const cvData = ref({})

src/views/recruit/enterprise/talentPool/components/details/jobIntention.vue

@@ -10,7 +10,7 @@
         <div class="line">|</div>
         <div>{{k.payFrom}}-{{k.payTo}}</div>
         <div class="line">|</div>
-        <div class="grey-text text-box">{{ k.industry.map(e => e.nameCn).join('、') }}</div>
+        <div class="grey-text text-box">{{ k.industry?.map(e => e.nameCn).join('、') }}</div>
         <div class="line">|</div>
         <div class="grey-text">{{ k.jobTypeName }}</div>
         <div class="line" v-if="k.jobTypeName && k.workArea">|</div>

src/views/recruit/enterprise/talentPool/components/details/vocationalSkills.vue

@@ -15,7 +15,6 @@
 <script setup>
 import { getText } from '@/utils/getText'
 import { getDict } from '@/hooks/web/useDictionaries'
-import { getSkillList } from '@/api/recruit/personal/resume'
 import { ref } from 'vue'
 defineOptions({name: 'enterprise-talentPool-details-vocationalSkills'})
 const props = defineProps({
@@ -32,12 +31,11 @@ getDict('menduner_skill_level').then(({ data }) => { // 字典
 })
 
 const skillList = ref([])
-// 获取 职业技能列表（一维数组回显用）
-const getSkillListFunc = async () => {
-  const data = await getSkillList()
-  skillList.value = data || []
-}
-getSkillListFunc()
+getDict('skillList', {}, 'skillList').then(({ data }) => { // 字典
+  data = data?.length && data || []
+  skillList.value = data
+})
+
 
 </script>
 <style lang="scss" scoped>

src/views/recruit/personal/remuse/components/vocationalSkills.vue

@@ -36,7 +36,7 @@
 
 <script setup name="vocationalSkills">
 import { ref } from 'vue'
-import { saveResumePersonSkill, getResumePersonSkill, deleteResumePersonSkill, getSkillList, getSkillTree,  } from '@/api/recruit/personal/resume'
+import { saveResumePersonSkill, getResumePersonSkill, deleteResumePersonSkill, getSkillTree,  } from '@/api/recruit/personal/resume'
 import CtForm from '@/components/CtForm'
 import Snackbar from '@/plugins/snackbar'
 import Confirm from '@/plugins/confirm'
@@ -82,12 +82,10 @@ const formItems = ref({
 })
 
 const skillList = ref([])
-// 获取 职业技能列表（一维数组回显用）
-const getSkillListFunc = async () => {
-  const data = await getSkillList()
-  skillList.value = data || []
-}
-getSkillListFunc()
+getDict('skillList', {}, 'skillList').then(({ data }) => { // 字典
+  data = data?.length && data || []
+  skillList.value = data
+})
 
 // 获取 职业技能选项
 const getSkillTreeFunc = async () => {