diff --git a/apps/web-antd/src/views/mes/pro/card/index.vue b/apps/web-antd/src/views/mes/pro/card/index.vue index 718163f13..643efe25f 100644 --- a/apps/web-antd/src/views/mes/pro/card/index.vue +++ b/apps/web-antd/src/views/mes/pro/card/index.vue @@ -174,7 +174,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ label: '完成', type: 'link', auth: ['mes:pro-card:finish'], - ifShow: row.status === MesProCardStatusEnum.ISSUED, + ifShow: row.status === MesProCardStatusEnum.CONFIRMED, onClick: handleFinish.bind(null, row), }, { @@ -182,7 +182,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ type: 'link', danger: true, auth: ['mes:pro-card:update'], - ifShow: row.status === MesProCardStatusEnum.ISSUED, + ifShow: row.status === MesProCardStatusEnum.CONFIRMED, popConfirm: { title: '确认取消该流转卡?取消后不可恢复。', confirm: handleCancel.bind(null, row), diff --git a/apps/web-antd/src/views/mes/utils/constants.ts b/apps/web-antd/src/views/mes/utils/constants.ts index 08b97af14..d247ceb42 100644 --- a/apps/web-antd/src/views/mes/utils/constants.ts +++ b/apps/web-antd/src/views/mes/utils/constants.ts @@ -208,14 +208,12 @@ export const MesWmStockTakingParamTypeEnum = { QUALITY_STATUS: 900, } as const; -/** MES 生产工单状态枚举 */ +/** MES 生产工单状态枚举(独立于通用单据状态,对齐后端 MesProWorkOrderStatusEnum) */ export const MesProWorkOrderStatusEnum = { - PREPARE: MesOrderStatusConstants.DRAFT, - CONFIRMED: MesOrderStatusConstants.CONFIRMED, - APPROVING: MesOrderStatusConstants.APPROVING, - PRODUCING: MesOrderStatusConstants.APPROVED, - FINISHED: MesOrderStatusConstants.FINISHED, - CANCELLED: MesOrderStatusConstants.CANCELLED, + PREPARE: 0, // 草稿 + CONFIRMED: 1, // 已确认 + FINISHED: 2, // 已完成 + CANCELED: 3, // 已取消 } as const; /** MES 工单类型枚举 */ @@ -250,13 +248,12 @@ export const MesProFeedbackStatusEnum = { CANCELED: MesOrderStatusConstants.CANCELLED, } as const; -/** MES 流转卡状态枚举 */ +/** MES 流转卡状态枚举(复用工单状态值,对齐后端 MesProWorkOrderStatusEnum) */ export const MesProCardStatusEnum = { - PREPARE: MesOrderStatusConstants.DRAFT, - ISSUED: MesOrderStatusConstants.CONFIRMED, - PRODUCING: MesOrderStatusConstants.APPROVED, - FINISHED: MesOrderStatusConstants.FINISHED, - CANCELLED: MesOrderStatusConstants.CANCELLED, + PREPARE: 0, // 草稿 + CONFIRMED: 1, // 已确认 + FINISHED: 2, // 已完成 + CANCELED: 3, // 已取消 } as const; /** MES 安灯处置状态枚举 */ diff --git a/apps/web-ele/src/views/mes/pro/card/index.vue b/apps/web-ele/src/views/mes/pro/card/index.vue index 0bdc1b10f..3d601f7b0 100644 --- a/apps/web-ele/src/views/mes/pro/card/index.vue +++ b/apps/web-ele/src/views/mes/pro/card/index.vue @@ -175,7 +175,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ type: 'primary', link: true, auth: ['mes:pro-card:finish'], - ifShow: row.status === MesProCardStatusEnum.ISSUED, + ifShow: row.status === MesProCardStatusEnum.CONFIRMED, onClick: handleFinish.bind(null, row), }, { @@ -183,7 +183,7 @@ const [Grid, gridApi] = useVbenVxeGrid({ type: 'danger', link: true, auth: ['mes:pro-card:update'], - ifShow: row.status === MesProCardStatusEnum.ISSUED, + ifShow: row.status === MesProCardStatusEnum.CONFIRMED, popConfirm: { title: '确认取消该流转卡?取消后不可恢复。', confirm: handleCancel.bind(null, row), diff --git a/apps/web-ele/src/views/mes/utils/constants.ts b/apps/web-ele/src/views/mes/utils/constants.ts index 08b97af14..d247ceb42 100644 --- a/apps/web-ele/src/views/mes/utils/constants.ts +++ b/apps/web-ele/src/views/mes/utils/constants.ts @@ -208,14 +208,12 @@ export const MesWmStockTakingParamTypeEnum = { QUALITY_STATUS: 900, } as const; -/** MES 生产工单状态枚举 */ +/** MES 生产工单状态枚举(独立于通用单据状态,对齐后端 MesProWorkOrderStatusEnum) */ export const MesProWorkOrderStatusEnum = { - PREPARE: MesOrderStatusConstants.DRAFT, - CONFIRMED: MesOrderStatusConstants.CONFIRMED, - APPROVING: MesOrderStatusConstants.APPROVING, - PRODUCING: MesOrderStatusConstants.APPROVED, - FINISHED: MesOrderStatusConstants.FINISHED, - CANCELLED: MesOrderStatusConstants.CANCELLED, + PREPARE: 0, // 草稿 + CONFIRMED: 1, // 已确认 + FINISHED: 2, // 已完成 + CANCELED: 3, // 已取消 } as const; /** MES 工单类型枚举 */ @@ -250,13 +248,12 @@ export const MesProFeedbackStatusEnum = { CANCELED: MesOrderStatusConstants.CANCELLED, } as const; -/** MES 流转卡状态枚举 */ +/** MES 流转卡状态枚举(复用工单状态值,对齐后端 MesProWorkOrderStatusEnum) */ export const MesProCardStatusEnum = { - PREPARE: MesOrderStatusConstants.DRAFT, - ISSUED: MesOrderStatusConstants.CONFIRMED, - PRODUCING: MesOrderStatusConstants.APPROVED, - FINISHED: MesOrderStatusConstants.FINISHED, - CANCELLED: MesOrderStatusConstants.CANCELLED, + PREPARE: 0, // 草稿 + CONFIRMED: 1, // 已确认 + FINISHED: 2, // 已完成 + CANCELED: 3, // 已取消 } as const; /** MES 安灯处置状态枚举 */