From 706e2f489ca956202fdc0c4fd9f3d684f74dc4fa Mon Sep 17 00:00:00 2001 From: xiao-fajia <1665375861@qq.com> Date: Wed, 7 Aug 2024 15:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86-=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/company/staff/index.js | 8 + src/utils/dict.js | 4 + src/views/company/staff/StaffForm.vue | 429 +++++++++++++++----------- src/views/company/staff/index.vue | 71 ++--- 4 files changed, 300 insertions(+), 212 deletions(-) diff --git a/src/api/company/staff/index.js b/src/api/company/staff/index.js index e09c89c..676eb07 100644 --- a/src/api/company/staff/index.js +++ b/src/api/company/staff/index.js @@ -51,3 +51,11 @@ export function exportStaffExcel(params) { responseType: 'blob' }) } + +// 获取当前登录用户所属标签 +export function getLabels(){ + return request({ + url: '/company/staff/labels', + method: 'get', + }) +} diff --git a/src/utils/dict.js b/src/utils/dict.js index 050d7cc..625b391 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -106,6 +106,10 @@ export const DICT_TYPE = { DICT_BRAND_TYPE : 'brand_type', //标签样式 DICT_BASE_LABEL_TYPE : 'base_label_type', + + // ------- 企业管理模块 ------- + // 员工学历 + COMPANY_STAFF_EDU: 'company_staff_edu', } /** diff --git a/src/views/company/staff/StaffForm.vue b/src/views/company/staff/StaffForm.vue index ffa65c2..674d122 100644 --- a/src/views/company/staff/StaffForm.vue +++ b/src/views/company/staff/StaffForm.vue @@ -1,173 +1,256 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - 请选择字典生成 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + {{dict.label}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/company/staff/index.vue b/src/views/company/staff/index.vue index ed07467..de77f75 100644 --- a/src/views/company/staff/index.vue +++ b/src/views/company/staff/index.vue @@ -1,7 +1,7 @@ - + @@ -13,29 +13,20 @@ - + - - - - - - @@ -47,8 +38,15 @@ @keyup.enter.native="handleQuery" /> - - + + + + - - - - - - - - - - - - - - - - - - - - {{ parseTime(scope.row.createTime) }} + + + {{scope.$index + 1}} - + + + + + + + + + + + + +