From 67e6e59120a009de6d8c742b0e646de926d076c9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 18 Feb 2026 15:47:18 +0800 Subject: [PATCH] =?UTF-8?q?review=EF=BC=88mes=EF=BC=89=EF=BC=9Apro-process?= =?UTF-8?q?=20=E7=9A=84=E5=88=9D=E6=AD=A5=E5=AE=9E=E7=8E=B0=2050%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/cal/team/member/index.ts | 44 +++++ src/api/mes/cal/team/shift/index.ts | 26 +++ src/api/mes/pro/process/content/index.ts | 42 +++++ src/views/mes/cal/team/CalTeamMemberForm.vue | 86 +++++++++ src/views/mes/cal/team/CalTeamMemberList.vue | 70 +++++++ .../pro/process/ProProcessContentTable.vue | 176 ++++++++++++++++++ src/views/mes/pro/process/ProProcessForm.vue | 84 +-------- src/views/mes/pro/process/index.vue | 20 +- 8 files changed, 470 insertions(+), 78 deletions(-) create mode 100644 src/api/mes/cal/team/member/index.ts create mode 100644 src/api/mes/cal/team/shift/index.ts create mode 100644 src/api/mes/pro/process/content/index.ts create mode 100644 src/views/mes/cal/team/CalTeamMemberForm.vue create mode 100644 src/views/mes/cal/team/CalTeamMemberList.vue create mode 100644 src/views/mes/pro/process/ProProcessContentTable.vue diff --git a/src/api/mes/cal/team/member/index.ts b/src/api/mes/cal/team/member/index.ts new file mode 100644 index 000000000..1f2973fcb --- /dev/null +++ b/src/api/mes/cal/team/member/index.ts @@ -0,0 +1,44 @@ +import request from '@/config/axios' + +// 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`, params: { teamId } }) + }, + + // 查询多个班组的成员列表 + getTeamMemberListByTeamIds: async (teamIds: number[]) => { + return await request.get({ url: `/mes/cal/team-member/list-by-team`, params: { teamIds: teamIds.join(',') } }) + } +} diff --git a/src/api/mes/cal/team/shift/index.ts b/src/api/mes/cal/team/shift/index.ts new file mode 100644 index 000000000..ac7a2b194 --- /dev/null +++ b/src/api/mes/cal/team/shift/index.ts @@ -0,0 +1,26 @@ +import request from '@/config/axios' + +// 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/api/mes/pro/process/content/index.ts b/src/api/mes/pro/process/content/index.ts new file mode 100644 index 000000000..2e126d71d --- /dev/null +++ b/src/api/mes/pro/process/content/index.ts @@ -0,0 +1,42 @@ +import request from '@/config/axios' + +// MES 生产工序内容 VO +export interface ProProcessContentVO { + id?: number // 编号 + processId: number // 工序编号 + sort: number // 顺序编号 + content?: string // 步骤说明 + device?: string // 辅助设备 + material?: string // 辅助材料 + docUrl?: string // 材料文档 URL + remark?: string // 备注 + createTime?: Date // 创建时间 +} + +// MES 生产工序内容 API +export const ProProcessContentApi = { + // 查询工序内容列表(按工序编号) + getProcessContentListByProcessId: async (processId: number) => { + return await request.get({ url: `/mes/pro/process-content/list-by-process?processId=` + processId }) + }, + + // 查询工序内容详情 + getProcessContent: async (id: number) => { + return await request.get({ url: `/mes/pro/process-content/get?id=` + id }) + }, + + // 新增工序内容 + createProcessContent: async (data: ProProcessContentVO) => { + return await request.post({ url: `/mes/pro/process-content/create`, data }) + }, + + // 修改工序内容 + updateProcessContent: async (data: ProProcessContentVO) => { + return await request.put({ url: `/mes/pro/process-content/update`, data }) + }, + + // 删除工序内容 + deleteProcessContent: async (id: number) => { + return await request.delete({ url: `/mes/pro/process-content/delete?id=` + id }) + } +} diff --git a/src/views/mes/cal/team/CalTeamMemberForm.vue b/src/views/mes/cal/team/CalTeamMemberForm.vue new file mode 100644 index 000000000..e55b36041 --- /dev/null +++ b/src/views/mes/cal/team/CalTeamMemberForm.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/views/mes/cal/team/CalTeamMemberList.vue b/src/views/mes/cal/team/CalTeamMemberList.vue new file mode 100644 index 000000000..61d9e653f --- /dev/null +++ b/src/views/mes/cal/team/CalTeamMemberList.vue @@ -0,0 +1,70 @@ + + + diff --git a/src/views/mes/pro/process/ProProcessContentTable.vue b/src/views/mes/pro/process/ProProcessContentTable.vue new file mode 100644 index 000000000..a55fbdfb2 --- /dev/null +++ b/src/views/mes/pro/process/ProProcessContentTable.vue @@ -0,0 +1,176 @@ + + + + diff --git a/src/views/mes/pro/process/ProProcessForm.vue b/src/views/mes/pro/process/ProProcessForm.vue index a1b1a68bd..19f6b1e92 100644 --- a/src/views/mes/pro/process/ProProcessForm.vue +++ b/src/views/mes/pro/process/ProProcessForm.vue @@ -1,6 +1,6 @@