This commit is contained in:
mmc
2026-04-30 16:35:10 +08:00
parent 688883b0f5
commit 3c9981e84e
2 changed files with 20 additions and 8 deletions

View File

@@ -273,7 +273,7 @@ export default function StationManage() {
</Col>
</Row>
<Form.Item name="orgId" label="所属组织">
<Form.Item name="orgId" label="所属组织" rules={[{ required: true }]}>
<Select placeholder="请选择所属组织" allowClear>
{orgList.map(item => (
<Select.Option key={item.id} value={item.orgId}>

View File

@@ -139,6 +139,8 @@ export default function UserRolePage() {
useEffect(() => {
getMenuData();
getRoleById();
getOrgData();
}, []);
useEffect(() => {
@@ -260,24 +262,32 @@ export default function UserRolePage() {
setSiteList([]);
setOrgList([]);
form.resetFields();
if (userInfo?.userId == 1) {
getOrgData();
}
setModalVisible(true);
};
const handleEditUser = (record) => {
setCurrentUser(record);
console.log(record, "record")
// 回填表单所有值
form.setFieldsValue({
...record,
roleIds: record.roles?.map(i => i.roleId) || []
roleIds: record.roleId
});
setSiteList([]);
if (userInfo?.userId === 1) {
getOrgData();
// ✅ 关键修复:如果用户有 orgId,自动加载对应场站
if (record.orgId) {
getSiteByOrg(record.orgId);
setTimeout(() => {
form.setFieldsValue({
siteId: record.siteId
});
}, 800);
}
setModalVisible(true);
@@ -312,8 +322,10 @@ export default function UserRolePage() {
const handleSaveUser = () => {
form.validateFields().then(values => {
console.log(values, "vsss")
const params = {
...values, roleIds: values.roleIds ? [values.roleIds] : []
...values, roleIds: [values.roleIds].flat()
};
if (currentUser) params.userId = currentUser.userId;