diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts index 42eef4f8..3fd1b704 100644 --- a/src/api/mes/task/index.ts +++ b/src/api/mes/task/index.ts @@ -6,6 +6,7 @@ export interface TaskVO { code: string // 编码 orderDate: Date // 下达日期 deliveryDate: Date // 交货日期 + isUrgent: string // 是否急单0-否 1-是 status: number // 状态 processInstanceId: string // 流程实例的编号 remark: string // 备注 diff --git a/src/locales/en.ts b/src/locales/en.ts index 6d0c83e0..5bf0143a 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -3215,6 +3215,7 @@ export default { tableOrderDateColumn: 'Order Date', tableDeliveryDateColumn: 'Delivery Date', tableTaskTypeColumn: 'Type', + tableIsUrgentColumn: 'Urgent', tableStatusColumn: 'Status', tableRemarkColumn: 'Remark', tableOperateColumn: 'Operate', @@ -3234,6 +3235,9 @@ export default { dialogDeliveryDatePlaceholder: 'Select delivery date', dialogTaskTypeLabel: 'Task Type', dialogTaskTypeTooltip: 'Source: Data Dictionary - Task Type', + dialogIsUrgentLabel: 'Urgent', + urgentNoLabel: 'No', + urgentYesLabel: 'Yes', dialogRemarkLabel: 'Remark', dialogRemarkPlaceholder: 'Please enter remark', dialogSubmitButtonText: 'Confirm', @@ -3241,6 +3245,7 @@ export default { validatorDeliveryDateRequired: 'Delivery date cannot be empty', validatorTaskTypeRequired: 'Task type cannot be empty', + validatorIsUrgentRequired: 'Urgent flag cannot be empty', saleDialogCodeLabel: 'Code', saleDialogCodePlaceholder: 'Please enter task code', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 547ebe42..24811cf5 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -3055,6 +3055,7 @@ export default { tableOrderDateColumn: '下达日期', tableDeliveryDateColumn: '交货日期', tableTaskTypeColumn: '类型', + tableIsUrgentColumn: '是否急单', tableStatusColumn: '状态', tableRemarkColumn: '备注', tableOperateColumn: '操作', @@ -3074,6 +3075,9 @@ export default { dialogDeliveryDatePlaceholder: '选择交货日期', dialogTaskTypeLabel: '任务类型', dialogTaskTypeTooltip: '来源:数据字典-任务单类型', + dialogIsUrgentLabel: '是否急单', + urgentNoLabel: '否', + urgentYesLabel: '是', dialogRemarkLabel: '备注', dialogRemarkPlaceholder: '请输入备注', dialogSubmitButtonText: '确 定', @@ -3081,6 +3085,7 @@ export default { validatorDeliveryDateRequired: '交货日期不能为空', validatorTaskTypeRequired: '任务类型不能为空', + validatorIsUrgentRequired: '是否急单不能为空', saleDialogCodeLabel: '编码', saleDialogCodePlaceholder: '请输入任务单编码', diff --git a/src/views/mes/task/TaskForm.vue b/src/views/mes/task/TaskForm.vue index 16349481..8eafd6e8 100644 --- a/src/views/mes/task/TaskForm.vue +++ b/src/views/mes/task/TaskForm.vue @@ -62,6 +62,12 @@ + + + {{ t('ProductionPlan.Task.urgentNoLabel') }} + {{ t('ProductionPlan.Task.urgentYesLabel') }} + + @@ -95,6 +101,7 @@ const formData = ref({ deliveryDate: undefined, status: undefined, taskType: undefined, + isUrgent: undefined, processInstanceId: undefined, remark: undefined, isEnable: undefined, @@ -103,6 +110,7 @@ const formData = ref({ const formRules = reactive({ deliveryDate: [{ required: true, message: t('ProductionPlan.Task.validatorDeliveryDateRequired'), trigger: 'blur' }], taskType: [{ required: true, message: t('ProductionPlan.Task.validatorTaskTypeRequired'), trigger: 'blur' }], + isUrgent: [{ required: true, message: t('ProductionPlan.Task.validatorIsUrgentRequired'), trigger: 'change' }] }) const formRef = ref() // 表单 Ref @@ -116,7 +124,11 @@ const open = async (type: string, id?: number) => { if (id) { formLoading.value = true try { - formData.value = await TaskApi.getTask(id) + const taskData = await TaskApi.getTask(id) + formData.value = { + ...taskData, + isUrgent: String(taskData?.isUrgent ?? '0') + } } finally { formLoading.value = false } @@ -155,6 +167,7 @@ const resetForm = () => { code: undefined, orderDate: undefined, taskType: '订单任务', + isUrgent: '0', deliveryDate: undefined, status: undefined, processInstanceId: undefined, diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue index 937cea2a..96913633 100644 --- a/src/views/mes/task/index.vue +++ b/src/views/mes/task/index.vue @@ -115,6 +115,13 @@ + + +