diff --git a/src/locales/en.ts b/src/locales/en.ts
index a2081d53..93e42035 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -2856,6 +2856,9 @@ export default {
edit: 'Edit',
approve: 'Approve',
unapprove: 'Unapprove',
+ submit: 'Submit',
+ auditApprove: 'Pass',
+ auditReject: 'Reject',
delete: 'Delete',
export: 'Export',
add: 'Add',
@@ -2898,6 +2901,12 @@ export default {
unapproveConfirm: 'Confirm unapprove this stock in order?',
approveSuccess: 'Approve successful',
unapproveSuccess: 'Unapprove successful',
+ submitConfirm: 'Confirm submit this stock in order?',
+ submitSuccess: 'Submit successful',
+ auditApproveConfirm: 'Confirm pass this stock in order?',
+ auditRejectConfirm: 'Confirm reject this stock in order?',
+ auditApproveSuccess: 'Pass successful',
+ auditRejectSuccess: 'Reject successful',
subMoldList: 'Sub Mold List',
moldGroupList: 'Mold Group & Sub Mold List',
moldGroupListTitle: 'Stock In Mold Group List'
@@ -2918,6 +2927,9 @@ export default {
edit: 'Edit',
approve: 'Approve',
unapprove: 'Unapprove',
+ submit: 'Submit',
+ auditApprove: 'Pass',
+ auditReject: 'Reject',
delete: 'Delete',
export: 'Export',
add: 'Add',
@@ -2956,6 +2968,12 @@ export default {
validatorItemWarehouseRequired: 'Warehouse can not be empty',
validatorItemMoldRequired: 'Mold can not be empty',
validatorItemCountRequired: 'Quantity can not be empty',
+ submitConfirm: 'Confirm submit this stock out order?',
+ submitSuccess: 'Submit successful',
+ auditApproveConfirm: 'Confirm pass this stock out order?',
+ auditRejectConfirm: 'Confirm reject this stock out order?',
+ auditApproveSuccess: 'Pass successful',
+ auditRejectSuccess: 'Reject successful',
moldGroupListTitle: 'Stock Out Mold Group List'
},
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 11d0b5a5..99809a79 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2342,6 +2342,9 @@ export default {
edit: '编辑',
approve: '审批',
unapprove: '反审批',
+ submit: '提交',
+ auditApprove: '通过',
+ auditReject: '不通过',
delete: '删除',
export: '导出',
add: '新增',
@@ -2384,6 +2387,12 @@ export default {
unapproveConfirm: '确定反审批该入库单吗?',
approveSuccess: '审批成功',
unapproveSuccess: '反审批成功',
+ submitConfirm: '确定提交该入库单吗?',
+ submitSuccess: '提交成功',
+ auditApproveConfirm: '确定通过该入库单吗?',
+ auditRejectConfirm: '确定不通过该入库单吗?',
+ auditApproveSuccess: '通过成功',
+ auditRejectSuccess: '不通过成功',
subMoldList: '子模具列表',
moldGroupList: '模具组及子模具列表',
moldGroupListTitle: '入库模具组清单'
@@ -2404,6 +2413,9 @@ export default {
edit: '编辑',
approve: '审批',
unapprove: '反审批',
+ submit: '提交',
+ auditApprove: '通过',
+ auditReject: '不通过',
delete: '删除',
export: '导出',
add: '新增',
@@ -2442,6 +2454,12 @@ export default {
validatorItemWarehouseRequired: '仓库不能为空',
validatorItemMoldRequired: '模具不能为空',
validatorItemCountRequired: '数量不能为空',
+ submitConfirm: '确定提交该出库单吗?',
+ submitSuccess: '提交成功',
+ auditApproveConfirm: '确定通过该出库单吗?',
+ auditRejectConfirm: '确定不通过该出库单吗?',
+ auditApproveSuccess: '通过成功',
+ auditRejectSuccess: '不通过成功',
moldGroupListTitle: '出库模具组清单'
},
diff --git a/src/views/mes/moldget/index.vue b/src/views/mes/moldget/index.vue
index ef523c16..c57dee35 100644
--- a/src/views/mes/moldget/index.vue
+++ b/src/views/mes/moldget/index.vue
@@ -206,7 +206,7 @@
-
+
{{ t('MoldManagement.MoldGet.edit') }}
+ {{ t('MoldManagement.MoldGet.submit') }}
+
+
- {{ t('MoldManagement.MoldGet.approve') }}
+ {{ t('MoldManagement.MoldGet.auditApprove') }}
-
+ {{ t('MoldManagement.MoldGet.auditReject') }}
+
{{ t('MoldManagement.MoldGet.delete') }}
@@ -366,14 +375,27 @@ const handleDelete = async (ids: number[]) => {
} catch {}
}
-/** 审批/反审批操作 */
+/** 状态更新操作 */
const handleUpdateStatus = async (id: number, status: number) => {
try {
- // 审批的二次确认
- await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该出库单吗?`)
- // 发起审批
+ const actionMap: Record = {
+ 10: {
+ confirm: t('MoldManagement.MoldGet.submitConfirm'),
+ success: t('MoldManagement.MoldGet.submitSuccess')
+ },
+ 20: {
+ confirm: t('MoldManagement.MoldGet.auditApproveConfirm'),
+ success: t('MoldManagement.MoldGet.auditApproveSuccess')
+ },
+ 1: {
+ confirm: t('MoldManagement.MoldGet.auditRejectConfirm'),
+ success: t('MoldManagement.MoldGet.auditRejectSuccess')
+ }
+ }
+ const action = actionMap[status]
+ await message.confirm(action.confirm)
await StockOutApi.updateStockOutStatus(id, status)
- message.success(`${status === 20 ? '审批' : '反审批'}成功`)
+ message.success(action.success)
// 刷新列表
await getList()
} catch {}
diff --git a/src/views/mes/moldreturn/index.vue b/src/views/mes/moldreturn/index.vue
index a8b77330..f3c45593 100644
--- a/src/views/mes/moldreturn/index.vue
+++ b/src/views/mes/moldreturn/index.vue
@@ -129,7 +129,7 @@
-
+
{{ t('MoldManagement.MoldReturn.detail') }}
@@ -138,18 +138,18 @@
v-hasPermi="['erp:stock-out:update']" :disabled="scope.row.status === 20">
{{ t('MoldManagement.MoldReturn.edit') }}
+
+ {{ t('MoldManagement.MoldReturn.submit') }}
+
- {{ t('MoldManagement.MoldReturn.approve') }}
+ v-hasPermi="['erp:stock-in:update-status']" v-if="Number(scope.row.status) === 10">
+ {{ t('MoldManagement.MoldReturn.auditApprove') }}
+
+
+ {{ t('MoldManagement.MoldReturn.auditReject') }}
-
{{ t('MoldManagement.MoldReturn.delete') }}
@@ -262,14 +262,27 @@ const handleDelete = async (ids: number[]) => {
} catch { }
}
-/** 审批/反审批操作 */
+/** 状态更新操作 */
const handleUpdateStatus = async (id: number, status: number) => {
try {
- const confirmText = status === 20 ? t('MoldManagement.MoldReturn.approveConfirm') : t('MoldManagement.MoldReturn.unapproveConfirm')
- await message.confirm(confirmText)
+ const actionMap: Record = {
+ 10: {
+ confirm: t('MoldManagement.MoldReturn.submitConfirm'),
+ success: t('MoldManagement.MoldReturn.submitSuccess')
+ },
+ 20: {
+ confirm: t('MoldManagement.MoldReturn.auditApproveConfirm'),
+ success: t('MoldManagement.MoldReturn.auditApproveSuccess')
+ },
+ 1: {
+ confirm: t('MoldManagement.MoldReturn.auditRejectConfirm'),
+ success: t('MoldManagement.MoldReturn.auditRejectSuccess')
+ }
+ }
+ const action = actionMap[status]
+ await message.confirm(action.confirm)
await StockInApi.updateStockInStatus(id, status)
- const successText = status === 20 ? t('MoldManagement.MoldReturn.approveSuccess') : t('MoldManagement.MoldReturn.unapproveSuccess')
- message.success(successText)
+ message.success(action.success)
// 刷新列表
await getList()
} catch { }