diff --git a/src/components/pages/EquipmentPage.tsx b/src/components/pages/EquipmentPage.tsx index e20b29c..8927e92 100644 --- a/src/components/pages/EquipmentPage.tsx +++ b/src/components/pages/EquipmentPage.tsx @@ -470,7 +470,7 @@ export default function EquipmentPage() { ) : ( merchants.map((merchant) => ( - {merchant.merchantName} + {merchant.merchantName} - {merchant.contactPerson} )) )} @@ -598,7 +598,7 @@ export default function EquipmentPage() { {merchants.map((merchant) => ( - {merchant.merchantName} + {merchant.merchantName} - {merchant.contactPerson} ))} @@ -717,10 +717,10 @@ export default function EquipmentPage() { 设备信息 商户信息 - 状态 + 状态 检测信息 负责经销商 - 操作 + 操作 @@ -763,8 +763,8 @@ export default function EquipmentPage() { - -
{getStatusBadge(item.status)}
+ + {getStatusBadge(item.status)}
@@ -781,16 +781,14 @@ export default function EquipmentPage() {
负责人
- -
- -
+ + ) diff --git a/src/components/pages/MallsPage.tsx b/src/components/pages/MallsPage.tsx index 79a62cb..da043e3 100644 --- a/src/components/pages/MallsPage.tsx +++ b/src/components/pages/MallsPage.tsx @@ -107,7 +107,7 @@ export default function MallsPage() { name: "", address: "", provinceCode: "", - mallUserId: "", + mallUserIds: [] as string[], description: "", }) @@ -285,7 +285,7 @@ export default function MallsPage() { if (newMall.provinceCode) { fetchMallUsers(newMall.provinceCode) // 清空已选择的商场用户 - setNewMall(prev => ({ ...prev, mallUserId: "" })) + setNewMall(prev => ({ ...prev, mallUserIds: [] })) } }, [newMall.provinceCode]) @@ -297,20 +297,22 @@ export default function MallsPage() { ) const handleAddMall = async () => { - const selectedMallUser = mallUsers.find((user) => user.userId === newMall.mallUserId) const selectedProvince = provinces.find((province) => province.code === newMall.provinceCode) - if (!selectedMallUser || !selectedProvince) return + if (!selectedProvince || newMall.mallUserIds.length === 0) return try { setLoading(true) + // 拼接userId,每个userId后都加逗号,包括最后一个 + const mallUserIdsString = newMall.mallUserIds.map(id => id + ",").join("") + const requestBody = { mallName: newMall.name, addr: newMall.address, province: newMall.provinceCode, creator: "管理员", // 可以根据实际登录用户修改 - mallUser: newMall.mallUserId, + mallUser: mallUserIdsString, status: 1 } @@ -319,7 +321,7 @@ export default function MallsPage() { if (result.code === 200) { // API调用成功,重新获取商场列表 await fetchMalls() - setNewMall({ name: "", address: "", provinceCode: "", mallUserId: "", description: "" }) + setNewMall({ name: "", address: "", provinceCode: "", mallUserIds: [], description: "" }) setIsAddDialogOpen(false) // 可以添加成功提示 @@ -429,32 +431,54 @@ export default function MallsPage() {
- - { + if (e.target.checked) { + setNewMall({ + ...newMall, + mallUserIds: [...newMall.mallUserIds, mallUser.userId] + }) + } else { + setNewMall({ + ...newMall, + mallUserIds: newMall.mallUserIds.filter(id => id !== mallUser.userId) + }) + } + }} + className="mr-3 h-4 w-4" + disabled={loading} + /> +
+ {mallUser.userName} {mallUser.phonenumber}
- + ))} - - +
+ )} + {newMall.mallUserIds.length > 0 && ( +
+ 已选择 {newMall.mallUserIds.length} 个商场用户 +
+ )}
@@ -473,7 +497,7 @@ export default function MallsPage() {