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" > +