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

components.d.ts

@@ -30,9 +30,9 @@ declare module 'vue' {
     DatePicker: typeof import('./src/components/DatePicker/index.vue')['default']
     Details: typeof import('./src/components/Enterprise/details.vue')['default']
     Echarts: typeof import('./src/components/Echarts/index.vue')['default']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     Empty: typeof import('./src/components/Empty/index.vue')['default']
     File: typeof import('./src/components/Upload/file.vue')['default']
     HeadSearch: typeof import('./src/components/headSearch/index.vue')['default']

src/api/position.js

@@ -185,7 +185,7 @@ export const getJobAdvertisedExport = async (params) => {
   })
 }
 
-// 招聘端-导出批量上传职位模版
+// 招聘端-导出批量上传职位模板
 export const jobAdvertisedTemplateDownload = async () => {
   return await request.download({
     url: '/app-api/menduner/system/recruit/job-advertised/import-template'

src/views/recruit/enterprise/hirePosition/components/baseInfo.vue

@@ -32,7 +32,7 @@
           </template>
           <jobTypeCard class="jobTypeCardBox" :select="[query.positionId].filter(Boolean)" :isSingle="true" @handleJobClick="handleJobClickItem"></jobTypeCard>
         </v-menu>
-        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">岗位模版</v-btn>
+        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">职位模板</v-btn>
       </template>
     </CtForm>
 
@@ -87,6 +87,17 @@ const items = ref({
       slotName: 'numericalValue',
       noParam: true,
     },
+    {
+      slotName: 'positionId',
+      key: 'positionId',
+      value: '',
+      labelKey: 'positionName',
+      label: '职位类型 *',
+      noParam: true,
+      flexStyle: 'mt-5',
+      readonly: true,
+      rules: [v => !!v || '请选择职位类型']
+    },
     {
       type: 'text',
       key: 'name',
@@ -102,17 +113,6 @@ const items = ref({
       labelWidth: 120,
       label: '到期时间 *'
     },
-    {
-      slotName: 'positionId',
-      key: 'positionId',
-      value: '',
-      labelKey: 'positionName',
-      label: '职位类型 *',
-      noParam: true,
-      flexStyle: 'mt-5',
-      readonly: true,
-      rules: [v => !!v || '请选择职位类型']
-    },
     {
       type: 'wangEditor',
       key: 'content',
@@ -173,7 +173,7 @@ const handleJobClickItem = (list, name) => {
   positionId.value = name
 }
 
-// 岗位模版
+// 职位模板
 import Confirm from '@/plugins/confirm'
 import Snackbar from '@/plugins/snackbar'
 import { useI18n } from '@/hooks/web/useI18n'; const { t } = useI18n()

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

@@ -13,7 +13,7 @@
           </template>
           <jobTypeCard class="jobTypeCardBox" :select="[query.positionId].filter(Boolean)" :isSingle="true" @handleJobClick="handleJobClickItem"></jobTypeCard>
         </v-menu>
-        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">岗位模版</v-btn>
+        <v-btn v-if="showTemplateBtn" class="ml-3 half-button" color="primary" style="margin-top: 2px;" @click="useJobTemplate(item)">职位模板</v-btn>
       </template>
     </CtForm>
   </div>
@@ -45,6 +45,17 @@ let query = reactive({})
 
 const items = ref({
   options: [
+    {
+      slotName: 'positionId',
+      key: 'positionId',
+      value: '',
+      flexStyle: 'mt-5',
+      labelKey: 'positionName',
+      label: '职位类型 *',
+      noParam: true,
+      readonly: true,
+      rules: [v => !!v || '请选择职位类型']
+    },
     {
       type: 'text',
       key: 'name',
@@ -60,17 +71,6 @@ const items = ref({
       label: '到期时间 *',
       labelWidth: 120
     },
-    {
-      slotName: 'positionId',
-      key: 'positionId',
-      value: '',
-      flexStyle: 'mt-5',
-      labelKey: 'positionName',
-      label: '职位类型 *',
-      noParam: true,
-      readonly: true,
-      rules: [v => !!v || '请选择职位类型']
-    },
     {
       type: 'wangEditor',
       key: 'content',