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

This commit is contained in:
Teo
2025-07-18 19:22:36 +08:00
parent d03efb8d6f
commit 5d76471571
17 changed files with 141 additions and 89 deletions

View File

@ -23,7 +23,7 @@ import { AttendanceMonthVO } from '../attendance/types';
export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosPromise<AttendanceMonthVO[]> => {
return request({
url: '/project/constructionUser/list/attendance/month',
url: '/contractor/constructionUser/list/attendance/month',
method: 'get',
params: query
});
@ -36,7 +36,7 @@ export const listConstructionMonth = (query?: ConstructionMonthQuery): AxiosProm
export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromise<ConstructionUserVO[]> => {
return request({
url: '/project/constructionUser/list',
url: '/contractor/constructionUser/list',
method: 'get',
params: query
});
@ -48,7 +48,7 @@ export const listConstructionUser = (query?: ConstructionUserQuery): AxiosPromis
*/
export const getConstructionUser = (id: string | number): AxiosPromise<ConstructionUserVO> => {
return request({
url: '/project/constructionUser/' + id,
url: '/contractor/constructionUser/' + id,
method: 'get'
});
};
@ -59,7 +59,7 @@ export const getConstructionUser = (id: string | number): AxiosPromise<Construct
*/
export const transferConstructionUser = (data: skipType) => {
return request({
url: '/project/constructionUser/change/project',
url: '/contractor/constructionUser/change/project',
method: 'put',
data: data
});
@ -81,7 +81,7 @@ export const getProjectContractorList = () => {
*/
export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<string | number> => {
return request({
url: '/project/constructionUser',
url: '/contractor/constructionUser',
method: 'post',
data: data
});
@ -93,7 +93,7 @@ export const addConstructionUser = (data: ConstructionUserForm): AxiosPromise<st
*/
export const updateConstructionUser = (data: ConstructionUserForm) => {
return request({
url: '/project/constructionUser',
url: '/contractor/constructionUser',
method: 'put',
data: data
});
@ -105,7 +105,7 @@ export const updateConstructionUser = (data: ConstructionUserForm) => {
*/
export const delConstructionUser = (id: string | number | Array<string | number>) => {
return request({
url: '/project/constructionUser/' + id,
url: '/contractor/constructionUser/' + id,
method: 'delete'
});
};
@ -116,7 +116,7 @@ export const delConstructionUser = (id: string | number | Array<string | number>
*/
export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) => {
return request({
url: '/project/constructionUser/batch/status',
url: '/contractor/constructionUser/batch/status',
method: 'put',
data: data
});
@ -128,7 +128,7 @@ export const updateConstructionUserStatus = (data: ConstructionUserStatusForm) =
*/
export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayCardForm) => {
return request({
url: '/project/constructionUser/batch/clock',
url: '/contractor/constructionUser/batch/clock',
method: 'put',
data: data
});
@ -140,7 +140,7 @@ export const updateConstructionUserPlayCardStatus = (data: ConstructionUserPlayC
*/
export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPlayCardForm) => {
return request({
url: '/project/constructionUser/clock',
url: '/contractor/constructionUser/clock',
method: 'put',
data: data
});
@ -152,7 +152,7 @@ export const updateConstructionUserPlayCardOneStatus = (data: ConstructionUserPl
*/
export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) => {
return request({
url: '/project/constructionUser/salary',
url: '/contractor/constructionUser/salary',
method: 'put',
data: data
});
@ -164,7 +164,7 @@ export const updateConstructionUserSalary = (data: ConstructionUserSalaryForm) =
*/
export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
return request({
url: '/project/constructionUserExit/list',
url: '/contractor/constructionUserExit/list',
method: 'get',
params: query
});
@ -177,7 +177,7 @@ export const getConstructionUserExit = (query: ConstructionUserExitForm) => {
export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateForm) => {
let { projectId } = query;
const fileName = projectId + '_project.zip';
return download('/project/constructionUserFile/exportFileTemplate', query, fileName);
return download('/contractor/constructionUserFile/exportFileTemplate', query, fileName);
};
/**
@ -186,7 +186,7 @@ export const dowloadConstructionUserTemplate = (query: ConstructionUserTemplateF
*/
export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
return request({
url: '/project/projectTeamMember/',
url: '/contractor/projectTeamMember/',
method: 'delete',
data
});
@ -198,7 +198,7 @@ export const delConstructionUserMember = (data: ConstructionUserMembeForm) => {
*/
export const importConstructionUserInfo = (file: string) => {
return request({
url: '/project/constructionUserFile/upload/zip',
url: '/contractor/constructionUserFile/upload/zip',
method: 'post',
data: { file }
});

View File

@ -10,7 +10,7 @@ import { ContractorForm, ContractorQuery, ContractorVO } from '@/api/project/con
export const listContractor = (query?: ContractorQuery): AxiosPromise<ContractorVO[]> => {
return request({
url: '/project/contractor/list',
url: '/contractor/contractor/list',
method: 'get',
params: query
});
@ -22,7 +22,7 @@ export const listContractor = (query?: ContractorQuery): AxiosPromise<Contractor
*/
export const getContractor = (id: string | number): AxiosPromise<ContractorVO> => {
return request({
url: '/project/contractor/' + id,
url: '/contractor/contractor/' + id,
method: 'get'
});
};
@ -33,7 +33,7 @@ export const getContractor = (id: string | number): AxiosPromise<ContractorVO> =
*/
export const addContractor = (data: ContractorForm): AxiosPromise<string | number> => {
return request({
url: '/project/contractor',
url: '/contractor/contractor',
method: 'post',
data: data
});
@ -45,7 +45,7 @@ export const addContractor = (data: ContractorForm): AxiosPromise<string | numbe
*/
export const updateContractor = (data: ContractorForm) => {
return request({
url: '/project/contractor',
url: '/contractor/contractor',
method: 'put',
data: data
});
@ -57,7 +57,7 @@ export const updateContractor = (data: ContractorForm) => {
*/
export const delContractor = (id: string | number | Array<string | number>) => {
return request({
url: '/project/contractor/' + id,
url: '/contractor/contractor/' + id,
method: 'delete'
});
};

View File

@ -1,6 +1,6 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { ContractorMaterialVO, ContractorMaterialForm, ContractorMaterialQuery } from '@/api/contractor/contractorMaterial/types';
import { ContractorMaterialVO, ContractorMaterialForm, ContractorMaterialQuery } from '@/api/project/contractorMaterial/types';
/**
* 查询分包方物料列表

View File

@ -10,7 +10,7 @@ import { ContractorToolVO, ContractorToolForm, ContractorToolQuery } from '@/api
export const listContractorTool = (query?: ContractorToolQuery): AxiosPromise<ContractorToolVO[]> => {
return request({
url: '/project/contractorTool/list',
url: '/contractor/contractorTool/list',
method: 'get',
params: query
});
@ -22,7 +22,7 @@ export const listContractorTool = (query?: ContractorToolQuery): AxiosPromise<Co
*/
export const getContractorTool = (id: string | number): AxiosPromise<ContractorToolVO> => {
return request({
url: '/project/contractorTool/' + id,
url: '/contractor/contractorTool/' + id,
method: 'get'
});
};
@ -33,7 +33,7 @@ export const getContractorTool = (id: string | number): AxiosPromise<ContractorT
*/
export const addContractorTool = (data: ContractorToolForm) => {
return request({
url: '/project/contractorTool',
url: '/contractor/contractorTool',
method: 'post',
data: data
});
@ -45,7 +45,7 @@ export const addContractorTool = (data: ContractorToolForm) => {
*/
export const updateContractorTool = (data: ContractorToolForm) => {
return request({
url: '/project/contractorTool',
url: '/contractor/contractorTool',
method: 'put',
data: data
});
@ -57,7 +57,7 @@ export const updateContractorTool = (data: ContractorToolForm) => {
*/
export const delContractorTool = (id: string | number | Array<string | number>) => {
return request({
url: '/project/contractorTool/' + id,
url: '/contractor/contractorTool/' + id,
method: 'delete'
});
};

View File

@ -10,7 +10,7 @@ import { SubcontractVO, SubcontractForm, SubcontractQuery } from '@/api/project/
export const listSubcontract = (query?: SubcontractQuery): AxiosPromise<SubcontractVO[]> => {
return request({
url: '/project/subcontract/list',
url: '/contractor/subcontract/list',
method: 'get',
params: query
});
@ -22,7 +22,7 @@ export const listSubcontract = (query?: SubcontractQuery): AxiosPromise<Subcontr
*/
export const getSubcontract = (id: string | number): AxiosPromise<SubcontractVO> => {
return request({
url: '/project/subcontract/' + id,
url: '/contractor/subcontract/' + id,
method: 'get'
});
};
@ -33,7 +33,7 @@ export const getSubcontract = (id: string | number): AxiosPromise<SubcontractVO>
*/
export const addSubcontract = (data: SubcontractForm) => {
return request({
url: '/project/subcontract',
url: '/contractor/subcontract',
method: 'post',
data: data
});
@ -45,7 +45,7 @@ export const addSubcontract = (data: SubcontractForm) => {
*/
export const updateSubcontract = (data: SubcontractForm) => {
return request({
url: '/project/subcontract',
url: '/contractor/subcontract',
method: 'put',
data: data
});
@ -57,7 +57,7 @@ export const updateSubcontract = (data: SubcontractForm) => {
*/
export const delSubcontract = (id: string | number | Array<string | number>) => {
return request({
url: '/project/subcontract/' + id,
url: '/contractor/subcontract/' + id,
method: 'delete'
});
};

View File

@ -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

View File

@ -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;

View File

@ -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
});
}