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

src/hooks/web/useDictionaries.js

@@ -13,9 +13,6 @@ import { getSecondNodes } from '@/utils/dealData'
 
 // const setDict = (type, val, cacheTime = 7200) => {
 const setDict = (type, val) => {
-  if (type === 'positionSecondData') {
-    val = getSecondNodes(val)
-  }
   // 一小时过期
   const currentTime = new Date()
   currentTime.setTime(currentTime.getTime() + 3600 * 1000)
@@ -62,6 +59,9 @@ export const getDict = (type, params, apiType = 'dict') => {
             return e
           }) : []
         }
+        if (type === 'positionSecondData') {
+          data = getSecondNodes(data)
+        }
         setDict(type, data)
         resolve({ data })
       })

src/plugins/necessaryInfo/components/infoForm.vue

@@ -18,7 +18,6 @@ const props = defineProps({
   }
 })
 const setInfo = ref(props.option?.setInfo ? props.option.setInfo : {})
-// console.log(1, 'setInfo', setInfo)
 const formPageRef = ref()
 let query = reactive({})
 
@@ -48,7 +47,17 @@ const items = ref({
       default: null,
       label: '姓名 *',
       outlined: true,
-      rules: [v => !!v || '请输入姓名']
+      rules: [
+        value => {
+          if (value) return true
+          return '请输入您的中文名'
+        },
+        value => {
+          var regex = /^[\u4e00-\u9fa5]+$/
+          if (regex.test(value)) return true
+          return '请输入正确的中文名'
+        }
+      ]
     },
     {
       type: 'autocomplete',
@@ -74,7 +83,7 @@ const items = ref({
       key: 'email',
       value: null,
       default: null,
-      label: '常用邮箱',
+      label: '常用邮箱 *',
       outlined: true,
       rules: [
         value => {

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

@@ -251,19 +251,24 @@ const items = ref({
       key: 'phone',
       value: userInfo?.value?.phone || '',
       default: null,
-      label: '电话号码',
+      label: '电话号码 *',
       col: 6,
-      outlined: true
+      outlined: true,
+      rules: [v => !!v || '请填写联系手机号']
     },
     {
       type: 'text',
       key: 'email',
       value: null,
       default: null,
-      label: '常用邮箱',
+      label: '常用邮箱 *',
       col: 6,
       outlined: true,
       rules: [
+        value => {
+          if (value) return true
+          return '请输入联系邮箱'
+        },
         value => {
           if (value && !checkEmail(value)) return '请输入正确的电子邮箱'
           return true