diff --git a/frontend/src/pages/Dashboard/components/PendingApprovalModal.tsx b/frontend/src/pages/Dashboard/components/PendingApprovalModal.tsx index a9db13c1..9d780e21 100644 --- a/frontend/src/pages/Dashboard/components/PendingApprovalModal.tsx +++ b/frontend/src/pages/Dashboard/components/PendingApprovalModal.tsx @@ -179,7 +179,7 @@ export const PendingApprovalModal: React.FC = ({ key={task.taskId} className="group p-3 border border-border rounded-lg hover:bg-muted/50 transition-colors" > - {/* 主要信息行 */} + {/* 第一行:应用信息 + 操作按钮 */}
@@ -191,6 +191,15 @@ export const PendingApprovalModal: React.FC = ({ {task.environmentName} + + {task.approvalMode === 'ANY' && '任一通过'} + {task.approvalMode === 'SINGLE' && '单人审批'} + {task.approvalMode === 'MULTI' && '会签'} + {task.approvalMode === 'OR' && '或签'} +
{/* 操作按钮 */} @@ -223,28 +232,18 @@ export const PendingApprovalModal: React.FC = ({
- {/* 次要信息行 */} -
-
- {(task.approvalTitle || task.approvalContent) && ( - - {task.approvalTitle}{task.approvalTitle && task.approvalContent && ' - '}{task.approvalContent} - - )} - {task.deployRemark && ( - - - {task.deployRemark} - - )} -
-
- {task.pendingDuration && ( - - - {formatDuration(task.pendingDuration)} - - )} + {/* 第二行:任务名称 + 备注 */} +
+ + + {task.taskName} + {task.deployRemark && ` · ${task.deployRemark}`} + +
+ + {/* 第三行:元信息(左)+ 等待时长(右) */} +
+
{task.deployBy} @@ -254,6 +253,10 @@ export const PendingApprovalModal: React.FC = ({ {formatTime(task.deployStartTime)}
+ + + 已等待 {formatDuration(task.pendingDuration || 0)} +
))} @@ -265,87 +268,87 @@ export const PendingApprovalModal: React.FC = ({ {/* 审批确认对话框 */} - - -
+ + +
{approvalResult === ApprovalResult.APPROVED ? ( - + ) : ( - + )}
- + {approvalResult === ApprovalResult.APPROVED ? '确认通过审批' : '确认拒绝审批'} +

+ 您即将 + + {approvalResult === ApprovalResult.APPROVED ? '通过' : '拒绝'} + + 以下部署申请 +

-
- {selectedTask && ( - <> -
- 您即将 - - {approvalResult === ApprovalResult.APPROVED ? '通过' : '拒绝'} - - 以下部署申请 -
-
-
- 记录ID - #{selectedTask.deployRecordId} -
-
-
- 应用 - {selectedTask.applicationName} -
-
- 环境 - {selectedTask.environmentName} -
-
- 申请人 -
-
- -
- {selectedTask.deployBy} -
-
-
-
-