From 7ed5f33e7bd9ca26fb41700e518234b973841921 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Wed, 24 Apr 2024 14:30:52 +0000 Subject: [PATCH] =?UTF-8?q?!107=20add=20=E6=96=B0=E5=A2=9E=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E7=A0=81=E4=B8=8E=E9=83=A8=E9=97=A8=E7=BC=96?= =?UTF-8?q?=E7=A0=81=20=E5=B9=B6=E5=B0=86=E5=B2=97=E4=BD=8D=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E9=83=A8=E9=97=A8=E4=B8=8B=20*=20add=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=B2=97=E4=BD=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=A1=86=E5=88=97=E8=A1=A8=20*=20update=20=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=91=E8=A1=A8=E5=92=8C=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E7=9B=B8=E4=BA=92undefined=20*=20update=20=E5=B2=97=E4=BD=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0=E5=8D=95=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=20*=20update=20=E4=BC=98=E5=8C=96=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E7=BC=96=E7=A0=81=E4=B8=8E=E5=90=8E=E5=8F=B0=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7=20*=20add=20=E6=96=B0=E5=A2=9E=E5=B2=97?= =?UTF-8?q?=E4=BD=8D=E9=83=A8=E9=97=A8=E6=A0=91=E4=BB=A5=E5=8F=8A=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E7=BC=96=E7=A0=81=20*=20add=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=88=AB=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dept/types.ts | 3 + src/api/system/post/index.ts | 9 + src/api/system/post/types.ts | 8 + src/views/system/dept/index.vue | 11 ++ src/views/system/post/index.vue | 298 +++++++++++++++++++++----------- 5 files changed, 232 insertions(+), 97 deletions(-) diff --git a/src/api/system/dept/types.ts b/src/api/system/dept/types.ts index 867dbde..494745c 100644 --- a/src/api/system/dept/types.ts +++ b/src/api/system/dept/types.ts @@ -3,6 +3,7 @@ */ export interface DeptQuery extends PageQuery { deptName?: string; + deptCategory?: string; status?: number; } @@ -16,6 +17,7 @@ export interface DeptVO extends BaseEntity { children: DeptVO[]; deptId: number | string; deptName: string; + deptCategory: string; orderNum: number; leader: string; phone: string; @@ -35,6 +37,7 @@ export interface DeptForm { children?: DeptForm[]; deptId?: number | string; deptName?: string; + deptCategory?: string; orderNum?: number; leader?: string; phone?: string; diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts index 3e523ab..1b565a8 100644 --- a/src/api/system/post/index.ts +++ b/src/api/system/post/index.ts @@ -19,6 +19,15 @@ export function getPost(postId: string | number): AxiosPromise { }); } +// 获取岗位选择框列表 +export function optionselect(query: PostQuery): AxiosPromise { + return request({ + url: '/system/post/optionselect', + method: 'get', + params: query + }); +} + // 新增岗位 export function addPost(data: PostForm) { return request({ diff --git a/src/api/system/post/types.ts b/src/api/system/post/types.ts index 84e6786..45a0540 100644 --- a/src/api/system/post/types.ts +++ b/src/api/system/post/types.ts @@ -1,7 +1,10 @@ export interface PostVO extends BaseEntity { postId: number | string; + deptId: number | string; postCode: string; postName: string; + postCategory: string; + deptName: string; postSort: number; status: string; remark: string; @@ -9,15 +12,20 @@ export interface PostVO extends BaseEntity { export interface PostForm { postId: number | string | undefined; + deptId: number | string | undefined; postCode: string; postName: string; + postCategory: string; postSort: number; status: string; remark: string; } export interface PostQuery extends PageQuery { + deptId: number | string; + belongDeptId: number | string; postCode: string; postName: string; + postCategory: string; status: string; } diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index 30942df..71aeff1 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -7,6 +7,9 @@ + + + @@ -43,6 +46,7 @@ :default-expand-all="isExpandAll" > +