部门管理新增分包单位选项

src/api/system/dept/index.ts

@@ -18,6 +18,17 @@ export const getDeptList = () => {
   });
 };
 
+/**
+ * 查询分包单位
+ * @param projectId
+ */
+export const optionProjectSelect = (projectId: number | string): any => {
+  return request({
+    url: '/contractor/contractor/listNoDept/' + projectId,
+    method: 'get'
+  });
+};
+
 /**
  * 通过deptIds查询部门
  * @param deptIds

src/api/system/dept/types.ts

@@ -5,7 +5,7 @@ export interface DeptQuery extends PageQuery {
   deptName?: string;
   deptCategory?: string;
   status?: number;
-  isSubset?: string;
+  deptType?: string;
   isShow?: string;
 }
 
@@ -18,6 +18,7 @@ export interface DeptVO extends BaseEntity {
   parentId: number | string;
   children: DeptVO[];
   deptId: number | string;
+  projectId: number | string;
   projectList: any[];
   deptName: string;
   deptCategory: string;
@@ -52,11 +53,13 @@ export interface DeptForm {
   children?: DeptForm[];
   deptId?: number | string;
   projectId?: number | string;
+  contractorId?: number | string;
+  rowProjectId?: number | string;
   deptName?: string;
   deptCategory?: string;
   orderNum?: number;
   leader?: string;
-  isSubset?: string;
+  deptType?: string;
   isShow?: string;
   phone?: string;
   email?: string;

src/api/system/dict/data/index.ts

@@ -10,10 +10,11 @@ export function getDicts(dictType: string): AxiosPromise<DictDataVO[]> {
 }
 
 // 查询字典数据列表
-export function listData(query: string): AxiosPromise<DictDataVO[]> {
+export function listData(query: DictDataQuery): AxiosPromise<DictDataVO[]> {
   return request({
-    url: '/system/dict/data/type/' + query,
-    method: 'get'
+    url: '/system/dict/data/list',
+    method: 'get',
+    params: query
   });
 }