Przeglądaj źródła

求职状态、婚姻状态改为字典数据

lifanagju_citu 11 miesięcy temu
rodzic
commit
9ea8b73af1

+ 2 - 24
src/store/user.js

@@ -77,32 +77,10 @@ export const useUserStore = defineStore('user',
       if (data.expType && data.expType !== 0) await getBaseInfoDictOfName(2, data, data.expType, 'expTypeText') // 工作经验
       if (data.sex && data.sex !== 0) await getBaseInfoDictOfName(3, data, data.sex, 'sexTypeText') // 性别
       if (data.jobType && data.jobType !== 0) await getBaseInfoDictOfName(4, data, data.jobType, 'jobTypeText') // 求职类型
-      if (data.maritalStatus && data.maritalStatus !== 0) await getMaritalText(data, data.maritalStatus) // 	婚姻状况
-      if (data.jobStatus && data.jobStatus !== 0) await getJobStatusText(data, data.jobStatus) // 	求职状态
+      if (data.jobStatus && data.jobStatus !== 0) await getBaseInfoDictOfName(5, data, data.jobStatus, 'jobStatusText') // 	求职状态
+      if (data.maritalStatus && data.maritalStatus !== 0) await getBaseInfoDictOfName(6, data, data.maritalStatus, 'maritalText') // 	婚姻状况
       return data
     }
-    const getMaritalText = async (data, value) => { // 字典未加上,暂时的
-      const items = [
-        { label: '未婚', value: '0' },
-        { label: '已婚', value: '1' },
-        { label: '离异', value: '2' },
-        { label: '保密', value: '3' }
-      ]
-      const obj = items.find(e => e.value === value)
-      const str = obj ? obj.label : '暂无'
-      data.maritalText = str
-    }
-    const getJobStatusText = async (data, value) => { // 字典未加上,暂时的
-      const items = [
-        { label: '离职-随时到岗', value: '0' },
-        { label: '在职-月内到岗', value: '1' },
-        { label: '在职-考虑机会', value: '2' },
-        { label: '在职-暂不考虑', value: '3' }
-      ]
-      const obj = items.find(e => e.value === value)
-      const str = obj ? obj.label : '暂无'
-      data.jobStatusText = str
-    }
 
     // 退出登录
     const userLogout = async () => {

+ 3 - 1
src/utils/getText.js

@@ -15,6 +15,8 @@ export const getBaseInfoDictOfName = async (index = 0, baseInfo, value, addKeyNa
     { dictType: 'menduner_exp_type', itemText: 'label', itemValue: 'value' },
     { dictType: 'system_user_sex', itemText: 'label', itemValue: 'value', saveType: 'dict' },
     { dictType: 'menduner_job_type', itemText: 'label', itemValue: 'value', saveType: 'dict' },
+    { dictType: 'menduner_job_status', itemText: 'label', itemValue: 'value', saveType: 'dict' },
+    { dictType: 'menduner_marital_status', itemText: 'label', itemValue: 'value', saveType: 'dict' },
   ]
   const e = test[index]
 
@@ -25,7 +27,7 @@ export const getBaseInfoDictOfName = async (index = 0, baseInfo, value, addKeyNa
   baseInfo[addKeyName] = item ? item[e.itemText] : '暂无'
 }
 
-// export const getBaseInfoDictOfName = async (baseInfo, value, addKey, itemText = 'name', itemValue = 'id') => { // 一维数组
+// export const getBaseInfoDictOfName1 = async (baseInfo, value, addKey, itemText = 'name', itemValue = 'id') => { // 一维数组
 //   if (!value && value !== 0) baseInfo[addKey] = '暂无'
 //   const { data } = await getDict('menduner_area_type', {}, 'areaList')
 //   const item = data.find(formItem => Number(formItem[itemValue]) === Number(value))

+ 7 - 6
src/views/PersonalCenter/dynamic/left.vue

@@ -62,6 +62,7 @@
 </template>
 
 <script setup>
+import { getDict } from '@/hooks/web/useDictionaries'
 defineOptions({ name: 'personal-center-left'})
 import { ref } from 'vue'
 import PositionItem from '../components/posiitonItem.vue'
@@ -69,12 +70,12 @@ import PositionItem from '../components/posiitonItem.vue'
 const tab = ref(1)
 const secondTab = ref(7)
 const selectVal = ref('0')
-const items = [
-  { label: '离职-随时到岗', value: '0' },
-  { label: '在职-暂不考虑', value: '1' },
-  { label: '在职-考虑机会', value: '2' },
-  { label: '在职-月内到岗', value: '3' }
-]
+const items = ref([])
+
+getDict('menduner_job_status').then(({ data }) => {
+  data = data?.length && data || []
+  items.value = data
+})
 
 let baseInfo = ref({})
 const getBasicInfo = () => {

+ 4 - 12
src/views/resume/components/basicInfo.vue

@@ -286,13 +286,9 @@ const formItems = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
+      dictTypeName: 'menduner_job_status',
       rules: [v => !!v || '请选择求职状态'],
-      items: [
-        { label: '离职-随时到岗', value: '0' },
-        { label: '在职-月内到岗', value: '1' },
-        { label: '在职-考虑机会', value: '2' },
-        { label: '在职-暂不考虑', value: '3' }
-      ]
+      items: []
     },
     {
       type: 'autocomplete',
@@ -304,13 +300,9 @@ const formItems = ref({
       outlined: true,
       itemText: 'label',
       itemValue: 'value',
+      dictTypeName: 'menduner_marital_status',
       rules: [v => !!v || '请选择婚姻状况'],
-      items: [
-        { label: '未婚', value: '0' },
-        { label: '已婚', value: '1' },
-        { label: '离异', value: '2' },
-        { label: '保密', value: '3' }
-      ]
+      items: []
     },
     {
       type: 'datePicker',