操作用户
@@ -318,9 +314,7 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
失败
@@ -389,24 +383,16 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
)}
{executions
- .filter(
- (e) =>
- currentAttempt === undefined ||
- e.attemptNumber === currentAttempt
- )
+ .filter((e) => currentAttempt === undefined || e.attemptNumber === currentAttempt)
.map((exec) => (
-
- 耗时:{formatDuration(exec.operationTime, exec.endTime)}
-
+ 耗时:{formatDuration(exec.operationTime, exec.endTime)}
订单:{exec.ordersProcessed}/{exec.totalOrders}
删除:{exec.totalMaterialsDeleted}
{exec.totalMaterialsFailed > 0 && (
-
- 失败:{exec.totalMaterialsFailed}
-
+ 失败:{exec.totalMaterialsFailed}
)}
{exec.totalUncertainDeletions > 0 && (
@@ -419,9 +405,7 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
{exec.errorMessage.length > 80 ? '...' : ''}
)}
- {exec.appVersion && (
- v{exec.appVersion}
- )}
+ {exec.appVersion && v{exec.appVersion}}
))}
@@ -435,9 +419,10 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
|
-
- 总排号
+ |
+ 序号
|
+ 总排号 |
订单号
@@ -446,38 +431,21 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
onClick={() => handleCopyColumn('orderNumber')}
title="复制所有订单号"
>
-
+
|
-
- 状态
- |
-
- 重试
- |
-
- 已删除
- |
-
- 已跳过
- |
-
- 失败
- |
-
- 不确定
- |
-
- 错误信息
- |
+ 状态 |
+ 重试 |
+ 已删除 |
+ 已跳过 |
+ 失败 |
+ 不确定 |
+ 错误信息 |
- {filteredOrders.map((order) => {
+ {filteredOrders.map((order, index) => {
const orderKey = `${currentAttempt ?? order.attemptNumber}:${order.orderNumber}`
const isOrderExpanded = expandedOrders.has(orderKey)
const materials = orderMaterials.get(orderKey) || []
@@ -501,6 +469,9 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
)}
+
+ {index + 1}
+ |
{order.productionId || '-'}
|
@@ -541,15 +512,9 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
-
)}
-
- {order.materialsDeleted}
- |
-
- {order.materialsSkipped}
- |
-
- {order.materialsFailed || '-'}
- |
+ {order.materialsDeleted} |
+ {order.materialsSkipped} |
+ {order.materialsFailed || '-'} |
{order.uncertainDeletions || '-'}
|
@@ -561,30 +526,25 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
{/* Material details */}
{isOrderExpanded && (
- |
+ |
{isLoadingMaterials ? (
-
- 加载物料详情...
-
+ 加载物料详情...
) : materials.length > 0 ? (
+ |
+ 序号
+ |
物料编码
|
物料名称
|
-
- 行号
- |
-
- 结果
- |
-
- 原因
- |
+ 行号 |
+ 结果 |
+ 原因 |
尝试次数
|
@@ -593,6 +553,9 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
{materials.map((mat, idx) => (
+ |
+ {idx + 1}
+ |
{mat.materialCode}
|
@@ -644,9 +607,7 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
) : (
-
- 暂无物料详情
-
+ 暂无物料详情
)}
|
@@ -658,9 +619,7 @@ const BatchItem = React.memo(({ batch, isAdmin, onDelete }: BatchItemProps) => {
) : (
-
- 暂无订单记录
-
+ 暂无订单记录
)}
)}
@@ -721,8 +680,6 @@ export const CleanerOperationHistoryModal: React.FC {
if (isOpen) {
void fetchBatches()
@@ -749,7 +706,13 @@ export const CleanerOperationHistoryModal: React.FC
+