系统管理/部门管理角色管理用户管理

src/api/system/dept/index.ts

@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import {DeptForm, DeptQuery, DeptTreeVO, DeptVO} from './types';
+import { DeptForm, DeptQuery, DeptTreeVO, DeptVO } from './types';
 
 // 查询部门列表
 export const listDept = (query?: DeptQuery) => {
@@ -11,6 +11,13 @@ export const listDept = (query?: DeptQuery) => {
   });
 };
 
+export const getDeptList = () => {
+  return request({
+    url: '/project/project/listNoDept',
+    method: 'get'
+  });
+};
+
 /**
  * 通过deptIds查询部门
  * @param deptIds

src/api/system/dept/types.ts

@@ -5,6 +5,8 @@ export interface DeptQuery extends PageQuery {
   deptName?: string;
   deptCategory?: string;
   status?: number;
+  isSubset?: string;
+  isShow?: string;
 }
 
 /**
@@ -16,6 +18,7 @@ export interface DeptVO extends BaseEntity {
   parentId: number | string;
   children: DeptVO[];
   deptId: number | string;
+  projectList: any[];
   deptName: string;
   deptCategory: string;
   orderNum: number;
@@ -48,10 +51,13 @@ export interface DeptForm {
   parentId?: number | string;
   children?: DeptForm[];
   deptId?: number | string;
+  projectId?: number | string;
   deptName?: string;
   deptCategory?: string;
   orderNum?: number;
   leader?: string;
+  isSubset?: string;
+  isShow?: string;
   phone?: string;
   email?: string;
   status?: string;

src/api/system/post/index.ts

@@ -56,3 +56,14 @@ export function delPost(postId: string | number | (string | number)[]) {
     method: 'delete'
   });
 }
+
+// 获取岗位选择框列表
+export function getRoleList(deptId?: number | string): AxiosPromise<any[]> {
+  return request({
+    url: '/system/role/listNoPage',
+    method: 'get',
+    params: {
+      deptId
+    }
+  });
+}

src/api/system/role/types.ts

@@ -6,7 +6,8 @@ export interface DeptTreeOption {
   label: string;
   parentId: string;
   weight: number;
-  children?: DeptTreeOption[];
+  children: DeptTreeOption[];
+  disabled: boolean;
 }
 
 export interface RoleDeptTree {
@@ -34,6 +35,7 @@ export interface RoleVO extends BaseEntity {
 export interface RoleQuery extends PageQuery {
   roleName: string;
   roleKey: string;
+  deptId: string;
   status: string;
 }
 
@@ -46,7 +48,9 @@ export interface RoleForm {
   deptCheckStrictly: boolean;
   remark: string;
   dataScope?: string;
+  isSpecial: string;
   roleId: string | undefined;
   menuIds: Array<string | number>;
   deptIds: Array<string | number>;
+  deptId?: string;
 }

src/api/system/user/index.ts

@@ -202,10 +202,11 @@ export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]
 /**
  * 查询部门下拉树结构
  */
-export const deptTreeSelect = (): AxiosPromise<DeptTreeVO[]> => {
+export const deptTreeSelect = (data?: { isShow: string }): AxiosPromise<DeptTreeVO[]> => {
   return request({
     url: '/system/user/deptTree',
-    method: 'get'
+    method: 'get',
+    params: data
   });
 };
 

src/api/workflow/definition/types.ts

@@ -3,6 +3,7 @@ export interface FlowDefinitionQuery extends PageQuery {
   flowName?: string;
   category: string | number;
   isPublish?: number;
+  projectId: string | number;
 }
 
 export interface FlowDefinitionVo {
@@ -23,6 +24,7 @@ export interface FlowDefinitionForm {
   flowCode: string;
   category: string;
   formPath: string;
+  projectId: string;
 }
 
 export interface definitionXmlVO {

src/api/workflow/workflowCommon/index.ts

@@ -2,9 +2,11 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 
 export default {
   routerJump(routerJumpVo: RouterJumpVo, proxy) {
+    console.log(routerJumpVo.formPath);
     proxy.$tab.closePage(proxy.$route);
+
     proxy.$router.push({
-      path: routerJumpVo.formPath,
+      path: routerJumpVo.formPath ? '/' + routerJumpVo.formPath : routerJumpVo.formPath,
       query: {
         id: routerJumpVo.businessId,
         type: routerJumpVo.type,