diff --git a/src/api/mes/ticketManagement/index.ts b/src/api/mes/ticketManagement/index.ts index f5451d1e..08612481 100644 --- a/src/api/mes/ticketManagement/index.ts +++ b/src/api/mes/ticketManagement/index.ts @@ -13,6 +13,7 @@ export interface TicketManagementVO { jobUser?: string taskTime?: string taskEndTime?: string + cancelReason?: string remark?: string creator?: string createTime?: string @@ -41,7 +42,7 @@ export const TicketManagementApi = { return await request.download({ url: `/mes/ticket-management/export-excel`, params }) }, - batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number }) => { + batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number; cancelReason?: string }) => { return await request.put({ url: `/mes/ticket-management/batchUpdateStatus`, data }) }, diff --git a/src/api/mes/zjtask/index.ts b/src/api/mes/zjtask/index.ts index 184030d1..be4b5192 100644 --- a/src/api/mes/zjtask/index.ts +++ b/src/api/mes/zjtask/index.ts @@ -15,6 +15,7 @@ export interface ZjTaskVO { executorId: string executorName: string status: string + cancelReason?: string result: string createTime: string roleIds?: number[] @@ -54,6 +55,10 @@ export const ZjTaskApi = { return await request.download({ url: `/mes/zj-task/export-excel`, params }) }, + batchUpdateZjTaskStatus: async (data: { ids: string; status: string | number; cancelReason?: string }) => { + return await request.put({ url: `/mes/zj-task/batchUpdateStatus`, data }) + }, + getZjTaskResultPage: async (params: any) => { return await request.get({ url: `/mes/zj-task-results/page`, params }) }, diff --git a/src/api/mold/moldrepair/index.ts b/src/api/mold/moldrepair/index.ts index 62f19421..9f6f6ec7 100644 --- a/src/api/mold/moldrepair/index.ts +++ b/src/api/mold/moldrepair/index.ts @@ -50,6 +50,10 @@ export const MoldRepairApi = { return await request.download({ url: `/mes/mold-repair/export-excel`, params }) }, + updateMoldRepairStatus: async (data: any) => { + return await request.put({ url: `/mes/mold-repair/updateMoldRepairStatus`, data }) + }, + getMoldRepairLineListByRepairId: async (repairId) => { return await request.get({ url: `/mes/mold-repair/mold-repair-line/list-by-repair-id?repairId=` + repairId }) }, diff --git a/src/api/mold/ticketManagement/index.ts b/src/api/mold/ticketManagement/index.ts index ebb4137d..96666854 100644 --- a/src/api/mold/ticketManagement/index.ts +++ b/src/api/mold/ticketManagement/index.ts @@ -13,6 +13,7 @@ export interface TicketManagementVO { jobUser?: string taskTime?: string taskEndTime?: string + cancelReason?: string remark?: string creator?: string createTime?: string @@ -37,7 +38,7 @@ export const TicketManagementApi = { return await request.get({ url: `/mes/mold-ticket-management/page`, params }) }, - batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number }) => { + batchUpdateTicketStatus: async (data: { ids: string; jobStatus: string | number; cancelReason?: string }) => { return await request.put({ url: `/mes/mold-ticket-management/batchUpdateStatus`, data }) }, diff --git a/src/assets/imgs/dashboard1.png b/src/assets/imgs/dashboard1.png new file mode 100644 index 00000000..1e6eb88f Binary files /dev/null and b/src/assets/imgs/dashboard1.png differ diff --git a/src/assets/imgs/dashboard2.png b/src/assets/imgs/dashboard2.png new file mode 100644 index 00000000..11307654 Binary files /dev/null and b/src/assets/imgs/dashboard2.png differ diff --git a/src/locales/en.ts b/src/locales/en.ts index 719b4ad1..4ecf34a1 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -1891,6 +1891,10 @@ export default { finishDate: 'Finish Date', confirmDate: 'Acceptance Date', repairResult: 'Repair Result', + repairResultPending: 'Pending Repair', + repairResultOk: 'Pass', + repairResultNg: 'Fail', + repairStatus: 'Result', status: 'Order Status', statusPending: 'Pending', statusDone: 'Completed', @@ -1947,10 +1951,15 @@ export default { subjectCode: 'Repair Code', subjectName: 'Repair Name', subjectContent: 'Repair Content', + remark: 'Remark', + result: 'Result', + resultOk: 'Pass', + resultNg: 'Fail', addLine: 'Add Repair Item', placeholderSubjectCode: 'Please input repair code', placeholderSubjectName: 'Please input repair name', placeholderSubjectContent: 'Please input repair content', + placeholderRemark: 'Please input remark', validatorRepairIdRequired: 'Repair order id can not be empty', validatorSubjectIdRequired: 'Item id can not be empty', validatorSubjectCodeRequired: 'Item code can not be empty', @@ -2174,6 +2183,8 @@ export default { createTime: 'Create Time', operate: 'Operate', inspect: 'Inspect', + cancelTask: 'Cancel Task', + cancelSuccess: 'Cancel task successfully', exportFilename: 'Quality-InspectionTask.xls', placeholderCode: 'Please input code', placeholderType: 'Please select inspection category', @@ -2423,5 +2434,631 @@ export default { manualTableReferColumn: 'Reference Value', manualTableRemarkColumn: 'Remark' } + }, + ProductionPlan: { + Task: { + moduleName: 'Production Task', + + searchCodeLabel: 'Code', + searchCodePlaceholder: 'Please enter code', + searchOrderLabel: 'Order', + searchOrderStartPlaceholder: 'Start Date', + searchOrderEndPlaceholder: 'End Date', + searchDeliveryLabel: 'Delivery', + searchDeliveryStartPlaceholder: 'Start Date', + searchDeliveryEndPlaceholder: 'End Date', + searchRemarkLabel: 'Remark', + searchRemarkPlaceholder: 'Please enter remark', + searchCreateTimeLabel: 'Create Time', + searchCreateTimeStartPlaceholder: 'Start Date', + searchCreateTimeEndPlaceholder: 'End Date', + + buttonSearchText: 'Search', + buttonResetText: 'Reset', + buttonCreateText: 'Add', + buttonExportText: 'Export', + + tabAllLabel: 'All', + tabDraftLabel: 'Draft', + tabSubmitLabel: 'To Submit', + tabIssuedLabel: 'Issued', + tabPlanLabel: 'Planned', + tabStartLabel: 'Started', + tabFinishedLabel: 'Finished', + tabStoredLabel: 'Stored', + + tableCodeColumn: 'Code', + tableOrderDateColumn: 'Order Date', + tableDeliveryDateColumn: 'Delivery Date', + tableTaskTypeColumn: 'Type', + tableStatusColumn: 'Status', + tableRemarkColumn: 'Remark', + tableOperateColumn: 'Operate', + + actionSubmitLabel: 'Submit', + actionApproveLabel: 'Approve', + actionMaterialLabel: 'Material', + actionEditLabel: 'Edit', + actionDeleteLabel: 'Delete', + + detailTabTaskDetailLabel: 'Task Detail', + + dialogCodeLabel: 'Task Code', + dialogCodeTooltip: 'Task code', + dialogCodePlaceholder: 'Code will be generated automatically after saving', + dialogDeliveryDateLabel: 'Delivery Date', + dialogDeliveryDatePlaceholder: 'Select delivery date', + dialogTaskTypeLabel: 'Task Type', + dialogTaskTypeTooltip: 'Source: Data Dictionary - Task Type', + dialogRemarkLabel: 'Remark', + dialogRemarkPlaceholder: 'Please enter remark', + dialogSubmitButtonText: 'Confirm', + dialogCancelButtonText: 'Cancel', + + validatorDeliveryDateRequired: 'Delivery date cannot be empty', + validatorTaskTypeRequired: 'Task type cannot be empty', + + saleDialogCodeLabel: 'Code', + saleDialogCodePlaceholder: 'Please enter task code', + saleDialogDeliveryDateLabel: 'Delivery Date', + saleDialogDeliveryDatePlaceholder: 'Select delivery date', + saleDialogRemarkLabel: 'Remark', + saleDialogRemarkPlaceholder: 'Please enter remark', + saleDialogTaskTypeLabel: 'Task Type', + saleDetailTabTaskDetailLabel: 'Production Task Detail', + saleValidatorCodeRequired: 'Code cannot be empty', + saleValidatorDeliveryDateRequired: 'Delivery date cannot be empty', + saleValidatorTaskTypeRequired: 'Task type cannot be empty', + + detailListCreateButtonText: 'Add', + detailListProductCodeColumn: 'Product Code', + detailListProductNameColumn: 'Product Name', + detailListUnitColumn: 'Unit', + detailListNumberColumn: 'Quantity', + detailListPlanNumberColumn: 'Planned', + detailListFinishDateColumn: 'Delivery Date', + detailListTechRequirementsColumn: 'Technical Requirement', + detailListOperateColumn: 'Operate', + detailListViewActionText: 'Detail', + detailListMaterialActionText: 'Material', + detailListEditActionText: 'Edit', + detailListDeleteActionText: 'Delete', + + detailDialogProductLabel: 'Product', + detailDialogProductPlaceholder: 'Please select product', + detailDialogUnitLabel: 'Unit', + detailDialogUnitPlaceholder: 'Please select product', + detailDialogNumberLabel: 'Quantity', + detailDialogNumberPlaceholder: 'Please enter quantity', + detailDialogProjectLabel: 'Project', + detailDialogProjectPlaceholder: 'Please enter project name', + detailDialogPackageSizeLabel: 'Quantity per Package', + detailDialogPackageSizePlaceholder: 'Please enter packing requirement', + detailDialogPackageNumberLabel: 'Package Quantity', + detailDialogPackageNumberPlaceholder: 'Please enter quantity', + detailDialogTechRequirementsLabel: 'Technical Requirement', + detailDialogTechRequirementsPlaceholder: 'Please enter technical requirement', + detailDialogFinishDateLabel: 'Factory Completion', + detailDialogFinishDatePlaceholder: 'Select factory completion date', + detailFormDeliveryDateLabel: 'Delivery Date', + detailFormDeliveryDatePlaceholder: 'Select delivery date', + detailDialogBoxingDateLabel: 'Boxing Date', + detailDialogBoxingDatePlaceholder: 'Select boxing date', + detailDialogArriveDateLabel: 'Arrival Date', + detailDialogArriveDatePlaceholder: 'Select arrival date', + detailDialogRemarkLabel: 'Remark:', + detailDialogSubmitButtonText: 'Confirm', + detailDialogCancelButtonText: 'Cancel', + + validatorDetailProductIdRequired: 'Product ID cannot be empty', + validatorDetailUnitIdRequired: 'Unit ID cannot be empty', + validatorDetailTaskIdRequired: 'Task ID cannot be empty', + validatorDetailNumberRequired: 'Quantity cannot be empty', + validatorDetailPackageSizeRequired: 'Packing requirement cannot be empty', + + saleDetailTableIndexColumn: 'No.', + saleDetailTableProductColumn: 'Product', + saleDetailTableUnitColumn: 'Unit', + saleDetailTableNumberColumn: 'Quantity', + saleDetailTablePackageSizeColumn: 'Per Package', + saleDetailTablePackageNumberColumn: 'Package Quantity', + saleDetailTableProjectNameColumn: 'Project Name', + saleDetailTableTechRequirementsColumn: 'Technical Requirement', + saleDetailTableRemarkColumn: 'Remark', + saleDetailTableFinishDateColumn: 'Factory Completion', + saleDetailTableBoxingDateColumn: 'Boxing Time', + saleDetailTableArriveDateColumn: 'Arrival Time', + saleDetailTableBarCodeColumn: 'Barcode', + saleDetailTableOperateColumn: 'Operate', + saleDetailAddRowButtonText: '+ Add Task Detail', + saleDetailAddFromOrderButtonText: '+ Add From Sales Order', + saleDetailProductPlaceholder: 'Please select', + validatorRowProductRequired: 'Product cannot be empty', + validatorRowUnitRequired: 'Unit cannot be empty', + validatorRowTaskRequired: 'Production task cannot be empty', + validatorRowNumberRequired: 'Quantity cannot be empty', + + itemNeedDialogTitlePrefix: 'Material Requirement: ', + itemNeedTableItemNameColumn: 'Material', + itemNeedTableUnitNameColumn: 'Unit', + itemNeedTableNumberColumn: 'Required Qty', + itemNeedTableStockNumberColumn: 'Stock', + itemNeedDialogCloseButtonText: 'Close', + itemNeedDialogUnknownTypeMessage: 'Unknown material analysis type!', + + planDialogTaskCodeLabel: 'Product', + planDialogTaskCodePlaceholder: 'Please enter', + planDialogNumberLabel: 'Total', + planDialogNumberPlaceholder: 'Please enter', + planDialogPlanNumberLabel: 'Unfinished', + planDialogPlanNumberPlaceholder: 'Please enter', + planDialogProductsOfPlanLabel: 'Planned Output', + planDialogPlanDateLabel: 'Date', + planDialogPlanDatePlaceholder: 'Please select scheduling dates', + planDialogAutoButtonText: 'Auto Schedule', + planDialogResetButtonText: 'Clear Result', + planDialogTabPlanLabel: 'Pre-schedule Plan', + planDialogTabFinishPlanLabel: 'Scheduled Plan', + planDialogSubmitButtonText: 'Submit', + planDialogCancelButtonText: 'Cancel', + validatorPlanTaskIdRequired: 'Task order cannot be empty', + validatorPlanProductsOfPlanRequired: 'Planned quantity per plan cannot be empty', + planDialogTitlePrefix: 'Product Scheduling: ', + planDialogEmptyPlanMessage: 'Please do not submit empty plan!', + + selectTaskTip: 'Please select a production task order' + }, + + TaskSummary: { + moduleName: 'Task Order Scheduling', + + searchCodeLabel: 'Task Order Code', + searchCodePlaceholder: 'Please input code', + searchOrderLabel: 'Order Date', + searchOrderStartPlaceholder: 'Start Date', + searchOrderEndPlaceholder: 'End Date', + searchDeliveryLabel: 'Delivery Date', + searchDeliveryStartPlaceholder: 'Start Date', + searchDeliveryEndPlaceholder: 'End Date', + searchRemarkLabel: 'Remark', + searchRemarkPlaceholder: 'Please input remark', + searchCreateTimeLabel: 'Create Time', + searchCreateTimeStartPlaceholder: 'Start Date', + searchCreateTimeEndPlaceholder: 'End Date', + + buttonSearchText: 'Search', + buttonResetText: 'Reset', + buttonExportText: 'Export', + + tabAllLabel: 'All', + tabIssuedLabel: 'Issued', + tabPlanLabel: 'Planned', + tabStartLabel: 'Started', + tabFinishedLabel: 'Finished', + tabStoredLabel: 'Stored', + + tableTaskCodeColumn: 'Task Order', + tableOrderDateColumn: 'Order Date', + tableDeliveryDateColumn: 'Delivery Date', + tableStatusColumn: 'Status', + tableRemarkColumn: 'Remark', + tableOperateColumn: 'Operate', + + actionMaterialLabel: 'Material', + actionViewPlanLabel: 'View Plan', + detailTabSummaryLabel: 'Task Order Summary Details', + + detailTableTaskCodeColumn: 'Task Order', + detailTableProductCodeColumn: 'Product Code', + detailTableProductNameColumn: 'Product Name', + detailTableTotalNumberColumn: 'Total Quantity', + detailTablePlanNumberColumn: 'Planned', + detailTableUnplanNumberColumn: 'Unplanned', + detailTableOperateColumn: 'Operate', + detailActionMaterialLabel: 'Material', + detailActionViewPlanLabel: 'View Plan', + detailActionCreatePlanLabel: 'Add Plan', + detailSelectTaskTip: 'Please select a production task order', + + planDialogTaskIdLabel: 'Task Order', + planDialogTaskCodeLabel: 'Task Order', + planDialogProductsOfPlanLabel: 'Planned Output', + planDialogPlanDateLabel: 'Date', + planDialogPlanDatePlaceholder: 'Please select scheduling date', + planDialogAutoButtonText: 'Auto Schedule', + planDialogResetButtonText: 'Clear Result', + planDialogTabPlanLabel: 'Pre-scheduling Plan', + planDialogTabFinishPlanLabel: 'Scheduled Plan', + planDialogSubmitButtonText: 'Submit', + planDialogCancelButtonText: 'Cancel', + planDialogTitlePrefix: 'Task Order Scheduling: ', + validatorPlanTaskIdRequired: 'Task order can not be empty', + validatorPlanProductsOfPlanRequired: 'Planned quantity per batch can not be empty', + planDialogEmptyPlanMessage: 'Please do not submit empty plan!', + + planFormIndexColumn: 'No.', + planFormCodeColumn: 'Plan Code', + planFormCodePlaceholder: 'Please input plan code', + planFormProductColumn: 'Product', + planFormProductIdPlaceholder: 'Please input product ID', + planFormProductNamePlaceholder: 'Please input product', + planFormPlanNumberColumn: 'Quantity', + planFormPlanNumberPlaceholder: 'Please input quantity', + planFormPlanStartTimeColumn: 'Plan Start Time', + planFormPlanStartTimePlaceholder: 'Select plan start time', + planFormPlanEndTimeColumn: 'Plan End Time', + planFormPlanEndTimePlaceholder: 'Select plan end time', + planFormRemarkColumn: 'Remark', + planFormOperateColumn: 'Operate', + planFormCopyButtonText: 'Copy', + planFormDeleteButtonText: 'Delete', + validatorPlanFormProductIdRequired: 'Product can not be empty', + validatorPlanFormTaskIdRequired: 'Task order can not be empty', + validatorPlanFormPlanNumberRequired: 'Quantity can not be empty', + validatorPlanFormPlanStartTimeRequired: 'Plan start time can not be empty', + validatorPlanFormPlanEndTimeRequired: 'Plan end time can not be empty' + }, + + Plan: { + moduleName: 'Production Plan', + + searchTaskLabel: 'Task Order', + searchTaskPlaceholder: 'Please select task order', + searchCodeLabel: 'Plan Code', + searchCodePlaceholder: 'Please enter plan code', + searchProductLabel: 'Product', + searchProductPlaceholder: 'Please select product', + searchRemarkLabel: 'Remark', + searchRemarkPlaceholder: 'Please enter remark', + searchPlanStartLabel: 'Plan Start', + searchPlanStartStartPlaceholder: 'Start Date', + searchPlanStartEndPlaceholder: 'End Date', + searchPlanEndLabel: 'Plan End', + searchPlanEndStartPlaceholder: 'Start Date', + searchPlanEndEndPlaceholder: 'End Date', + + buttonSearchText: 'Search', + buttonResetText: 'Reset', + buttonExportText: 'Export', + + tabPlannedLabel: 'Scheduled', + tabTrialLabel: 'Trial', + tabMassLabel: 'Mass Production', + tabPausedLabel: 'Paused', + tabToStoreLabel: 'To Store', + tabStoredLabel: 'Stored', + + detailItemRequisitionTabLabel: 'Material Details', + detailInspectTabLabel: 'Inspection Details', + detailBaogongRecordTabLabel: 'Report Records', + + tableCodeColumn: 'Plan Code', + tableProductColumn: 'Product', + tableFeedingPipelineColumn: 'Production Line', + tablePlanNumberColumn: 'Planned Qty', + tableFinishNumberColumn: 'Finished Qty', + tablePassRateColumn: 'Pass Rate(%)', + tablePlanStartTimeColumn: 'Plan Start Time', + tablePlanEndTimeColumn: 'Plan End Time', + tableStatusColumn: 'Status', + tableIsZjColumn: 'Inspected', + tableOperateColumn: 'Operate', + + actionDetailLabel: 'Detail', + actionEditLabel: 'Edit', + actionMaterialLabel: 'Material', + actionDispatchFeedingLabel: 'Feeding Dispatch', + actionDispatchProcessLabel: 'Process Dispatch', + actionTrialLabel: 'Trial', + actionInspectLabel: 'Inspect', + actionMassLabel: 'Mass Production', + actionBaogongLabel: 'Report', + actionPauseLabel: 'Pause', + actionFinishLabel: 'Finish', + actionStoreLabel: 'Store', + actionDeleteLabel: 'Delete', + + statusConfirmTitle: 'Prompt', + statusConfirmMessage: 'Plan: {code} confirm {action}?', + inspectConfirmTitle: 'Prompt', + inspectConfirmMessage: 'Plan: {code} confirm inspection?', + + dialogTaskLabel: 'Task Order', + dialogTaskPlaceholder: 'Please select task order', + dialogTaskDetailLabel: 'Detail Item', + dialogTaskDetailPlaceholder: 'Please select detail item', + dialogCodeLabel: 'Plan Code', + dialogCodeTooltip: 'Production plan code', + dialogCodePlaceholder: 'Code will be generated automatically after saving', + dialogFeedingPipelineLabel: 'Production Line', + dialogFeedingPipelinePlaceholder: 'Please select production line', + dialogWorkerLabel: 'Feeding Worker', + dialogWorkerPlaceholder: 'Please select worker', + dialogPlanNumberLabel: 'Quantity', + dialogPreProductionLabel: 'Trial Production', + dialogPlanStartLabel: 'Plan Start', + dialogPlanStartPlaceholder: 'Select plan start time', + dialogPlanEndLabel: 'Plan End', + dialogPlanEndPlaceholder: 'Select plan end time', + dialogRemarkLabel: 'Remark', + dialogRemarkPlaceholder: 'Please enter remark', + dialogSubmitButtonText: 'Confirm', + dialogCancelButtonText: 'Cancel', + + validatorTaskDetailRequired: 'Detail item cannot be empty', + validatorTaskRequired: 'Task order cannot be empty', + validatorPlanNumberRequired: 'Quantity cannot be empty', + validatorPlanStartRequired: 'Plan start time cannot be empty', + validatorPlanEndRequired: 'Plan end time cannot be empty', + validatorFeedingPipelineRequired: 'Production line cannot be empty', + validatorWorkerRequired: 'Feeding worker cannot be empty', + validatorPreProductionRequired: 'Trial production cannot be empty', + + dispatchDialogPlanLabel: 'Plan', + dispatchDialogPlanPlaceholder: 'Please enter plan ID', + dispatchDialogFeedingPipelineLabel: 'Pulp Line', + dispatchDialogFeedingPipelinePlaceholder: 'Please select pulp line', + dispatchDialogWorkerLabel: 'Worker', + dispatchDialogWorkerPlaceholder: 'Please select worker', + dispatchDialogRequisitionDateLabel: 'Planned Feeding', + dispatchDialogRequisitionDatePlaceholder: 'Select feeding time', + dispatchDialogRemarkLabel: 'Remark', + dispatchDialogRemarkPlaceholder: 'Please enter remark', + dispatchDialogSubmitButtonText: 'Submit', + dispatchDialogCancelButtonText: 'Cancel', + dispatchDialogTitle: 'Plan Dispatch: {code}', + dispatchSuccessMessage: 'Dispatch succeeded!', + + typeDispatchDialogPipelineLabel: 'Production Line', + typeDispatchDialogPipelinePlaceholder: 'Please select production line', + typeDispatchDialogPaigongNumLabel: 'Dispatch Quantity', + typeDispatchDialogPaigongNumPlaceholder: 'Please enter quantity', + typeDispatchDialogPreProductionLabel: 'Trial Production', + typeDispatchDialogSubmitButtonText: 'Submit', + typeDispatchDialogCancelButtonText: 'Cancel', + + validatorDispatchPlanRequired: 'Plan cannot be empty', + validatorDispatchFeedingPipelineRequired: 'Pulp line cannot be empty', + validatorDispatchWorkerRequired: 'Feeding worker cannot be empty', + validatorTypeDispatchPipelineRequired: 'Production line cannot be empty', + validatorTypeDispatchPreProductionRequired: 'Trial production cannot be empty', + validatorTypeDispatchPaigongNumRequired: 'Dispatch quantity cannot be empty', + + baogongDialogPlanLabel: 'Plan', + baogongDialogPlanPlaceholder: 'Please enter plan ID', + baogongDialogQualifiedNumberLabel: 'Qualified Qty', + baogongDialogQualifiedNumberPlaceholder: 'Please enter quantity', + baogongDialogUnqualifiedNumberLabel: 'Unqualified Qty', + baogongDialogUnqualifiedNumberPlaceholder: 'Please enter quantity', + baogongDialogReasonLabel: 'Reason', + baogongDialogReasonPlaceholder: 'Please enter reason', + baogongDialogSubmitButtonText: 'Submit', + baogongDialogCancelButtonText: 'Cancel', + baogongDialogTitle: 'Plan Report: {code}', + validatorBaogongQualifiedRequired: 'Quantity cannot be empty', + validatorBaogongUnqualifiedRequired: 'Quantity cannot be empty', + baogongSuccessMessage: 'Report succeeded!', + + detailDialogTitle: 'Detail', + detailDialogTaskLabel: 'Task Order', + detailDialogTaskPlaceholder: 'Please enter task order', + detailDialogProductLabel: 'Detail Item', + detailDialogProductPlaceholder: 'Please enter product', + detailDialogCodeLabel: 'Plan Code', + detailDialogCodePlaceholder: 'Please enter plan code', + detailDialogFeedingPipelineLabel: 'Production Line', + detailDialogFeedingPipelinePlaceholder: 'Please enter production line name', + detailDialogWorkerLabel: 'Worker', + detailDialogWorkerPlaceholder: 'Please enter worker', + detailDialogPlanNumberLabel: 'Quantity', + detailDialogPreProductionLabel: 'Trial Production', + detailDialogPlanStartLabel: 'Plan Start', + detailDialogPlanStartPlaceholder: 'Select plan start time', + detailDialogPlanEndLabel: 'Plan End', + detailDialogPlanEndPlaceholder: 'Select plan end time', + detailDialogRemarkLabel: 'Remark', + detailDialogRemarkPlaceholder: 'Please enter remark', + detailDialogCloseButtonText: 'Close', + + itemNeedDialogPlanTitlePrefix: 'Plan-', + + treeRootLabel: 'Top Production Line Station', + + exportFilename: 'ProductionPlan.xls' + }, + + FeedingRecord: { + moduleName: 'Production Feeding', + + searchCodeLabel: 'Record No.', + searchCodePlaceholder: 'Please enter record No.', + searchPipelineLabel: 'Pulp Line', + searchPipelinePlaceholder: 'Please select pulp line', + searchFeedingTimeLabel: 'Feeding Time', + searchFeedingTimeStartPlaceholder: 'Start Date', + searchFeedingTimeEndPlaceholder: 'End Date', + searchUserLabel: 'Recorder', + searchUserPlaceholder: 'Please enter recorder', + searchRemarkLabel: 'Remark', + searchRemarkPlaceholder: 'Please enter remark', + + buttonSearchText: 'Search', + buttonResetText: 'Reset', + buttonCreateText: 'Add', + buttonExportText: 'Export', + + tabAllLabel: 'All', + tabOrgLabel: 'Material', + tabDryLabel: 'Dry Scrap', + tabWetLabel: 'Wet Scrap', + + detailTabFeedingDetailLabel: 'Feeding Detail', + + tableCodeColumn: 'Record No.', + tablePipelineColumn: 'Pulp Line', + tableFeedingTypeColumn: 'Feeding Type', + tableWeightColumn: 'Quantity', + tableUserColumn: 'Recorder', + tableRemarkColumn: 'Remark', + tableFeedingTimeColumn: 'Feeding Time', + tableOperateColumn: 'Operate', + + actionDeleteLabel: 'Delete', + actionFeedingLabel: 'Feed', + + updateStatusConfirmMessage: 'Confirm to submit feeding record?', + updateStatusConfirmTitle: 'Once submitted, it cannot be undone!', + updateStatusSuccessMessage: 'Submitted successfully!', + + dialogCodeLabel: 'Record No.', + dialogCodeTooltip: 'Record No.', + dialogCodePlaceholder: 'Code will be generated automatically after saving', + dialogFeedingTypeLabel: 'Feeding Type', + dialogFeedingTypeTooltip: 'Source: Data Dictionary - Production Feeding Type', + dialogPlanLabel: 'Production Plan', + dialogPlanPlaceholder: 'Please select production plan', + dialogPipelineLabel: 'Pulp Line', + dialogPipelinePlaceholder: 'Please select pulp line', + dialogProductLabel: 'Product', + dialogProductPlaceholder: 'Please select product', + dialogWeightLabel: 'Weight(kg)', + dialogWeightPlaceholder: 'Please enter weight', + dialogFeedingTimeLabel: 'Feeding Time', + dialogFeedingTimePlaceholder: 'Select feeding time', + dialogRemarkLabel: 'Remark', + dialogRemarkPlaceholder: 'Please enter remark', + dialogSubmitButtonText: 'Confirm', + dialogCancelButtonText: 'Cancel', + + validatorFeedingTypeRequired: 'Feeding type cannot be empty', + validatorPipelineRequired: 'Pulp line cannot be empty', + validatorPlanRequired: 'Production plan cannot be empty', + validatorDetailWeightRequired: 'Quantity cannot be empty', + validatorDetailItemRequired: 'Material cannot be empty', + validatorDetailUnitRequired: 'Unit cannot be empty', + + detailTableIndexColumn: 'No.', + detailTableItemColumn: 'Material', + detailTableUnitColumn: 'Unit', + detailTableWeightColumn: 'Quantity', + + detailListItemColumn: 'Material', + detailListWeightColumn: 'Quantity', + detailListUnitColumn: 'Unit', + detailListFeedingTimeColumn: 'Feeding Time', + + treeRootLabel: 'Top Production Line Station', + + exportFilename: 'FeedingRecord.xls' + }, + + FormingRecord: { + moduleName: 'Forming Record', + + searchOrganizationLabel: 'Station', + searchOrganizationPlaceholder: 'Please enter station', + searchMachineLabel: 'Machine', + searchMachinePlaceholder: 'Please enter machine', + searchTeamLabel: 'Team', + searchTeamPlaceholder: 'Please enter team', + searchRemarkLabel: 'Remark', + searchRemarkPlaceholder: 'Please enter remark', + searchStartTimeLabel: 'Start Time', + searchStartTimeStartPlaceholder: 'Start Date', + searchStartTimeEndPlaceholder: 'End Date', + searchEndTimeLabel: 'End Time', + searchEndTimeStartPlaceholder: 'Start Date', + searchEndTimeEndPlaceholder: 'End Date', + + buttonSearchText: 'Search', + buttonResetText: 'Reset', + buttonCreateText: 'Add', + buttonExportText: 'Export', + + tableNameColumn: 'Name', + tableOrganizationColumn: 'Station', + tableMachineColumn: 'Machine', + tableTeamColumn: 'Team', + tableStartTimeColumn: 'Start Time', + tableEndTimeColumn: 'End Time', + tableStatusColumn: 'Status', + tableProcessColumn: 'Process', + tableRemarkColumn: 'Remark', + tableCreateTimeColumn: 'Create Time', + tableOperateColumn: 'Operate', + + tabFormingRecordLabel: 'Forming Record', + + dialogTeamLabel: 'Team', + dialogTeamPlaceholder: 'Please enter team', + dialogOrganizationLabel: 'Station', + dialogOrganizationPlaceholder: 'Please enter station', + dialogMachineLabel: 'Machine', + dialogMachinePlaceholder: 'Please enter machine', + dialogStartTimeLabel: 'Start Time', + dialogStartTimePlaceholder: 'Select start time', + dialogEndTimeLabel: 'End Time', + dialogEndTimePlaceholder: 'Select end time', + dialogStatusLabel: 'Status', + dialogProcessLabel: 'Process', + dialogProcessPlaceholder: 'Please select process', + dialogRemarkLabel: 'Remark', + dialogRemarkPlaceholder: 'Please enter remark', + + validatorOrganizationRequired: 'Station cannot be empty', + validatorStartTimeRequired: 'Start time cannot be empty', + validatorEndTimeRequired: 'End time cannot be empty', + validatorProcessRequired: 'Process cannot be empty', + + detailListCreateTimeColumn: 'Create Time', + detailListCreatorColumn: 'Creator', + detailListXijiangColumn: 'Pulp Suction Time(S)', + detailListTuoshuiColumn: 'Dehydration Time(S)', + detailListXimuColumn: 'Mold Washing Time(S)', + detailListProductColumn: 'Product', + detailListAppearanceColumn: 'Product Appearance', + detailListProductWeightColumn: 'Wet Weight(g)', + detailListRemarkColumn: 'Remark', + detailListStartTimeColumn: 'Start-up Time', + detailListEndTimeColumn: 'Shutdown Time', + detailListOperateColumn: 'Operate', + + detailDialogStartTimeLabel: 'Start-up Time', + detailDialogStartTimePlaceholder: 'Select start-up time', + detailDialogEndTimeLabel: 'Shutdown Time', + detailDialogEndTimePlaceholder: 'Select shutdown time', + detailDialogXijiangLabel: 'Pulp Suction Time(S)', + detailDialogXijiangPlaceholder: 'Please enter pulp suction time(S)', + detailDialogTuoshuiLabel: 'Dehydration Time(S)', + detailDialogTuoshuiPlaceholder: 'Please enter dehydration time(S)', + detailDialogXimuLabel: 'Mold Washing Time(S)', + detailDialogXimuPlaceholder: 'Please enter mold washing time(S)', + detailDialogProductLabel: 'Product', + detailDialogProductPlaceholder: 'Please select product', + detailDialogAppearanceLabel: 'Product Appearance', + detailDialogAppearancePlaceholder: 'Please enter product appearance', + detailDialogProductWeightLabel: 'Wet Weight(g)', + detailDialogProductWeightPlaceholder: 'Please enter wet weight(g)', + detailDialogRemarkLabel: 'Remark', + detailDialogRemarkPlaceholder: 'Please enter remark', + + dialogSubmitButtonText: 'Confirm', + dialogCancelButtonText: 'Cancel', + + detailValidatorRecordIdRequired: 'Record id cannot be empty', + detailValidatorXijiangRequired: 'Pulp suction time(S) cannot be empty', + detailValidatorTuoshuiRequired: 'Dehydration time(S) cannot be empty', + detailValidatorXimuRequired: 'Mold washing time(S) cannot be empty', + detailValidatorProductRequired: 'Product cannot be empty', + detailValidatorAppearanceRequired: 'Product appearance cannot be empty', + detailValidatorProductWeightRequired: 'Wet weight(g) cannot be empty', + + messageSelectRecordRequired: 'Please select a record table', + + actionEditLabel: 'Edit', + actionDeleteLabel: 'Delete', + + exportFilename: 'FormingRecord.xls' + } } } diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 7e1bb935..3cbccff8 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1473,6 +1473,10 @@ export default { finishDate: '完成日期', confirmDate: '验收日期', repairResult: '维修结果', + repairResultPending: '待维修', + repairResultOk: '通过', + repairResultNg: '不通过', + repairStatus: '结果', status: '单据状态', statusPending: '待完成', statusDone: '已完成', @@ -1529,10 +1533,15 @@ export default { subjectCode: '维修编码', subjectName: '维修名称', subjectContent: '维修内容', + remark: '备注', + result: '结果', + resultOk: '通过', + resultNg: '不通过', addLine: '添加维修项目', placeholderSubjectCode: '请输入维修编码', placeholderSubjectName: '请输入维修名称', placeholderSubjectContent: '请输入维修内容', + placeholderRemark: '请输入备注', validatorRepairIdRequired: '维修单ID不能为空', validatorSubjectIdRequired: '项目ID不能为空', validatorSubjectCodeRequired: '项目编码不能为空', @@ -1756,6 +1765,8 @@ export default { createTime: '创建时间', operate: '操作', inspect: '检验', + cancelTask: '取消任务', + cancelSuccess: '取消任务成功', exportFilename: '质量管理-检验任务.xls', placeholderCode: '请输入单号', placeholderType: '请选择质检分类', @@ -2414,5 +2425,628 @@ export default { validatorStatusRequired: '单位状态不能为空', validatorPrimaryFlagRequired: '是否主单位不能为空' } + }, + ProductionPlan: { + Task: { + moduleName: '生产任务单', + + searchCodeLabel: '编码', + searchCodePlaceholder: '请输入编码', + searchOrderLabel: '下达', + searchOrderStartPlaceholder: '开始日期', + searchOrderEndPlaceholder: '结束日期', + searchDeliveryLabel: '交货', + searchDeliveryStartPlaceholder: '开始日期', + searchDeliveryEndPlaceholder: '结束日期', + searchRemarkLabel: '备注', + searchRemarkPlaceholder: '请输入备注', + searchCreateTimeLabel: '创建时间', + searchCreateTimeStartPlaceholder: '开始日期', + searchCreateTimeEndPlaceholder: '结束日期', + + buttonSearchText: '搜索', + buttonResetText: '重置', + buttonCreateText: '新增', + buttonExportText: '导出', + + tabAllLabel: '所有', + tabDraftLabel: '草稿', + tabSubmitLabel: '送审', + tabIssuedLabel: '下达', + tabPlanLabel: '计划', + tabStartLabel: '开工', + tabFinishedLabel: '完工', + tabStoredLabel: '入库', + + tableCodeColumn: '编码', + tableOrderDateColumn: '下达日期', + tableDeliveryDateColumn: '交货日期', + tableTaskTypeColumn: '类型', + tableStatusColumn: '状态', + tableRemarkColumn: '备注', + tableOperateColumn: '操作', + + actionSubmitLabel: '送审', + actionApproveLabel: '审核', + actionMaterialLabel: '物料', + actionEditLabel: '编辑', + actionDeleteLabel: '删除', + + detailTabTaskDetailLabel: '任务单明细', + + dialogCodeLabel: '任务单编码', + dialogCodeTooltip: '任务单编码', + dialogCodePlaceholder: '编码保存后自动生成', + dialogDeliveryDateLabel: '交货日期', + dialogDeliveryDatePlaceholder: '选择交货日期', + dialogTaskTypeLabel: '任务类型', + dialogTaskTypeTooltip: '来源：数据字典-任务单类型', + dialogRemarkLabel: '备注', + dialogRemarkPlaceholder: '请输入备注', + dialogSubmitButtonText: '确 定', + dialogCancelButtonText: '取 消', + + validatorDeliveryDateRequired: '交货日期不能为空', + validatorTaskTypeRequired: '任务类型不能为空', + + saleDialogCodeLabel: '编码', + saleDialogCodePlaceholder: '请输入任务单编码', + saleDialogDeliveryDateLabel: '交货日期', + saleDialogDeliveryDatePlaceholder: '选择交货日期', + saleDialogRemarkLabel: '备注', + saleDialogRemarkPlaceholder: '请输入备注', + saleDialogTaskTypeLabel: '任务类型', + saleDetailTabTaskDetailLabel: '生产任务单明细', + saleValidatorCodeRequired: '编码不能为空', + saleValidatorDeliveryDateRequired: '交货日期不能为空', + saleValidatorTaskTypeRequired: '任务类型不能为空', + + detailListCreateButtonText: '新增', + detailListProductCodeColumn: '产品编码', + detailListProductNameColumn: '产品名称', + detailListUnitColumn: '单位', + detailListNumberColumn: '数量', + detailListPlanNumberColumn: '已计划', + detailListFinishDateColumn: '交货日期', + detailListTechRequirementsColumn: '技术要求', + detailListOperateColumn: '操作', + detailListViewActionText: '详情', + detailListMaterialActionText: '物料', + detailListEditActionText: '编辑', + detailListDeleteActionText: '删除', + + detailDialogProductLabel: '产品', + detailDialogProductPlaceholder: '请选择产品', + detailDialogUnitLabel: '单位', + detailDialogUnitPlaceholder: '请选择产品', + detailDialogNumberLabel: '数量', + detailDialogNumberPlaceholder: '请输入数量', + detailDialogProjectLabel: '项目', + detailDialogProjectPlaceholder: '请输入项目名称', + detailDialogPackageSizeLabel: '每包数量', + detailDialogPackageSizePlaceholder: '请输入打包要求', + detailDialogPackageNumberLabel: '打包数量', + detailDialogPackageNumberPlaceholder: '请输入数量', + detailDialogTechRequirementsLabel: '技术要求', + detailDialogTechRequirementsPlaceholder: '请输入技术要求', + detailDialogFinishDateLabel: '工厂完成', + detailDialogFinishDatePlaceholder: '选择工厂完成日期', + detailFormDeliveryDateLabel: '交货日期', + detailFormDeliveryDatePlaceholder: '选择交货日期', + detailDialogBoxingDateLabel: '装柜日期', + detailDialogBoxingDatePlaceholder: '选择装柜日期', + detailDialogArriveDateLabel: '到达日期', + detailDialogArriveDatePlaceholder: '选择到达日期', + detailDialogRemarkLabel: '备注：', + detailDialogSubmitButtonText: '确 定', + detailDialogCancelButtonText: '取 消', + + validatorDetailProductIdRequired: '产品ID不能为空', + validatorDetailUnitIdRequired: '单位ID不能为空', + validatorDetailTaskIdRequired: 'task ID不能为空', + validatorDetailNumberRequired: '数量不能为空', + validatorDetailPackageSizeRequired: '打包要求(每包/个)不能为空', + + saleDetailTableIndexColumn: '序号', + saleDetailTableProductColumn: '产品', + saleDetailTableUnitColumn: '单位', + saleDetailTableNumberColumn: '数量', + saleDetailTablePackageSizeColumn: '每包/个', + saleDetailTablePackageNumberColumn: '打包数量', + saleDetailTableProjectNameColumn: '项目名称', + saleDetailTableTechRequirementsColumn: '技术要求', + saleDetailTableRemarkColumn: '备注', + saleDetailTableFinishDateColumn: '工厂完成', + saleDetailTableBoxingDateColumn: '装柜时间', + saleDetailTableArriveDateColumn: '到达时间', + saleDetailTableBarCodeColumn: '条码', + saleDetailTableOperateColumn: '操作', + saleDetailAddRowButtonText: '+ 添加任务单明细', + saleDetailAddFromOrderButtonText: '+ 从销售单添加', + saleDetailProductPlaceholder: '请选择', + validatorRowProductRequired: '产品不能为空', + validatorRowUnitRequired: '单位不能为空', + validatorRowTaskRequired: '生产任务不能为空', + validatorRowNumberRequired: '数量不能为空', + + itemNeedDialogTitlePrefix: '物料需求：', + itemNeedTableItemNameColumn: '原料', + itemNeedTableUnitNameColumn: '单位', + itemNeedTableNumberColumn: '需求量', + itemNeedTableStockNumberColumn: '库存', + itemNeedDialogCloseButtonText: '关 闭', + itemNeedDialogUnknownTypeMessage: '无法识别的物料分析类型！', + + planDialogTaskCodeLabel: '产品', + planDialogTaskCodePlaceholder: '请输入', + planDialogNumberLabel: '总数', + planDialogNumberPlaceholder: '请输入', + planDialogPlanNumberLabel: '未完成数', + planDialogPlanNumberPlaceholder: '请输入', + planDialogProductsOfPlanLabel: '计划产量', + planDialogPlanDateLabel: '日期', + planDialogPlanDatePlaceholder: '请选择排产日期', + planDialogAutoButtonText: '自动排产', + planDialogResetButtonText: '清空结果', + planDialogTabPlanLabel: '预排产计划', + planDialogTabFinishPlanLabel: '已排产计划', + planDialogSubmitButtonText: '提 交', + planDialogCancelButtonText: '取 消', + validatorPlanTaskIdRequired: '任务单不能为空', + validatorPlanProductsOfPlanRequired: '单个计划生产数量不能为空', + planDialogTitlePrefix: '产品排产：', + planDialogEmptyPlanMessage: '请勿提交空计划！', + selectTaskTip: '请选择一个生产任务单' + }, + TaskSummary: { + moduleName: '任务单排产', + + searchCodeLabel: '任务单编码', + searchCodePlaceholder: '请输入编码', + searchOrderLabel: '下达时间', + searchOrderStartPlaceholder: '开始日期', + searchOrderEndPlaceholder: '结束日期', + searchDeliveryLabel: '交货时间', + searchDeliveryStartPlaceholder: '开始日期', + searchDeliveryEndPlaceholder: '结束日期', + searchRemarkLabel: '备注', + searchRemarkPlaceholder: '请输入备注', + searchCreateTimeLabel: '创建时间', + searchCreateTimeStartPlaceholder: '开始日期', + searchCreateTimeEndPlaceholder: '结束日期', + + buttonSearchText: '搜索', + buttonResetText: '重置', + buttonExportText: '导出', + + tabAllLabel: '所有', + tabIssuedLabel: '下达', + tabPlanLabel: '计划', + tabStartLabel: '开工', + tabFinishedLabel: '完工', + tabStoredLabel: '入库', + + tableTaskCodeColumn: '任务单', + tableOrderDateColumn: '下达日期', + tableDeliveryDateColumn: '交货日期', + tableStatusColumn: '状态', + tableRemarkColumn: '备注', + tableOperateColumn: '操作', + + actionMaterialLabel: '物料', + actionViewPlanLabel: '查看计划', + detailTabSummaryLabel: '任务单汇总明细', + + detailTableTaskCodeColumn: '任务单', + detailTableProductCodeColumn: '产品编码', + detailTableProductNameColumn: '产品名称', + detailTableTotalNumberColumn: '任务总数', + detailTablePlanNumberColumn: '已计划', + detailTableUnplanNumberColumn: '未计划', + detailTableOperateColumn: '操作', + detailActionMaterialLabel: '物料', + detailActionViewPlanLabel: '查看计划', + detailActionCreatePlanLabel: '新增计划', + detailSelectTaskTip: '请选择一个生产任务单', + + planDialogTaskIdLabel: '任务单', + planDialogTaskCodeLabel: '任务单', + planDialogProductsOfPlanLabel: '计划产量', + planDialogPlanDateLabel: '日期', + planDialogPlanDatePlaceholder: '请选择排产日期', + planDialogAutoButtonText: '自动排产', + planDialogResetButtonText: '清空结果', + planDialogTabPlanLabel: '预排产计划', + planDialogTabFinishPlanLabel: '已排产计划', + planDialogSubmitButtonText: '提 交', + planDialogCancelButtonText: '取 消', + planDialogTitlePrefix: '任务单排产：', + validatorPlanTaskIdRequired: '任务单不能为空', + validatorPlanProductsOfPlanRequired: '单个计划生产数量不能为空', + planDialogEmptyPlanMessage: '请勿提交空计划！', + + planFormIndexColumn: '序号', + planFormCodeColumn: '计划编码', + planFormCodePlaceholder: '请输入计划编码', + planFormProductColumn: '产品', + planFormProductIdPlaceholder: '请输入产品ID', + planFormProductNamePlaceholder: '请输入产品', + planFormPlanNumberColumn: '数量', + planFormPlanNumberPlaceholder: '请输入数量', + planFormPlanStartTimeColumn: '计划开始时间', + planFormPlanStartTimePlaceholder: '选择计划开始时间', + planFormPlanEndTimeColumn: '计划结束时间', + planFormPlanEndTimePlaceholder: '选择计划结束时间', + planFormRemarkColumn: '备注', + planFormOperateColumn: '操作', + planFormCopyButtonText: '复制', + planFormDeleteButtonText: '删除', + validatorPlanFormProductIdRequired: '产品不能为空', + validatorPlanFormTaskIdRequired: '任务单不能为空', + validatorPlanFormPlanNumberRequired: '数量不能为空', + validatorPlanFormPlanStartTimeRequired: '计划开始时间不能为空', + validatorPlanFormPlanEndTimeRequired: '计划结束时间不能为空' + }, + Plan: { + moduleName: '生产计划', + + searchTaskLabel: '任务单', + searchTaskPlaceholder: '请选择任务单', + searchCodeLabel: '计划编码', + searchCodePlaceholder: '请输入计划编码', + searchProductLabel: '产品', + searchProductPlaceholder: '请选择产品', + searchRemarkLabel: '备注', + searchRemarkPlaceholder: '请输入备注', + searchPlanStartLabel: '计划开始', + searchPlanStartStartPlaceholder: '开始日期', + searchPlanStartEndPlaceholder: '结束日期', + searchPlanEndLabel: '计划结束', + searchPlanEndStartPlaceholder: '开始日期', + searchPlanEndEndPlaceholder: '结束日期', + + buttonSearchText: '搜索', + buttonResetText: '重置', + buttonExportText: '导出', + + tabPlannedLabel: '已排产', + tabTrialLabel: '试产', + tabMassLabel: '量产', + tabPausedLabel: '暂停', + tabToStoreLabel: '待入库', + tabStoredLabel: '已入库', + + detailItemRequisitionTabLabel: '投料明细', + detailInspectTabLabel: '检验明细', + detailBaogongRecordTabLabel: '报工记录', + + tableCodeColumn: '计划编码', + tableProductColumn: '产品', + tableFeedingPipelineColumn: '生产线', + tablePlanNumberColumn: '计划数量', + tableFinishNumberColumn: '完工数量', + tablePassRateColumn: '合格率(%)', + tablePlanStartTimeColumn: '计划开始时间', + tablePlanEndTimeColumn: '计划结束时间', + tableStatusColumn: '状态', + tableIsZjColumn: '是否检验', + tableOperateColumn: '操作', + + actionDetailLabel: '详情', + actionEditLabel: '编辑', + actionMaterialLabel: '物料', + actionDispatchFeedingLabel: '下料派工', + actionDispatchProcessLabel: '工序派工', + actionTrialLabel: '试产', + actionInspectLabel: '检验', + actionMassLabel: '量产', + actionBaogongLabel: '报工', + actionPauseLabel: '暂停', + actionFinishLabel: '完工', + actionStoreLabel: '入库', + actionDeleteLabel: '删除', + + statusConfirmTitle: '提示', + statusConfirmMessage: '计划：{code}确定{action}吗？', + inspectConfirmTitle: '提示', + inspectConfirmMessage: '计划：{code}确定质检吗？', + + dialogTaskLabel: '任务单', + dialogTaskPlaceholder: '请选择任务单', + dialogTaskDetailLabel: '明细项', + dialogTaskDetailPlaceholder: '请选择明细项', + dialogCodeLabel: '计划编码', + dialogCodeTooltip: '生产计划编码', + dialogCodePlaceholder: '编码保存后自动生成', + dialogFeedingPipelineLabel: '生产线', + dialogFeedingPipelinePlaceholder: '请选择生产线', + dialogWorkerLabel: '领料人', + dialogWorkerPlaceholder: '请选择领料人', + dialogPlanNumberLabel: '数量', + dialogPreProductionLabel: '是否试生产', + dialogPlanStartLabel: '计划开始', + dialogPlanStartPlaceholder: '选择计划开始时间', + dialogPlanEndLabel: '计划结束', + dialogPlanEndPlaceholder: '选择计划结束时间', + dialogRemarkLabel: '备注', + dialogRemarkPlaceholder: '请输入备注', + dialogSubmitButtonText: '确 定', + dialogCancelButtonText: '取 消', + + validatorTaskDetailRequired: '明细项不能为空', + validatorTaskRequired: '任务单不能为空', + validatorPlanNumberRequired: '数量不能为空', + validatorPlanStartRequired: '计划开始时间不能为空', + validatorPlanEndRequired: '计划结束时间不能为空', + validatorFeedingPipelineRequired: '生产线不能为空', + validatorWorkerRequired: '下料工人不能为空', + validatorPreProductionRequired: '试生产不能为空', + + dispatchDialogPlanLabel: '计划', + dispatchDialogPlanPlaceholder: '请输入计划ID', + dispatchDialogFeedingPipelineLabel: '制浆线', + dispatchDialogFeedingPipelinePlaceholder: '请选择制浆线', + dispatchDialogWorkerLabel: '领料人', + dispatchDialogWorkerPlaceholder: '请选择工人', + dispatchDialogRequisitionDateLabel: '计划下料', + dispatchDialogRequisitionDatePlaceholder: '选择下料时间', + dispatchDialogRemarkLabel: '备注', + dispatchDialogRemarkPlaceholder: '请输入备注', + dispatchDialogSubmitButtonText: '提 交', + dispatchDialogCancelButtonText: '取 消', + dispatchDialogTitle: '计划派工：{code}', + dispatchSuccessMessage: '派工成功！', + + typeDispatchDialogPipelineLabel: '生产线', + typeDispatchDialogPipelinePlaceholder: '请选择生产线', + typeDispatchDialogPaigongNumLabel: '派工数量', + typeDispatchDialogPaigongNumPlaceholder: '请输入数量', + typeDispatchDialogPreProductionLabel: '是否试生产', + typeDispatchDialogSubmitButtonText: '提 交', + typeDispatchDialogCancelButtonText: '取 消', + + validatorDispatchPlanRequired: '计划不能为空', + validatorDispatchFeedingPipelineRequired: '制浆线不能为空', + validatorDispatchWorkerRequired: '下料工人不能为空', + validatorTypeDispatchPipelineRequired: '生产线不能为空', + validatorTypeDispatchPreProductionRequired: '试生产不能为空', + validatorTypeDispatchPaigongNumRequired: '派工数量不能为空', + + baogongDialogPlanLabel: '计划', + baogongDialogPlanPlaceholder: '请输入计划ID', + baogongDialogQualifiedNumberLabel: '合格数量', + baogongDialogQualifiedNumberPlaceholder: '请输入数量', + baogongDialogUnqualifiedNumberLabel: '不合格数量', + baogongDialogUnqualifiedNumberPlaceholder: '请输入数量', + baogongDialogReasonLabel: '原因', + baogongDialogReasonPlaceholder: '请输入原因', + baogongDialogSubmitButtonText: '提 交', + baogongDialogCancelButtonText: '取 消', + baogongDialogTitle: '计划报工：{code}', + validatorBaogongQualifiedRequired: '数量不能为空', + validatorBaogongUnqualifiedRequired: '数量不能为空', + baogongSuccessMessage: '报工成功！', + + detailDialogTitle: '详情', + detailDialogTaskLabel: '任务单', + detailDialogTaskPlaceholder: '请输入任务单', + detailDialogProductLabel: '明细项', + detailDialogProductPlaceholder: '请输入产品', + detailDialogCodeLabel: '计划编码', + detailDialogCodePlaceholder: '请输入计划编码', + detailDialogFeedingPipelineLabel: '生产线', + detailDialogFeedingPipelinePlaceholder: '请输入生产线名称', + detailDialogWorkerLabel: '领料人', + detailDialogWorkerPlaceholder: '请输入领料人', + detailDialogPlanNumberLabel: '数量', + detailDialogPreProductionLabel: '是否试生产', + detailDialogPlanStartLabel: '计划开始', + detailDialogPlanStartPlaceholder: '选择计划开始时间', + detailDialogPlanEndLabel: '计划结束', + detailDialogPlanEndPlaceholder: '选择计划结束时间', + detailDialogRemarkLabel: '备注', + detailDialogRemarkPlaceholder: '请输入备注', + detailDialogCloseButtonText: '关 闭', + + itemNeedDialogPlanTitlePrefix: '计划-', + + treeRootLabel: '顶级产线工位', + + exportFilename: '生产计划.xls' + }, + + FeedingRecord: { + moduleName: '生产投料', + + searchCodeLabel: '单号', + searchCodePlaceholder: '请输入单号', + searchPipelineLabel: '制浆线', + searchPipelinePlaceholder: '请选择制浆线', + searchFeedingTimeLabel: '投料时间', + searchFeedingTimeStartPlaceholder: '开始日期', + searchFeedingTimeEndPlaceholder: '结束日期', + searchUserLabel: '记录人', + searchUserPlaceholder: '请输入记录人', + searchRemarkLabel: '备注', + searchRemarkPlaceholder: '请输入备注', + + buttonSearchText: '搜索', + buttonResetText: '重置', + buttonCreateText: '新增', + buttonExportText: '导出', + + tabAllLabel: '所有', + tabOrgLabel: '领料', + tabDryLabel: '干废品', + tabWetLabel: '湿废品', + + detailTabFeedingDetailLabel: '投料明细', + + tableCodeColumn: '单号', + tablePipelineColumn: '制浆线', + tableFeedingTypeColumn: '投料类型', + tableWeightColumn: '数量', + tableUserColumn: '记录人', + tableRemarkColumn: '备注', + tableFeedingTimeColumn: '投料时间', + tableOperateColumn: '操作', + + actionDeleteLabel: '删除', + actionFeedingLabel: '投料', + + updateStatusConfirmMessage: '确认提交投料记录？', + updateStatusConfirmTitle: '一旦提交成功无法撤回！', + updateStatusSuccessMessage: '提交成功！', + + dialogCodeLabel: '单号', + dialogCodeTooltip: '单号', + dialogCodePlaceholder: '编码保存后自动生成', + dialogFeedingTypeLabel: '投料类型', + dialogFeedingTypeTooltip: '来源：数据字典-生产投料类型', + dialogPlanLabel: '生产计划', + dialogPlanPlaceholder: '请选择生产计划', + dialogPipelineLabel: '制浆线', + dialogPipelinePlaceholder: '请选择制浆线', + dialogProductLabel: '产品', + dialogProductPlaceholder: '请选择产品', + dialogWeightLabel: '重量(kg)', + dialogWeightPlaceholder: '请输入重量', + dialogFeedingTimeLabel: '投料时间', + dialogFeedingTimePlaceholder: '选择投料时间', + dialogRemarkLabel: '备注', + dialogRemarkPlaceholder: '请输入备注', + dialogSubmitButtonText: '确 定', + dialogCancelButtonText: '取 消', + + validatorFeedingTypeRequired: '投料类型不能为空', + validatorPipelineRequired: '制浆线不能为空', + validatorPlanRequired: '生产计划不能为空', + validatorDetailWeightRequired: '数量不能为空', + validatorDetailItemRequired: '原料不能为空', + validatorDetailUnitRequired: '单位不能为空', + + detailTableIndexColumn: '序号', + detailTableItemColumn: '原料', + detailTableUnitColumn: '单位', + detailTableWeightColumn: '数量', + + detailListItemColumn: '原料', + detailListWeightColumn: '数量', + detailListUnitColumn: '单位', + detailListFeedingTimeColumn: '投料时间', + + treeRootLabel: '顶级产线工位', + + exportFilename: '投料记录.xls' + }, + + FormingRecord: { + moduleName: '成型记录', + + searchOrganizationLabel: '工位', + searchOrganizationPlaceholder: '请输入工位', + searchMachineLabel: '机台', + searchMachinePlaceholder: '请输入机台', + searchTeamLabel: '班组', + searchTeamPlaceholder: '请输入班组', + searchRemarkLabel: '备注', + searchRemarkPlaceholder: '请输入备注', + searchStartTimeLabel: '开始时间', + searchStartTimeStartPlaceholder: '开始日期', + searchStartTimeEndPlaceholder: '结束日期', + searchEndTimeLabel: '结束时间', + searchEndTimeStartPlaceholder: '开始日期', + searchEndTimeEndPlaceholder: '结束日期', + + buttonSearchText: '搜索', + buttonResetText: '重置', + buttonCreateText: '新增', + buttonExportText: '导出', + + tableNameColumn: '名称', + tableOrganizationColumn: '工位', + tableMachineColumn: '机台', + tableTeamColumn: '班组', + tableStartTimeColumn: '开始时间', + tableEndTimeColumn: '结束时间', + tableStatusColumn: '状态', + tableProcessColumn: '工序', + tableRemarkColumn: '备注', + tableCreateTimeColumn: '创建时间', + tableOperateColumn: '操作', + + tabFormingRecordLabel: '成型记录', + + dialogTeamLabel: '班组', + dialogTeamPlaceholder: '请输入班组', + dialogOrganizationLabel: '工位', + dialogOrganizationPlaceholder: '请输入工位', + dialogMachineLabel: '机台', + dialogMachinePlaceholder: '请输入机台', + dialogStartTimeLabel: '开始时间', + dialogStartTimePlaceholder: '选择开始时间', + dialogEndTimeLabel: '结束时间', + dialogEndTimePlaceholder: '选择结束时间', + dialogStatusLabel: '状态', + dialogProcessLabel: '工序', + dialogProcessPlaceholder: '请选择工序', + dialogRemarkLabel: '备注', + dialogRemarkPlaceholder: '请输入备注', + + validatorOrganizationRequired: '工位不能为空', + validatorStartTimeRequired: '开始时间不能为空', + validatorEndTimeRequired: '结束时间不能为空', + validatorProcessRequired: '工序不能为空', + + detailListCreateTimeColumn: '创建时间', + detailListCreatorColumn: '创建者', + detailListXijiangColumn: '吸浆时间(S)', + detailListTuoshuiColumn: '脱水时间(S)', + detailListXimuColumn: '洗模时间(S)', + detailListProductColumn: '产品', + detailListAppearanceColumn: '产品外观', + detailListProductWeightColumn: '湿重(g)', + detailListRemarkColumn: '备注', + detailListStartTimeColumn: '开机时间', + detailListEndTimeColumn: '停机时间', + detailListOperateColumn: '操作', + + detailDialogStartTimeLabel: '开机时间', + detailDialogStartTimePlaceholder: '选择开机时间', + detailDialogEndTimeLabel: '停机时间', + detailDialogEndTimePlaceholder: '选择停机时间', + detailDialogXijiangLabel: '吸浆时间(S)', + detailDialogXijiangPlaceholder: '请输入吸浆时间(S)', + detailDialogTuoshuiLabel: '脱水时间(S)', + detailDialogTuoshuiPlaceholder: '请输入脱水时间(S)', + detailDialogXimuLabel: '洗模时间(S)', + detailDialogXimuPlaceholder: '请输入洗模时间(S)', + detailDialogProductLabel: '产品', + detailDialogProductPlaceholder: '请选择产品', + detailDialogAppearanceLabel: '产品外观', + detailDialogAppearancePlaceholder: '请输入产品外观', + detailDialogProductWeightLabel: '湿重(g)', + detailDialogProductWeightPlaceholder: '请输入湿重(g)', + detailDialogRemarkLabel: '备注', + detailDialogRemarkPlaceholder: '请输入备注', + + dialogSubmitButtonText: '确 定', + dialogCancelButtonText: '取 消', + + detailValidatorRecordIdRequired: '记录id不能为空', + detailValidatorXijiangRequired: '吸浆时间(S)不能为空', + detailValidatorTuoshuiRequired: '脱水时间(S)不能为空', + detailValidatorXimuRequired: '洗模时间(S)不能为空', + detailValidatorProductRequired: '产品不能为空', + detailValidatorAppearanceRequired: '产品外观不能为空', + detailValidatorProductWeightRequired: '湿重(g)不能为空', + + messageSelectRecordRequired: '请选择一个记录表', + + actionEditLabel: '编辑', + actionDeleteLabel: '删除', + + exportFilename: '成型记录.xls' + } } } diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index d5d62411..2f9e230f 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -766,6 +766,24 @@ const getKanban = async () => { getAllApi() diff --git a/src/views/mes/bom/ItemNeedIndex.vue b/src/views/mes/bom/ItemNeedIndex.vue index a823173a..c8d33430 100644 --- a/src/views/mes/bom/ItemNeedIndex.vue +++ b/src/views/mes/bom/ItemNeedIndex.vue @@ -2,15 +2,15 @@ - - - - + + + + @@ -45,7 +45,7 @@ const dialogTitle = ref('') // 弹窗的标题 /** 打开弹窗 */ const open = async (type: string, title: string, id: number, number?:number) => { dialogVisible.value = true - dialogTitle.value = '物料需求:'+title + dialogTitle.value = t('ProductionPlan.Task.itemNeedDialogTitlePrefix') + title loading.value = true try { if (type === 'order') { @@ -60,7 +60,7 @@ const open = async (type: string, title: string, id: number, number?:number) => else if (type === 'product') { list.value = await TaskApi.getProductItemNeedList(id, number) } - else message.error("无法识别的物料分析类型！") + else message.error(t('ProductionPlan.Task.itemNeedDialogUnknownTypeMessage')) } finally { loading.value = false } diff --git a/src/views/mes/deviceledger/DeviceLedgerForm.vue b/src/views/mes/deviceledger/DeviceLedgerForm.vue index b0d74248..ee5e97bf 100644 --- a/src/views/mes/deviceledger/DeviceLedgerForm.vue +++ b/src/views/mes/deviceledger/DeviceLedgerForm.vue @@ -150,41 +150,35 @@ - - - + @change="handleCriticalComponentChange" + /> - - - + @change="handleBeijianChange" + /> @@ -294,6 +288,31 @@ const deviceTypeTree = ref([]) const users = ref([]) const criticalComponentOptions = ref<{ label: string; value: number }[]>([]) const beijianOptions = ref<{ label: string; value: number }[]>([]) +const PAGE_SIZE = 10 + +const buildPagedOptions = (options: { label: string; value: number }[]) => { + const result: { label: string; value: string; children: { label: string; value: number }[] }[] = [] + for (let i = 0; i < options.length; i += PAGE_SIZE) { + const pageIndex = result.length + 1 + result.push({ + label: String(pageIndex), + value: `page-${pageIndex}`, + children: options.slice(i, i + PAGE_SIZE).map((item) => ({ + label: item.label, + value: item.value + })) + }) + } + return result +} + +const cascaderProps = { multiple: true, emitPath: false, checkStrictly: false } + +const criticalComponentCascaderValue = ref<(number | string)[]>([]) +const beijianCascaderValue = ref<(number | string)[]>([]) + +const criticalComponentPagedOptions = computed(() => buildPagedOptions(criticalComponentOptions.value)) +const beijianPagedOptions = computed(() => buildPagedOptions(beijianOptions.value)) const ensureOptionsLoaded = async () => { const [deviceTypeRes, userRes, criticalRes, beijianRes] = await Promise.all([ @@ -318,6 +337,48 @@ const ensureOptionsLoaded = async () => { }) } +watch( + () => formData.value.componentIds, + (ids) => { + criticalComponentCascaderValue.value = Array.isArray(ids) ? [...ids] : [] + }, + { immediate: true } +) + +watch( + () => formData.value.beijianIds, + (ids) => { + beijianCascaderValue.value = Array.isArray(ids) ? [...ids] : [] + }, + { immediate: true } +) + +const handleCriticalComponentChange = (values: (number | string)[]) => { + const validIds = new Set() + const validMap = new Set(criticalComponentOptions.value.map((item) => item.value)) + for (const v of values) { + const num = Number(v) + if (!Number.isNaN(num) && validMap.has(num)) { + validIds.add(num) + } + } + formData.value.componentIds = Array.from(validIds) + criticalComponentCascaderValue.value = Array.from(validIds) +} + +const handleBeijianChange = (values: (number | string)[]) => { + const validIds = new Set() + const validMap = new Set(beijianOptions.value.map((item) => item.value)) + for (const v of values) { + const num = Number(v) + if (!Number.isNaN(num) && validMap.has(num)) { + validIds.add(num) + } + } + formData.value.beijianIds = Array.from(validIds) + beijianCascaderValue.value = Array.from(validIds) +} + /** 打开弹窗 */ const open = async (type: string, id?: number, defaultDeviceTypeId?: number) => { dialogVisible.value = true diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue index 9049277a..7a46257a 100644 --- a/src/views/mes/feedingrecord/FeedingRecordForm.vue +++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue @@ -10,8 +10,8 @@ @@ -87,16 +87,16 @@ const formData = ref({ isPreProduction: undefined }) const formRules = reactive({ - planId: [{ required: true, message: '计划不能为空', trigger: 'blur' }], - feedingPipeline: [{ required: true, message: '制浆线不能为空', trigger: 'blur' }], - workerId: [{ required: true, message: '下料工人不能为空', trigger: 'blur' }], + planId: [{ required: true, message: t('ProductionPlan.Plan.validatorDispatchPlanRequired'), trigger: 'blur' }], + feedingPipeline: [{ required: true, message: t('ProductionPlan.Plan.validatorDispatchFeedingPipelineRequired'), trigger: 'blur' }], + workerId: [{ required: true, message: t('ProductionPlan.Plan.validatorDispatchWorkerRequired'), trigger: 'blur' }], }) const formRef = ref() // 表单 Ref /** 打开弹窗 */ const open = async (planCode: string, planId: number) => { dialogVisible.value = true - dialogTitle.value = "计划派工："+planCode + dialogTitle.value = t('ProductionPlan.Plan.dispatchDialogTitle', { code: planCode }) resetForm() formLoading.value = true try { @@ -122,7 +122,7 @@ const submitForm = async () => { const data = formData.value as unknown as ItemRequisitionVO await PlanApi.arrangePlan(data) - message.success("派工成功！") + message.success(t('ProductionPlan.Plan.dispatchSuccessMessage')) dialogVisible.value = false // 发送操作成功的事件 emit('success') diff --git a/src/views/mes/plan/components/PlanDetail.vue b/src/views/mes/plan/components/PlanDetail.vue index 205eb128..dd2ddb92 100644 --- a/src/views/mes/plan/components/PlanDetail.vue +++ b/src/views/mes/plan/components/PlanDetail.vue @@ -7,8 +7,8 @@ label-width="100px" v-loading="formLoading" > - - + + - - + + - - + + - - + + - - + + @@ -56,10 +56,10 @@ - + - + --> - + - + - - + + @@ -167,7 +167,7 @@ const formRef = ref() // 表单 Ref /** 打开弹窗 */ const open = async (id?: number) => { dialogVisible.value = true - dialogTitle.value = t('详情') + dialogTitle.value = t('ProductionPlan.Plan.detailDialogTitle') // formType.value = type editDisable.value = false resetForm() diff --git a/src/views/mes/plan/components/TypePaigong.vue b/src/views/mes/plan/components/TypePaigong.vue index ce49f757..f794adf7 100644 --- a/src/views/mes/plan/components/TypePaigong.vue +++ b/src/views/mes/plan/components/TypePaigong.vue @@ -7,20 +7,20 @@ label-width="100px" v-loading="formLoading" > - + - - + + - + @@ -73,16 +73,16 @@ const formData = ref({ isPreProduction: undefined }) const formRules = reactive({ - pipeline: [{ required: true, message: '生产线不能为空', trigger: 'blur' }], - isPreProduction: [{ required: true, message: '试生产不能为空', trigger: 'blur' }], - paigongNum: [{ required: true, message: '派工数量不能为空', trigger: 'blur' }], + pipeline: [{ required: true, message: t('ProductionPlan.Plan.validatorTypeDispatchPipelineRequired'), trigger: 'blur' }], + isPreProduction: [{ required: true, message: t('ProductionPlan.Plan.validatorTypeDispatchPreProductionRequired'), trigger: 'blur' }], + paigongNum: [{ required: true, message: t('ProductionPlan.Plan.validatorTypeDispatchPaigongNumRequired'), trigger: 'blur' }], }) const formRef = ref() // 表单 Ref /** 打开弹窗 */ const open = async (planCode: string, planId: number) => { dialogVisible.value = true - dialogTitle.value = "计划派工："+planCode + dialogTitle.value = t('ProductionPlan.Plan.dispatchDialogTitle', { code: planCode }) resetForm() formLoading.value = true try { @@ -108,7 +108,7 @@ const submitForm = async () => { const data = formData.value as unknown as ItemRequisitionVO await PlanApi.arrangePlanNum(data) - message.success("派工成功！") + message.success(t('ProductionPlan.Plan.dispatchSuccessMessage')) dialogVisible.value = false // 发送操作成功的事件 emit('success') diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue index 02f537a7..8048fe94 100644 --- a/src/views/mes/plan/index.vue +++ b/src/views/mes/plan/index.vue @@ -6,15 +6,15 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="68px" + label-width="auto" > - + - + - + - + - + - + - 搜索 - 重置 + {{ t('ProductionPlan.Plan.buttonSearchText') }} + {{ t('ProductionPlan.Plan.buttonResetText') }} - - - - - - + + + + + + - - + + - - - - + + + + - + @@ -171,15 +171,15 @@ --> - - - + + + - - + + @@ -439,7 +439,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await PlanApi.exportPlan(queryParams) - download.excel(data, '生产计划.xls') + download.excel(data, t('ProductionPlan.Plan.exportFilename')) } catch { } finally { exportLoading.value = false @@ -465,7 +465,7 @@ onMounted(async () => { /** 物料需求 */ const itemFormRef = ref() const openItemNeed = (planCode:string, planId: number) => { - itemFormRef.value.open("plan","计划-"+planCode, planId) + itemFormRef.value.open('plan', t('ProductionPlan.Plan.itemNeedDialogPlanTitlePrefix') + planCode, planId) } /** 派工 */ @@ -502,7 +502,10 @@ const handleStatus = async (planCode:string, id: number, // await message.confirm("计划："+planCode+"确定"+tip+"吗?",planCode) // } // 二次确认 - await message.confirm("计划："+planCode+"确定"+tip+"吗?",planCode) + await message.confirm( + t('ProductionPlan.Plan.statusConfirmMessage', { code: planCode, action: tip }), + t('ProductionPlan.Plan.statusConfirmTitle') + ) // 发起 const data ={ id: id, @@ -520,7 +523,10 @@ const handleStatus = async (planCode:string, id: number, const handleZjStatus = async (planCode:string, id: number) => { try { // 二次确认 - await message.confirm("计划："+planCode+"确定质检吗?",planCode) + await message.confirm( + t('ProductionPlan.Plan.inspectConfirmMessage', { code: planCode }), + t('ProductionPlan.Plan.inspectConfirmTitle') + ) // 发起 const data ={ id: id diff --git a/src/views/mes/record/RecordTemplateForm.vue b/src/views/mes/record/RecordTemplateForm.vue index f366d520..664cfc9c 100644 --- a/src/views/mes/record/RecordTemplateForm.vue +++ b/src/views/mes/record/RecordTemplateForm.vue @@ -4,36 +4,36 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="100px" + label-width="auto" v-loading="formLoading" > - - + + - - + + - - + + - + - + - + - - + + - - + + @@ -98,10 +98,10 @@ const formData = ref({ isEnable: undefined, }) const formRules = reactive({ - organizationId: [{ required: true, message: '工位不能为空', trigger: 'blur' }], - startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }], - endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }], - recordType: [{ required: true, message: '工序不能为空', trigger: 'change' }], + organizationId: [{ required: true, message: t('ProductionPlan.FormingRecord.validatorOrganizationRequired'), trigger: 'blur' }], + startTime: [{ required: true, message: t('ProductionPlan.FormingRecord.validatorStartTimeRequired'), trigger: 'blur' }], + endTime: [{ required: true, message: t('ProductionPlan.FormingRecord.validatorEndTimeRequired'), trigger: 'blur' }], + recordType: [{ required: true, message: t('ProductionPlan.FormingRecord.validatorProcessRequired'), trigger: 'change' }], }) const formRef = ref() // 表单 Ref diff --git a/src/views/mes/record/components/RecordChengxingForm.vue b/src/views/mes/record/components/RecordChengxingForm.vue index 5dd886eb..c2f8ab5a 100644 --- a/src/views/mes/record/components/RecordChengxingForm.vue +++ b/src/views/mes/record/components/RecordChengxingForm.vue @@ -4,52 +4,52 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="100px" + label-width="auto" v-loading="formLoading" > - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -111,13 +111,13 @@ const formData = ref({ isEnable: undefined, }) const formRules = reactive({ - recordId: [{ required: true, message: '记录id不能为空', trigger: 'blur' }], - xijiang: [{ required: true, message: '吸浆时间(S)不能为空', trigger: 'blur' }], - tuoshui: [{ required: true, message: '脱水时间(S)不能为空', trigger: 'blur' }], - ximu: [{ required: true, message: '洗模时间(S)不能为空', trigger: 'blur' }], - productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }], - appearance: [{ required: true, message: '产品外观不能为空', trigger: 'blur' }], - productWeight: [{ required: true, message: '湿重(g)不能为空', trigger: 'blur' }], + recordId: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorRecordIdRequired'), trigger: 'blur' }], + xijiang: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorXijiangRequired'), trigger: 'blur' }], + tuoshui: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorTuoshuiRequired'), trigger: 'blur' }], + ximu: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorXimuRequired'), trigger: 'blur' }], + productId: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorProductRequired'), trigger: 'blur' }], + appearance: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorAppearanceRequired'), trigger: 'blur' }], + productWeight: [{ required: true, message: t('ProductionPlan.FormingRecord.detailValidatorProductWeightRequired'), trigger: 'blur' }], }) const formRef = ref() // 表单 Ref const productList = ref([]) // 产品列表 diff --git a/src/views/mes/record/components/RecordChengxingList.vue b/src/views/mes/record/components/RecordChengxingList.vue index 0b7b2a66..5bc70437 100644 --- a/src/views/mes/record/components/RecordChengxingList.vue +++ b/src/views/mes/record/components/RecordChengxingList.vue @@ -7,40 +7,40 @@ @click="openForm('create')" v-hasPermi="['mes:record-template:create']" > - 新增 + {{ t('ProductionPlan.FormingRecord.buttonCreateText') }} - - - - - - - - + + + + + + + + - + @@ -128,7 +128,7 @@ const handleQuery = () => { const formRef = ref() const openForm = (type: string, id?: number) => { if (!props.recordId) { - message.error('请选择一个记录表') + message.error(t('ProductionPlan.FormingRecord.messageSelectRecordRequired')) return } formRef.value.open(type, id, props.recordId) diff --git a/src/views/mes/record/index.vue b/src/views/mes/record/index.vue index 72364d49..a22a32d7 100644 --- a/src/views/mes/record/index.vue +++ b/src/views/mes/record/index.vue @@ -6,14 +6,14 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="68px" + label-width="auto" > - + - + - + - + - + - + @@ -83,15 +83,15 @@ - 搜索 - 重置 + {{ t('ProductionPlan.FormingRecord.buttonSearchText') }} + {{ t('ProductionPlan.FormingRecord.buttonResetText') }} - 新增 + {{ t('ProductionPlan.FormingRecord.buttonCreateText') }} - 导出 + {{ t('ProductionPlan.FormingRecord.buttonExportText') }} @@ -118,43 +118,43 @@ highlight-current-row @current-change="handleCurrentChange" > - - - - + + + + - + - + - + - + @@ -189,7 +189,7 @@ - + diff --git a/src/views/mes/task/TaskAddSaleForm.vue b/src/views/mes/task/TaskAddSaleForm.vue index b777f8b2..3f480599 100644 --- a/src/views/mes/task/TaskAddSaleForm.vue +++ b/src/views/mes/task/TaskAddSaleForm.vue @@ -4,32 +4,32 @@ ref="formRef" :model="formData" :rules="formRules" - label-width="80px" + label-width="100px" v-loading="formLoading" > - - + + - + - - + + - + - + @@ -80,9 +80,9 @@ const formData = ref({ isEnable: undefined, }) const formRules = reactive({ - code: [{ required: true, message: '编码不能为空', trigger: 'blur' }], - deliveryDate: [{ required: true, message: '交货日期不能为空', trigger: 'blur' }], - taskType: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }], + code: [{ required: true, message: t('ProductionPlan.Task.saleValidatorCodeRequired'), trigger: 'blur' }], + deliveryDate: [{ required: true, message: t('ProductionPlan.Task.saleValidatorDeliveryDateRequired'), trigger: 'blur' }], + taskType: [{ required: true, message: t('ProductionPlan.Task.saleValidatorTaskTypeRequired'), trigger: 'blur' }], }) const formRef = ref() // 表单 Ref diff --git a/src/views/mes/task/TaskForm.vue b/src/views/mes/task/TaskForm.vue index 258efa72..6a0dbe45 100644 --- a/src/views/mes/task/TaskForm.vue +++ b/src/views/mes/task/TaskForm.vue @@ -10,8 +10,8 @@ @@ -101,8 +101,8 @@ const formData = ref({ }) const formRules = reactive({ - taskId: [{required: true, message: '任务单不能为空', trigger: 'blur'}], - productsOfPlan: [{required: true, message: '单个计划生产数量不能为空', trigger: 'blur'}], + taskId: [{required: true, message: t('ProductionPlan.Task.validatorPlanTaskIdRequired'), trigger: 'blur'}], + productsOfPlan: [{required: true, message: t('ProductionPlan.Task.validatorPlanProductsOfPlanRequired'), trigger: 'blur'}], }) const formRef = ref() // 表单 Ref @@ -114,7 +114,7 @@ const planFormRef = ref() /** 打开弹窗 */ const open = async (taskId: number, taskDetailId: number, productId: number, productName:string, num:number,finishNumber:number) => { dialogVisible.value = true - dialogTitle.value = "产品排产：" + productName + dialogTitle.value = t('ProductionPlan.Task.planDialogTitlePrefix') + productName formData.value.taskId = taskId formData.value.taskDetailId = taskDetailId formData.value.taskCode = productName @@ -151,7 +151,7 @@ const submitForm = async () => { // 发送操作成功的事件 emit('success') } - else message.alert("请勿提交空计划！") + else message.alert(t('ProductionPlan.Task.planDialogEmptyPlanMessage')) } finally { formLoading.value = false } diff --git a/src/views/mes/task/components/TaskAddSaleDetailForm.vue b/src/views/mes/task/components/TaskAddSaleDetailForm.vue index 30008944..2878959a 100644 --- a/src/views/mes/task/components/TaskAddSaleDetailForm.vue +++ b/src/views/mes/task/components/TaskAddSaleDetailForm.vue @@ -8,15 +8,15 @@ :inline-message="true" > - - + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -159,11 +159,11 @@ const formData = ref({ arriveDate: undefined, }) const formRules = reactive({ - productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }], - unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }], - taskId: [{ required: true, message: 'task ID不能为空', trigger: 'blur' }], - number: [{ required: true, message: '数量不能为空', trigger: 'blur' }], - packageSize: [{ required: true, message: '打包要求(每包/个)不能为空', trigger: 'blur' }] + productId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailProductIdRequired'), trigger: 'blur' }], + unitId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailUnitIdRequired'), trigger: 'blur' }], + taskId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailTaskIdRequired'), trigger: 'blur' }], + number: [{ required: true, message: t('ProductionPlan.Task.validatorDetailNumberRequired'), trigger: 'blur' }], + packageSize: [{ required: true, message: t('ProductionPlan.Task.validatorDetailPackageSizeRequired'), trigger: 'blur' }] }) const formRef = ref() // 表单 Ref diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue index 25043ab4..7d40a94a 100644 --- a/src/views/mes/task/components/TaskDetailList.vue +++ b/src/views/mes/task/components/TaskDetailList.vue @@ -7,33 +7,33 @@ @click="openForm('create')" v-hasPermi="['mes:task:create']" > - 新增 + {{ t('ProductionPlan.Task.detailListCreateButtonText') }} - - - - - - - + + + + + + + - + - + @@ -169,11 +169,11 @@ const formData = ref({ arriveDate: undefined, }) const formRules = reactive({ - productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }], - unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }], - taskId: [{ required: true, message: 'task ID不能为空', trigger: 'blur' }], - number: [{ required: true, message: '数量不能为空', trigger: 'blur' }], - packageSize: [{ required: true, message: '打包要求(每包/个)不能为空', trigger: 'blur' }] + productId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailProductIdRequired'), trigger: 'blur' }], + unitId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailUnitIdRequired'), trigger: 'blur' }], + taskId: [{ required: true, message: t('ProductionPlan.Task.validatorDetailTaskIdRequired'), trigger: 'blur' }], + number: [{ required: true, message: t('ProductionPlan.Task.validatorDetailNumberRequired'), trigger: 'blur' }], + packageSize: [{ required: true, message: t('ProductionPlan.Task.validatorDetailPackageSizeRequired'), trigger: 'blur' }] }) const formRef = ref() // 表单 Ref diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue index e6b5b33b..70edc1b3 100644 --- a/src/views/mes/task/index.vue +++ b/src/views/mes/task/index.vue @@ -2,77 +2,77 @@ - + - + - + - + - + - 搜索 - 重置 + {{ t('ProductionPlan.Task.buttonSearchText') }} + {{ t('ProductionPlan.Task.buttonResetText') }} - 新增 + {{ t('ProductionPlan.Task.buttonCreateText') }} - 导出 + {{ t('ProductionPlan.Task.buttonExportText') }} @@ -90,14 +90,14 @@ - - - - - - - - + + + + + + + + - - - - + + + + - + - + - + @@ -162,7 +162,7 @@ - + diff --git a/src/views/mes/tasksummary/components/PlanForm.vue b/src/views/mes/tasksummary/components/PlanForm.vue index f839d1e8..3185b4a1 100644 --- a/src/views/mes/tasksummary/components/PlanForm.vue +++ b/src/views/mes/tasksummary/components/PlanForm.vue @@ -9,58 +9,58 @@ :default-sort="{ prop: 'sort_date', order: 'descending' }" > - - + + - + - + - + - + - + - + @@ -100,8 +100,8 @@ const formData = ref({ }) const formRules = reactive({ - taskId: [{required: true, message: '任务单不能为空', trigger: 'blur'}], - productsOfPlan: [{required: true, message: '单个计划生产数量不能为空', trigger: 'blur'}], + taskId: [{required: true, message: t('ProductionPlan.TaskSummary.validatorPlanTaskIdRequired'), trigger: 'blur'}], + productsOfPlan: [{required: true, message: t('ProductionPlan.TaskSummary.validatorPlanProductsOfPlanRequired'), trigger: 'blur'}], }) const formRef = ref() // 表单 Ref @@ -113,7 +113,7 @@ const planFormRef = ref() /** 打开弹窗 */ const open = async (taskCode: string, taskId: number) => { dialogVisible.value = true - dialogTitle.value = "任务单排产：" + taskCode + dialogTitle.value = t('ProductionPlan.TaskSummary.planDialogTitlePrefix') + taskCode formData.value.taskId = taskId formData.value.taskCode = taskCode @@ -146,7 +146,7 @@ const submitForm = async () => { // 发送操作成功的事件 emit('success') } - else message.alert("请勿提交空计划！") + else message.alert(t('ProductionPlan.TaskSummary.planDialogEmptyPlanMessage')) } finally { formLoading.value = false } diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue index 5471a647..e0b326c1 100644 --- a/src/views/mes/tasksummary/index.vue +++ b/src/views/mes/tasksummary/index.vue @@ -6,65 +6,66 @@ :model="queryParams" ref="queryFormRef" :inline="true" - label-width="85px" + label-width="auto" + label-position="left" > - + - + - + - + - + - 搜索 - 重置 + {{ t('ProductionPlan.TaskSummary.buttonSearchText') }} + {{ t('ProductionPlan.TaskSummary.buttonResetText') }} - 导出 + {{ t('ProductionPlan.TaskSummary.buttonExportText') }} @@ -82,12 +83,12 @@ - - - - - - + + + + + + - - - - + + + + - + - +