|
|
@@ -65,7 +65,7 @@ interface PendingPerson {
|
|
|
}
|
|
|
|
|
|
interface OrderPerson {
|
|
|
- opId: number;
|
|
|
+ id: number; // 注意:从opId改为id,与schema保持一致
|
|
|
orderId: number;
|
|
|
personId: number;
|
|
|
joinDate?: string;
|
|
|
@@ -277,6 +277,7 @@ const OrderDetailModal: React.FC<OrderDetailModalProps> = ({
|
|
|
|
|
|
// 处理残疾人选择 - 将选择的人员添加到待添加列表
|
|
|
const handlePersonSelect = (persons: DisabledPersonData | DisabledPersonData[]) => {
|
|
|
+ console.log('OrderDetailModal: handlePersonSelect被调用,人员数据:', persons);
|
|
|
const personsArray = Array.isArray(persons) ? persons : [persons];
|
|
|
|
|
|
// 获取已绑定人员的ID列表
|
|
|
@@ -310,8 +311,15 @@ const OrderDetailModal: React.FC<OrderDetailModalProps> = ({
|
|
|
});
|
|
|
|
|
|
if (newPendingPersons.length > 0) {
|
|
|
- setPendingPersons(prev => [...prev, ...newPendingPersons]);
|
|
|
+ console.log('OrderDetailModal: 设置pendingPersons,新人员:', newPendingPersons);
|
|
|
+ setPendingPersons(prev => {
|
|
|
+ const newState = [...prev, ...newPendingPersons];
|
|
|
+ console.log('OrderDetailModal: pendingPersons新状态:', newState);
|
|
|
+ return newState;
|
|
|
+ });
|
|
|
toast.success(`已添加 ${newPendingPersons.length} 名人员到待添加列表`);
|
|
|
+ } else {
|
|
|
+ console.log('OrderDetailModal: 没有新人员可添加');
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -555,7 +563,7 @@ const OrderDetailModal: React.FC<OrderDetailModalProps> = ({
|
|
|
</Card>
|
|
|
|
|
|
{/* 待添加人员列表 */}
|
|
|
- {pendingPersons.length > 0 && (
|
|
|
+ {pendingPersons.length > 0 ? (
|
|
|
<Card data-testid="pending-persons-card">
|
|
|
<CardHeader>
|
|
|
<div className="flex items-center justify-between">
|
|
|
@@ -632,6 +640,8 @@ const OrderDetailModal: React.FC<OrderDetailModalProps> = ({
|
|
|
</div>
|
|
|
</CardContent>
|
|
|
</Card>
|
|
|
+ ) : (
|
|
|
+ <div data-testid="no-pending-persons">没有待添加人员</div>
|
|
|
)}
|
|
|
|
|
|
{/* 绑定人员列表 */}
|