yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(mes): update MES status enums and adjust visibility conditions for pro-card actions

pull/350/head
YunaiV 2026-05-30 10:54:54 +08:00
parent 60a423f44a
commit 3ef3f246c2
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web-antd/src/views/mes/pro/card/index.vue
View File

@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
label: '完成', label: '完成',
type: 'link', type: 'link',
auth: ['mes:pro-card:finish'], auth: ['mes:pro-card:finish'],
ifShow: row.status === MesProCardStatusEnum.ISSUED, ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
onClick: handleFinish.bind(null, row), onClick: handleFinish.bind(null, row),
}, },
{ {
@ -182,7 +182,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
type: 'link', type: 'link',
danger: true, danger: true,
auth: ['mes:pro-card:update'], auth: ['mes:pro-card:update'],
ifShow: row.status === MesProCardStatusEnum.ISSUED, ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
popConfirm: { popConfirm: {
title: '确认取消该流转卡？取消后不可恢复。', title: '确认取消该流转卡？取消后不可恢复。',
confirm: handleCancel.bind(null, row), confirm: handleCancel.bind(null, row),

23
apps/web-antd/src/views/mes/utils/constants.ts
View File

@ -208,14 +208,12 @@ export const MesWmStockTakingParamTypeEnum = {
QUALITY_STATUS: 900, QUALITY_STATUS: 900,
} as const; } as const;
/** MES 生产工单状态枚举 */ /** MES 生产工单状态枚举（独立于通用单据状态，对齐后端 MesProWorkOrderStatusEnum） */
export const MesProWorkOrderStatusEnum = { export const MesProWorkOrderStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT, PREPARE: 0, // 草稿
CONFIRMED: MesOrderStatusConstants.CONFIRMED, CONFIRMED: 1, // 已确认
APPROVING: MesOrderStatusConstants.APPROVING, FINISHED: 2, // 已完成
PRODUCING: MesOrderStatusConstants.APPROVED, CANCELED: 3, // 已取消
FINISHED: MesOrderStatusConstants.FINISHED,
CANCELLED: MesOrderStatusConstants.CANCELLED,
} as const; } as const;
/** MES 工单类型枚举 */ /** MES 工单类型枚举 */
@ -250,13 +248,12 @@ export const MesProFeedbackStatusEnum = {
CANCELED: MesOrderStatusConstants.CANCELLED, CANCELED: MesOrderStatusConstants.CANCELLED,
} as const; } as const;
/** MES 流转卡状态枚举 */ /** MES 流转卡状态枚举（复用工单状态值，对齐后端 MesProWorkOrderStatusEnum） */
export const MesProCardStatusEnum = { export const MesProCardStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT, PREPARE: 0, // 草稿
ISSUED: MesOrderStatusConstants.CONFIRMED, CONFIRMED: 1, // 已确认
PRODUCING: MesOrderStatusConstants.APPROVED, FINISHED: 2, // 已完成
FINISHED: MesOrderStatusConstants.FINISHED, CANCELED: 3, // 已取消
CANCELLED: MesOrderStatusConstants.CANCELLED,
} as const; } as const;
/** MES 安灯处置状态枚举 */ /** MES 安灯处置状态枚举 */

4
apps/web-ele/src/views/mes/pro/card/index.vue
View File

@ -175,7 +175,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
type: 'primary', type: 'primary',
link: true, link: true,
auth: ['mes:pro-card:finish'], auth: ['mes:pro-card:finish'],
ifShow: row.status === MesProCardStatusEnum.ISSUED, ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
onClick: handleFinish.bind(null, row), onClick: handleFinish.bind(null, row),
}, },
{ {
@ -183,7 +183,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
type: 'danger', type: 'danger',
link: true, link: true,
auth: ['mes:pro-card:update'], auth: ['mes:pro-card:update'],
ifShow: row.status === MesProCardStatusEnum.ISSUED, ifShow: row.status === MesProCardStatusEnum.CONFIRMED,
popConfirm: { popConfirm: {
title: '确认取消该流转卡？取消后不可恢复。', title: '确认取消该流转卡？取消后不可恢复。',
confirm: handleCancel.bind(null, row), confirm: handleCancel.bind(null, row),

23
apps/web-ele/src/views/mes/utils/constants.ts
View File

@ -208,14 +208,12 @@ export const MesWmStockTakingParamTypeEnum = {
QUALITY_STATUS: 900, QUALITY_STATUS: 900,
} as const; } as const;
/** MES 生产工单状态枚举 */ /** MES 生产工单状态枚举（独立于通用单据状态，对齐后端 MesProWorkOrderStatusEnum） */
export const MesProWorkOrderStatusEnum = { export const MesProWorkOrderStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT, PREPARE: 0, // 草稿
CONFIRMED: MesOrderStatusConstants.CONFIRMED, CONFIRMED: 1, // 已确认
APPROVING: MesOrderStatusConstants.APPROVING, FINISHED: 2, // 已完成
PRODUCING: MesOrderStatusConstants.APPROVED, CANCELED: 3, // 已取消
FINISHED: MesOrderStatusConstants.FINISHED,
CANCELLED: MesOrderStatusConstants.CANCELLED,
} as const; } as const;
/** MES 工单类型枚举 */ /** MES 工单类型枚举 */
@ -250,13 +248,12 @@ export const MesProFeedbackStatusEnum = {
CANCELED: MesOrderStatusConstants.CANCELLED, CANCELED: MesOrderStatusConstants.CANCELLED,
} as const; } as const;
/** MES 流转卡状态枚举 */ /** MES 流转卡状态枚举（复用工单状态值，对齐后端 MesProWorkOrderStatusEnum） */
export const MesProCardStatusEnum = { export const MesProCardStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT, PREPARE: 0, // 草稿
ISSUED: MesOrderStatusConstants.CONFIRMED, CONFIRMED: 1, // 已确认
PRODUCING: MesOrderStatusConstants.APPROVED, FINISHED: 2, // 已完成
FINISHED: MesOrderStatusConstants.FINISHED, CANCELED: 3, // 已取消
CANCELLED: MesOrderStatusConstants.CANCELLED,
} as const; } as const;
/** MES 安灯处置状态枚举 */ /** MES 安灯处置状态枚举 */