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

components.d.ts

@@ -20,7 +20,7 @@ declare module 'vue' {
     CtPagination: typeof import('./src/components/CtPagination/index.vue')['default']
     CtSearch: typeof import('./src/components/CtSearch/index.vue')['default']
     CtTextField: typeof import('./src/components/CtVuetify/CtTextField/index.vue')['default']
-    DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
+    DatePicker: typeof import('./src/components/FormUI/datePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/layout/company/navBar.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script setup>
-import { reactive, ref } from 'vue'
+import { ref } from 'vue'
 import { getToken } from '@/utils/auth'
 import { useUserStore } from '@/store/user'
 import { useLocaleStore } from '@/store/locale'
@@ -116,7 +116,7 @@ const items = ref([
   { title: '切换为求职者', icon: 'mdi-swap-horizontal', change: changeRole },
   { title: '退出登录', icon: 'mdi-logout', change: handleLogout }
 ])
-const baseInfo = reactive(JSON.parse(localStorage.getItem('baseInfo'))) // 人才信息
+const baseInfo = JSON.parse(localStorage.getItem('baseInfo')) // 人才信息
 </script>
 
 <style lang="scss" scoped>

src/layout/personal/navBar.vue

@@ -98,7 +98,7 @@
 </template>
 
 <script setup>
-import { reactive, ref } from 'vue'
+import { ref } from 'vue'
 import { getToken } from '@/utils/auth'
 import { useUserStore } from '@/store/user'
 import { useLocaleStore } from '@/store/locale'
@@ -164,7 +164,7 @@ const items = ref([
   { title: '切换为招聘者', icon: 'mdi-swap-horizontal', change: changeLoginType },
   { title: '退出登录', icon: 'mdi-logout', change: handleLogout }
 ])
-const baseInfo = reactive(JSON.parse(localStorage.getItem('baseInfo'))) // 人才信息
+const baseInfo = JSON.parse(localStorage.getItem('baseInfo')) // 人才信息
 
 const handleLogin = () => {
   router.push({ path: '/login' })

src/views/enterprise/positionManagement/components/baseInfo.vue

@@ -42,31 +42,6 @@ const items = ref({
       value: '辞图科技·计算机软件·广州辞图科技有限公司',
       label: '公司名称 *'
     },
-    {
-      type: 'ifRadio',
-      key: 'jobType',
-      value: '0',
-      label: '招聘类型 *',
-      dictTypeName: '',
-      items: [
-        {label: '社招全职', value: '0'},
-        {label: '应届校园招聘', value: '1'},
-        {label: '实习生招聘', value: '2'},
-        {label: '兼职招聘', value: '3'}
-      ],
-    },
-    {
-      type: 'ifRadio',
-      key: 'externallyStationed',
-      value: '2',
-      label: '是否外驻 *',
-      dictTypeName: '',
-      items: [
-        {label: '驻外岗位', value: '0'},
-        {label: '境外出差岗位', value: '1'},
-        {label: '非驻外/非境外出差岗位', value: '2'}
-      ],
-    },
     {
       type: 'text',
       key: 'name',
@@ -74,6 +49,17 @@ const items = ref({
       label: '职位名称 *',
       rules: [v => !!v || '请选择职位名称']
     },
+    {
+      type: 'autocomplete',
+      key: 'jobType',
+      value: null,
+      label: '招聘类型 *',
+      itemText: 'label',
+      itemValue: 'value',
+      dictTypeName: 'menduner_job_type',
+      rules: [v => !!v || '请选择招聘类型'],
+      items: []
+    },
     {
       slotName: 'positionId',
       key: 'positionId',

src/views/enterprise/positionManagement/components/jobRequirements.vue

@@ -8,6 +8,7 @@
 defineOptions({ name: 'position-add-job-requirements'})
 import CtForm from '@/components/CtForm'
 import { reactive, ref } from 'vue'
+// import { getDict } from '@/hooks/web/useDictionaries'
 
 const formPageRef = ref()
 const query = reactive({})
@@ -21,6 +22,8 @@ const items = ref({
       label: '最高学历 *',
       itemText: 'label',
       itemValue: 'value',
+      col: 6,
+      flexStyle: 'mr-3',
       dictTypeName: 'menduner_education_type',
       rules: [v => !!v || '请选择最高学历'],
       items: []
@@ -32,12 +35,42 @@ const items = ref({
       label: '工作经验 *',
       itemText: 'label',
       itemValue: 'value',
+      col: 6,
       dictTypeName: 'menduner_exp_type',
       rules: [v => !!v || '请选择工作经验'],
       items: []
-    }
+    },
+    {
+      type: 'text',
+      key: 'payFrom',
+      value: '',
+      col: 6,
+      flexStyle: 'mr-3',
+      label: '最低薪资 *',
+      suffix: '元',
+      rules: [v => !!v || '请填写最低薪资'],
+    },
+    {
+      type: 'text',
+      key: 'payTo',
+      value: '',
+      col: 6,
+      label: '最高薪资 *',
+      suffix: '元',
+      rules: [v => !!v || '请填写最高薪资'],
+    },
   ]
 })
+
+// 获取字典内容
+// const getDictData = async (dictTypeName) => {
+//   const item = items.value.options.find(e => e.dictTypeName === dictTypeName)
+//   if (item) {
+//     const { data } = await getDict(dictTypeName)
+//     item.items = data
+//   }
+// }
+// getDictData()
 </script>
 
 <style scoped lang="scss">