diff --git a/Cunkebao/app/workspace/traffic-distribution/new/components/target-settings-step.tsx b/Cunkebao/app/workspace/traffic-distribution/new/components/target-settings-step.tsx
index d621f71c..f161dc4b 100644
--- a/Cunkebao/app/workspace/traffic-distribution/new/components/target-settings-step.tsx
+++ b/Cunkebao/app/workspace/traffic-distribution/new/components/target-settings-step.tsx
@@ -9,6 +9,8 @@ import { Avatar } from "@/components/ui/avatar"
 import { Search } from "lucide-react"
 import { Input } from "@/components/ui/input"
 import { api } from "@/lib/api"
+import { DeviceSelectionDialog } from "@/app/components/device-selection-dialog"
+import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog"
 
 interface Device {
   id: string
@@ -30,66 +32,140 @@ interface TargetSettingsStepProps {
   initialData?: any
 }
 
-export default function TargetSettingsStep({ onNext, onBack, initialData = {} }: TargetSettingsStepProps) {
+export default function TargetSettingsStep({ onNext, onBack, initialData = {}, setDevices }: TargetSettingsStepProps & { setDevices: (ids: string[]) => void }) {
   const [deviceList, setDeviceList] = useState<any[]>([])
-  const [selectedDeviceIds, setSelectedDeviceIds] = useState<string[]>(initialData.devices || [])
+  const [selectedDeviceIds, setSelectedDeviceIds] = useState<string[]>([])
   const [search, setSearch] = useState("")
   const [loading, setLoading] = useState(false)
+  const [deviceDialogOpen, setDeviceDialogOpen] = useState(false)
+  const [statusFilter, setStatusFilter] = useState("all")
+
+  // 每次弹窗打开时，同步主表单的 devices（转为字符串数组）
+  useEffect(() => {
+    if (deviceDialogOpen) {
+      const ids = Array.isArray(initialData.devices) ? initialData.devices.map(String) : [];
+      setSelectedDeviceIds(ids);
+    }
+  }, [deviceDialogOpen, initialData.devices])
 
   useEffect(() => {
     setLoading(true)
-    api.get('/v1/devices?page=1&limit=100').then(res => {
+    api.get('/v1/devices?page=1&limit=100').then((res: any) => {
       setDeviceList(res.data?.list || [])
     }).finally(() => setLoading(false))
   }, [])
 
-  const filteredDevices = deviceList.filter(device =>
-    (device.memo || device.nickname || "").toLowerCase().includes(search.toLowerCase())
-  )
-
-  const toggleDevice = (id: string) => {
-    setSelectedDeviceIds(prev =>
-      prev.includes(id) ? prev.filter(did => did !== id) : [...prev, id]
-    )
-  }
+  const filteredDevices = deviceList.filter(device => {
+    const matchesSearch =
+      search === "" ||
+      (device.memo || device.nickname || "").toLowerCase().includes(search.toLowerCase()) ||
+      (device.imei || "").toLowerCase().includes(search.toLowerCase()) ||
+      (device.wechatId || "").toLowerCase().includes(search.toLowerCase())
+    const matchesStatus = statusFilter === "all" || (statusFilter === "online" ? device.alive === 1 : device.alive !== 1)
+    return matchesSearch && matchesStatus
+  })
 
   const handleSubmit = () => {
-    onNext({
-      devices: selectedDeviceIds,
-    })
+    onNext({ devices: Array.isArray(initialData.devices) ? initialData.devices : [] })
+  }
+
+  // 弹窗内确认选择
+  const handleDialogConfirm = () => {
+    if (typeof setDevices === 'function') {
+      setDevices(selectedDeviceIds)
+    }
+    setDeviceDialogOpen(false)
   }
 
   return (
     <div className="bg-white rounded-lg p-6 shadow-sm">
       <h2 className="text-xl font-bold mb-6">目标设置</h2>
       <div className="mb-4">
-        <Input placeholder="搜索设备" value={search} onChange={e => setSearch(e.target.value)} />
+        <div className="relative w-full">
+          <Search className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400" />
+          <Input
+            placeholder="选择设备"
+            value={Array.isArray(initialData.devices) && initialData.devices.length > 0 ? `已选择${initialData.devices.length}个设备` : ''}
+            readOnly
+            className="pl-10 cursor-pointer"
+            onClick={() => setDeviceDialogOpen(true)}
+          />
+        </div>
       </div>
       <div className="space-y-3 mt-4 max-h-80 overflow-y-auto">
-        {loading ? <div className="text-center text-gray-400 py-8">加载中...</div> :
-          filteredDevices.map(device => (
-            <div key={device.id} className="flex items-center border rounded-lg px-4 py-2 mb-2 justify-between">
-              <div className="flex items-center gap-3">
-                <span className={`w-8 h-8 flex items-center justify-center rounded-full ${device.alive === 1 ? "bg-green-100 text-green-600" : "bg-gray-100 text-gray-400"}`}>设</span>
-                <div>
-                  <div className="font-medium">{device.memo }</div>
-                  <div className="text-xs text-gray-400">IMEI:{device.imei}</div>
-                  <div className="text-xs text-gray-400">微信号:{device.wechatId || "--"}（{device.nickname || "--"}）</div>
-                  <div className={`text-xs ${device.alive === 1 ? "text-green-600" : "text-gray-400"}`}>{device.alive === 1 ? "在线" : "离线"}</div>
-                </div>
-              </div>
-              <Checkbox
-                checked={selectedDeviceIds.includes(device.id)}
-                onCheckedChange={() => toggleDevice(device.id)}
-              />
-            </div>
-          ))
-        }
+        {Array.isArray(initialData.devices) && initialData.devices.length === 0 ? (
+          <div className="text-gray-400">未选择设备</div>
+        ) : (
+          <div className="text-base text-gray-500">已选设备：{Array.isArray(initialData.devices) ? initialData.devices.length : 0} 个</div>
+        )}
       </div>
       <div className="mt-8 flex justify-between">
         <Button variant="outline" onClick={onBack}>← 上一步</Button>
         <Button onClick={handleSubmit} disabled={selectedDeviceIds.length === 0}>下一步 →</Button>
       </div>
+      {/* 设备选择弹窗 */}
+      <Dialog open={deviceDialogOpen} onOpenChange={setDeviceDialogOpen}>
+        <DialogContent className="max-w-xl w-full p-0">
+          <DialogTitle className="text-lg font-bold text-center mb-4">选择设备</DialogTitle>
+          <div className="p-6 pt-0">
+            <div className="flex items-center gap-2 mb-4">
+              <Input
+                placeholder="搜索设备IMEI/备注/微信号"
+                value={search}
+                onChange={e => setSearch(e.target.value)}
+                className="flex-1"
+              />
+              <select
+                className="border rounded px-2 py-1 text-sm"
+                value={statusFilter}
+                onChange={e => setStatusFilter(e.target.value)}
+              >
+                <option value="all">全部状态</option>
+                <option value="online">在线</option>
+                <option value="offline">离线</option>
+              </select>
+            </div>
+            <div className="max-h-72 overflow-y-auto divide-y">
+              {loading ? (
+                <div className="text-center text-gray-400 py-8">加载中...</div>
+              ) : filteredDevices.length === 0 ? (
+                <div className="text-center text-gray-400 py-8">暂无设备</div>
+              ) : (
+                filteredDevices.map(device => (
+                  <label
+                    key={device.id}
+                    className="flex items-center px-2 py-3 cursor-pointer hover:bg-gray-50"
+                  >
+                    <input
+                      type="checkbox"
+                      className="mr-3 accent-blue-500"
+                      checked={selectedDeviceIds.includes(String(device.id))}
+                      onChange={() => {
+                        setSelectedDeviceIds(prev =>
+                          prev.includes(String(device.id))
+                            ? prev.filter(id => id !== String(device.id))
+                            : [...prev, String(device.id)]
+                        )
+                      }}
+                    />
+                    <div className="flex-1">
+                      <div className="font-medium text-base">{device.memo || device.nickname || device.name}</div>
+                      <div className="text-xs text-gray-500">IMEI: {device.imei}</div>
+                      <div className="text-xs text-gray-500">微信号: {device.wechatId || '--'}（{device.nickname || '--'}）</div>
+                    </div>
+                    <span className={`ml-2 text-xs ${device.alive === 1 ? 'text-green-600' : 'text-gray-400'}`}>{device.alive === 1 ? '在线' : '离线'}</span>
+                  </label>
+                ))
+              )}
+            </div>
+            <div className="flex justify-end mt-6">
+              <Button className="w-full" onClick={handleDialogConfirm}>
+                确认
+              </Button>
+            </div>
+          </div>
+        </DialogContent>
+      </Dialog>
     </div>
   )
 }