diff --git a/src/renderer/src/components/ExecutionReportDialog.tsx b/src/renderer/src/components/ExecutionReportDialog.tsx index 3798597..e9e48bc 100644 --- a/src/renderer/src/components/ExecutionReportDialog.tsx +++ b/src/renderer/src/components/ExecutionReportDialog.tsx @@ -142,7 +142,7 @@ export const ExecutionReportDialog: React.FC = ({

@@ -161,7 +161,7 @@ export const ExecutionReportDialog: React.FC = ({ )} -

+

{dryRun ? '预览模式 - 未实际删除数据' : hasErrors @@ -183,9 +183,9 @@ export const ExecutionReportDialog: React.FC = ({ -

+
- 订单进度 + 订单进度 {Math.min(progress!.currentOrderIndex, progress!.totalOrders)} /{' '} {progress!.totalOrders} @@ -193,14 +193,14 @@ export const ExecutionReportDialog: React.FC = ({
{progress!.totalMaterialsInOrder > 0 && (
- 物料进度 + 物料进度 {progress!.currentMaterialIndex} / {progress!.totalMaterialsInOrder}
)}
- 总进度 + 总进度 {Math.round(progress?.progress || 0)}% @@ -210,8 +210,8 @@ export const ExecutionReportDialog: React.FC = ({ {progress?.currentOrderNumber && (
- 当前订单: - + 当前订单: + {progress.currentOrderNumber}
@@ -220,7 +220,7 @@ export const ExecutionReportDialog: React.FC = ({ {elapsedTime && (
- 已运行 + 已运行 {elapsedTime.formatted}
@@ -229,15 +229,15 @@ export const ExecutionReportDialog: React.FC = ({ {estimatedTime && (
- 预估还要 + 预估还要 {estimatedTime.remainingMinutes} 分钟
- 将会在 + 将会在 {estimatedTime.formattedTime} - 执行完毕 + 执行完毕
)} @@ -246,43 +246,43 @@ export const ExecutionReportDialog: React.FC = ({ // Result View Content <>
-
+
-
处理订单
-
{ordersProcessed}
+
处理订单
+
{ordersProcessed}
-
+
-
{dryRun ? '拟删除物料' : '删除物料'}
-
{materialsDeleted}
+
{dryRun ? '拟删除物料' : '删除物料'}
+
{materialsDeleted}
-
+
-
跳过物料
-
{materialsSkipped}
+
跳过物料
+
{materialsSkipped}
{hasErrors && ( -
+
-
错误数量
+
错误数量
{errors.length}
@@ -290,7 +290,7 @@ export const ExecutionReportDialog: React.FC = ({ {hasRetries && ( <> -
+
= ({
-
重试订单
-
{retriedOrders}
+
重试订单
+
{retriedOrders}
-
+
-
成功重试
-
{successfulRetries}
+
成功重试
+
{successfulRetries}
@@ -353,7 +353,7 @@ export const ExecutionReportDialog: React.FC = ({ )} {hasErrors && ( -
+
错误详情
{errors.map((error, index) => ( @@ -362,7 +362,7 @@ export const ExecutionReportDialog: React.FC = ({ className="flex items-start gap-2 p-2 bg-red-50 rounded border border-red-200" > - {error} + {error}
))}
diff --git a/src/renderer/src/components/ExtractorOperationHistoryModal.tsx b/src/renderer/src/components/ExtractorOperationHistoryModal.tsx index c8d853a..0c28b0e 100644 --- a/src/renderer/src/components/ExtractorOperationHistoryModal.tsx +++ b/src/renderer/src/components/ExtractorOperationHistoryModal.tsx @@ -238,11 +238,11 @@ export const ExtractorOperationHistoryModal: React.FC
{/* Toolbar */} -
+
{isAdmin && allUsers.length > 0 && (
-
筛选用户:
+
筛选用户:
{allUsers.map((username) => { const isSelected = selectedUsers.includes(username) @@ -253,7 +253,7 @@ export const ExtractorOperationHistoryModal: React.FC {username} @@ -272,7 +272,7 @@ export const ExtractorOperationHistoryModal: React.FC )}
- + {isAdmin ? ( 管理员模式:{selectedUsers.length > 0 ? `已选择 ${selectedUsers.length} 个用户` : '显示所有用户记录'} @@ -282,7 +282,7 @@ export const ExtractorOperationHistoryModal: React.FC {batches.length > 0 && ( - 共 {batches.length} 条批次 + 共 {batches.length} 条批次 )}
@@ -307,9 +307,9 @@ export const ExtractorOperationHistoryModal: React.FC {loading && batches.length === 0 ? ( -
加载中...
+
加载中...
) : batches.length === 0 ? ( -
暂无操作记录
+
暂无操作记录
) : (
{batches.map((batch) => { @@ -320,33 +320,33 @@ export const ExtractorOperationHistoryModal: React.FC {/* Batch summary */}
toggleBatchExpansion(batch.batchId)} >
-
-
操作时间
-
+
操作时间
+
{formatDateTime(batch.operationTime)}
-
操作用户
-
{batch.username}
+
操作用户
+
{batch.username}
-
状态
+
状态
{statusIcons[batch.status] || statusIcons.pending}
-
订单数
-
{batch.totalOrders}
+
订单数
+
{batch.totalOrders}
-
记录数
-
{batch.totalRecords}
+
记录数
+
{batch.totalRecords}
-
成功/失败
-
+
成功/失败
+
{batch.successCount} {batch.failedCount > 0 && ( <> @@ -383,7 +383,7 @@ export const ExtractorOperationHistoryModal: React.FC { e.stopPropagation() void handleDeleteBatch(batch.batchId) @@ -398,16 +398,16 @@ export const ExtractorOperationHistoryModal: React.FC 0 && ( -
+
- + - - - - - - + {details.map((detail) => ( - - + - -
+
总排号
+
订单号
+ 状态 + 记录数 + 错误信息
+
{detail.productionId || '-'} + {detail.orderNumber} @@ -467,7 +467,7 @@ export const ExtractorOperationHistoryModal: React.FC + {detail.recordCount ?? '-'} @@ -488,7 +488,7 @@ export const ExtractorOperationHistoryModal: React.FC {/* Footer */} -
+
-
v1.0
+
v1.0
) diff --git a/src/renderer/src/components/MaterialTypeManagementDialog.tsx b/src/renderer/src/components/MaterialTypeManagementDialog.tsx index a375617..a3f3095 100644 --- a/src/renderer/src/components/MaterialTypeManagementDialog.tsx +++ b/src/renderer/src/components/MaterialTypeManagementDialog.tsx @@ -343,9 +343,9 @@ export const MaterialTypeManagementDialog: React.FC {/* Manager filter (admin only) */} {isAdmin && ( -
+
-
+
按负责人筛选
@@ -358,7 +358,7 @@ export const MaterialTypeManagementDialog: React.FC @@ -368,7 +368,7 @@ export const MaterialTypeManagementDialog: React.FC (