|
|
@@ -217,6 +217,7 @@ const DisabledPersonSelector: React.FC<DisabledPersonSelectorProps> = ({
|
|
|
|
|
|
{/* 搜索区域 */}
|
|
|
<div className="space-y-4 p-4 border rounded-lg">
|
|
|
+ {/* 第一行:基本信息搜索 */}
|
|
|
<div className="grid grid-cols-4 gap-4">
|
|
|
<div className="space-y-2">
|
|
|
<Label htmlFor="name">姓名</Label>
|
|
|
@@ -272,19 +273,21 @@ const DisabledPersonSelector: React.FC<DisabledPersonSelectorProps> = ({
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
- <div className="grid grid-cols-4 gap-4">
|
|
|
- <div className="space-y-2">
|
|
|
- <Label>省份/城市</Label>
|
|
|
- {/* AreaSelect需要Form上下文,所以包装在Form中 */}
|
|
|
- <Form {...form}>
|
|
|
- <AreaSelect
|
|
|
- value={areaSelection}
|
|
|
- onChange={setAreaSelection}
|
|
|
- data-testid="area-select"
|
|
|
- />
|
|
|
- </Form>
|
|
|
- </div>
|
|
|
+ {/* 第二行:区域选择器单独一行 */}
|
|
|
+ <div className="space-y-2">
|
|
|
+ <Label>省份/城市/区县</Label>
|
|
|
+ {/* AreaSelect需要Form上下文,所以包装在Form中 */}
|
|
|
+ <Form {...form}>
|
|
|
+ <AreaSelect
|
|
|
+ value={areaSelection}
|
|
|
+ onChange={setAreaSelection}
|
|
|
+ data-testid="area-select"
|
|
|
+ />
|
|
|
+ </Form>
|
|
|
+ </div>
|
|
|
|
|
|
+ {/* 第三行:其他筛选条件和操作按钮 */}
|
|
|
+ <div className="grid grid-cols-4 gap-4">
|
|
|
<div className="space-y-2">
|
|
|
<Label htmlFor="disabilityType">残疾类型</Label>
|
|
|
<Select
|
|
|
@@ -332,6 +335,9 @@ const DisabledPersonSelector: React.FC<DisabledPersonSelectorProps> = ({
|
|
|
</Select>
|
|
|
</div>
|
|
|
|
|
|
+ {/* 空列占位 */}
|
|
|
+ <div></div>
|
|
|
+
|
|
|
<div className="flex items-end space-x-2">
|
|
|
<Button onClick={handleSearch} data-testid="search-button">
|
|
|
搜索
|