diff --git a/src/api/mes/cal/team/index.ts b/src/api/mes/cal/team/index.ts new file mode 100644 index 000000000..f8712504c --- /dev/null +++ b/src/api/mes/cal/team/index.ts @@ -0,0 +1,52 @@ +import request from '@/config/axios' + +// MES 班组 VO +export interface CalTeamVO { + id: number + code: string // 班组编码 + name: string // 班组名称 + calendarType: number // 班组类型 + remark: string // 备注 + attribute1: string + attribute2: string + attribute3: number + attribute4: number +} + +// MES 班组 API +export const CalTeamApi = { + // 查询班组分页 + getTeamPage: async (params: any) => { + return await request.get({ url: `/mes/cal/team/page`, params }) + }, + + // 查询班组详情 + getTeam: async (id: number) => { + return await request.get({ url: `/mes/cal/team/get?id=` + id }) + }, + + // 新增班组 + createTeam: async (data: CalTeamVO) => { + return await request.post({ url: `/mes/cal/team/create`, data }) + }, + + // 修改班组 + updateTeam: async (data: CalTeamVO) => { + return await request.put({ url: `/mes/cal/team/update`, data }) + }, + + // 删除班组 + deleteTeam: async (id: number) => { + return await request.delete({ url: `/mes/cal/team/delete?id=` + id }) + }, + + // 获得班组列表(全量,用于下拉选择) + getTeamList: async () => { + return await request.get({ url: `/mes/cal/team/list` }) + }, + + // 导出班组 Excel + exportTeam: async (params: any) => { + return await request.download({ url: `/mes/cal/team/export-excel`, params }) + } +} diff --git a/src/api/mes/cal/team/member.ts b/src/api/mes/cal/team/member.ts new file mode 100644 index 000000000..c5b574917 --- /dev/null +++ b/src/api/mes/cal/team/member.ts @@ -0,0 +1,46 @@ +import request from '@/config/axios' + +// TODO @AI:改成 member/index.ts,参考别的 api ts; + +// MES 班组成员 VO +export interface CalTeamMemberVO { + id: number + teamId: number // 班组编号 + userId: number // 用户编号 + userName: string // 用户名称(关联查询) + nickname: string // 用户昵称(关联查询) + telephone: string // 用户手机号(关联查询) + remark: string // 备注 + attribute1: string + attribute2: string + attribute3: number + attribute4: number +} + +// MES 班组成员 API +export const CalTeamMemberApi = { + // 创建班组成员 + createTeamMember: async (data: CalTeamMemberVO) => { + return await request.post({ url: `/mes/cal/team-member/create`, data }) + }, + + // 删除班组成员 + deleteTeamMember: async (id: number) => { + return await request.delete({ url: `/mes/cal/team-member/delete?id=` + id }) + }, + + // 查询班组成员分页 + getTeamMemberPage: async (params: any) => { + return await request.get({ url: `/mes/cal/team-member/page`, params }) + }, + + // 查询指定班组的成员列表 + getTeamMemberListByTeam: async (teamId: number) => { + return await request.get({ url: `/mes/cal/team-member/list-by-team?teamId=` + teamId }) + }, + + // 查询多个班组的成员列表 + getTeamMemberListByTeamIds: async (teamIds: number[]) => { + return await request.get({ url: `/mes/cal/team-member/list-by-team-ids`, params: { teamIds: teamIds.join(',') } }) + } +} diff --git a/src/api/mes/cal/team/shift.ts b/src/api/mes/cal/team/shift.ts new file mode 100644 index 000000000..8e094317a --- /dev/null +++ b/src/api/mes/cal/team/shift.ts @@ -0,0 +1,28 @@ +import request from '@/config/axios' + +// TODO @AI:改成 shift/index.ts,参考别的 api ts; + +// MES 班组排班 VO +export interface CalTeamShiftVO { + id: number + planId: number // 排班计划编号 + teamId: number // 班组编号 + shiftId: number // 班次编号 + day: number // 日期 + sort: number // 排序 + teamName: string // 班组名称(关联查询) + shiftName: string // 班次名称(关联查询) + remark: string // 备注 + attribute1: string + attribute2: string + attribute3: number + attribute4: number +} + +// MES 班组排班 API +export const CalTeamShiftApi = { + // 查询班组排班列表 + getTeamShiftList: async (params: any) => { + return await request.get({ url: `/mes/cal/team-shift/list`, params }) + } +} diff --git a/src/views/mes/cal/plan/CalPlanTeamPanel.vue b/src/views/mes/cal/plan/CalPlanTeamPanel.vue index 6ea840039..16857db1f 100644 --- a/src/views/mes/cal/plan/CalPlanTeamPanel.vue +++ b/src/views/mes/cal/plan/CalPlanTeamPanel.vue @@ -40,6 +40,7 @@ diff --git a/src/views/mes/cal/team/CalTeamMemberPanel.vue b/src/views/mes/cal/team/CalTeamMemberPanel.vue new file mode 100644 index 000000000..413ea69e8 --- /dev/null +++ b/src/views/mes/cal/team/CalTeamMemberPanel.vue @@ -0,0 +1,139 @@ + + + + diff --git a/src/views/mes/cal/team/index.vue b/src/views/mes/cal/team/index.vue new file mode 100644 index 000000000..ec21fe11d --- /dev/null +++ b/src/views/mes/cal/team/index.vue @@ -0,0 +1,203 @@ + + + +