From e2f3612e00db4b6eac9d2cfdcccc3fa1aeda9108 Mon Sep 17 00:00:00 2001 From: hky <1499449886@qq.com> Date: Wed, 25 Dec 2024 18:20:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B2=97=E4=BD=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E3=80=81=E9=83=A8=E9=97=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=83=A8=E9=97=A8=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/arcb/salary/station/index.ts | 42 ++++ src/api/system/dept/index.ts | 1 + src/utils/dict.ts | 1 + .../arcb/salary/employee/EmployeeForm.vue | 58 ++++- src/views/arcb/salary/employee/index.vue | 98 +++----- src/views/arcb/salary/station/StationForm.vue | 119 ++++++++++ src/views/arcb/salary/station/index.vue | 220 ++++++++++++++++++ src/views/system/dept/DeptForm.vue | 6 + 8 files changed, 482 insertions(+), 63 deletions(-) create mode 100644 src/api/arcb/salary/station/index.ts create mode 100644 src/views/arcb/salary/station/StationForm.vue create mode 100644 src/views/arcb/salary/station/index.vue diff --git a/src/api/arcb/salary/station/index.ts b/src/api/arcb/salary/station/index.ts new file mode 100644 index 000000000..fba2fdc3e --- /dev/null +++ b/src/api/arcb/salary/station/index.ts @@ -0,0 +1,42 @@ +import request from '@/config/axios' + +// 岗位配置 VO +export interface StationVO { + id: number // 唯一标识符 + stationCode: string // 岗位代码 + stationName: string // 岗位名称 + professionalSequence: string // 岗位序列 +} + +// 岗位配置 API +export const StationApi = { + // 查询岗位配置分页 + getStationPage: async (params: any) => { + return await request.get({ url: `/salary/station/page`, params }) + }, + + // 查询岗位配置详情 + getStation: async (id: number) => { + return await request.get({ url: `/salary/station/get?id=` + id }) + }, + + // 新增岗位配置 + createStation: async (data: StationVO) => { + return await request.post({ url: `/salary/station/create`, data }) + }, + + // 修改岗位配置 + updateStation: async (data: StationVO) => { + return await request.put({ url: `/salary/station/update`, data }) + }, + + // 删除岗位配置 + deleteStation: async (id: number) => { + return await request.delete({ url: `/salary/station/delete?id=` + id }) + }, + + // 导出岗位配置 Excel + exportStation: async (params) => { + return await request.download({ url: `/salary/station/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts index 04d5c8807..4c11ebbcc 100644 --- a/src/api/system/dept/index.ts +++ b/src/api/system/dept/index.ts @@ -3,6 +3,7 @@ import request from '@/config/axios' export interface DeptVO { id?: number name: string + orgNo: string parentId: number status: number sort: number diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1520fee2c..ee0d29b5e 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -243,4 +243,5 @@ export enum DICT_TYPE { // ===================人力资源模块====================== ARCB_EMP_STATUS = 'arcb_emp_status', //员工状态 + ARCB_POSITION_CATEGORY = 'arcb_position_category' //岗位序列 } diff --git a/src/views/arcb/salary/employee/EmployeeForm.vue b/src/views/arcb/salary/employee/EmployeeForm.vue index 9dde60fab..fbeeb41e8 100644 --- a/src/views/arcb/salary/employee/EmployeeForm.vue +++ b/src/views/arcb/salary/employee/EmployeeForm.vue @@ -17,13 +17,37 @@ - + + + - + + + @@ -50,7 +74,7 @@ {{ dict.label }} @@ -66,6 +90,8 @@ \ No newline at end of file diff --git a/src/views/arcb/salary/station/index.vue b/src/views/arcb/salary/station/index.vue new file mode 100644 index 000000000..d74232816 --- /dev/null +++ b/src/views/arcb/salary/station/index.vue @@ -0,0 +1,220 @@ + + + \ No newline at end of file diff --git a/src/views/system/dept/DeptForm.vue b/src/views/system/dept/DeptForm.vue index c759ef38d..4d0e9caef 100644 --- a/src/views/system/dept/DeptForm.vue +++ b/src/views/system/dept/DeptForm.vue @@ -21,6 +21,9 @@ + + + @@ -79,6 +82,7 @@ const formData = ref({ title: '', parentId: undefined, name: undefined, + orgNo: undefined, sort: undefined, leaderUserId: undefined, phone: undefined, @@ -88,6 +92,7 @@ const formData = ref({ const formRules = reactive({ parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }], name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }], + orgNo: [{ required: true, message: '部门号不能为空', trigger: 'blur' }], sort: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }], email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }], phone: [ @@ -154,6 +159,7 @@ const resetForm = () => { title: '', parentId: undefined, name: undefined, + orgNo: undefined, sort: undefined, leaderUserId: undefined, phone: undefined,