Ver código fonte

有些字典params传{},有些只能传null

lifanagju_citu 11 meses atrás
pai
commit
64492f6e0a
2 arquivos alterados com 5 adições e 4 exclusões
  1. 3 3
      src/store/user.js
  2. 2 1
      src/utils/getText.js

+ 3 - 3
src/store/user.js

@@ -63,7 +63,7 @@ export const useUserStore = defineStore('user',
       try {
         const data = await getBaseInfo({ userId: userId || accountInfo.userId })
         baseInfo = await getFieldText(data)
-        // console.log('baseInfo->', baseInfo)
+        console.log('baseInfo->', baseInfo)
         localStorage.setItem('baseInfo', JSON.stringify(baseInfo))
       } catch (error) {
         Snackbar.error(error.msg)
@@ -76,8 +76,8 @@ export const useUserStore = defineStore('user',
       if (data.areaId && data.areaId !== 0) await getBaseInfoDictOfName(0, data, data.areaId, 'areaName') // 现居住地text
       if (data.eduType && data.eduType !== 0) await getBaseInfoDictOfName(1, data, data.eduType, 'eduTypeText') // 学历
       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.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) // 	求职状态
       return data

+ 2 - 1
src/utils/getText.js

@@ -19,7 +19,8 @@ export const getBaseInfoDictOfName = async (index = 0, baseInfo, value, addKeyNa
   const e = test[index]
 
   if (!value && value !== 0 && !e) baseInfo[addKeyName] = '暂无'
-  const { data } = await getDict(e.dictType, {}, (e.saveType || e.dictType))
+  const params = e.saveType === 'dict' ? null : {}
+  const { data } = await getDict(e.dictType, params, (e.saveType || e.dictType))
   const item = data.find(formItem => Number(formItem[e.itemValue]) === Number(value))
   baseInfo[addKeyName] = item ? item[e.itemText] : '暂无'
 }