项目负责人选择
parent
69d2a9b135
commit
351d877e99
|
|
@ -3,7 +3,8 @@
|
||||||
"baseUrl": "src",
|
"baseUrl": "src",
|
||||||
"paths": {
|
"paths": {
|
||||||
"~/*": ["*"]
|
"~/*": ["*"]
|
||||||
}
|
},
|
||||||
|
"jsx": "react"
|
||||||
},
|
},
|
||||||
"include": ["src"]
|
"include": ["src"]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import ViewUserChange from "~/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange";
|
import ViewUserChange from "~/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange";
|
||||||
|
|
||||||
function UserChange(props) {
|
function UserChange(props) {
|
||||||
return (<ViewUserChange {...props} />);
|
return (<ViewUserChange useRz={1} {...props} />);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default UserChange;
|
export default UserChange;
|
||||||
|
|
|
||||||
|
|
@ -1120,11 +1120,13 @@ const UserSelectComponent = (props) => {
|
||||||
const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键
|
const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键
|
||||||
const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据
|
const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据
|
||||||
const [inDepartmentId, setInDepartmentId] = useState([]); // 存储已选择的部门id
|
const [inDepartmentId, setInDepartmentId] = useState([]); // 存储已选择的部门id
|
||||||
const { tableProps, getData } = useTable(props[props.useRz ? "trainingUserListPage" : "userList"], {
|
const { tableProps, getData } = useTable(props[!props.useRz ? "trainingUserListPage" : "userList"], {
|
||||||
form,
|
form,
|
||||||
params: () => (
|
params: () => (
|
||||||
props.useRz
|
!props.useRz
|
||||||
? {}
|
? {
|
||||||
|
departmentList: inDepartmentId,
|
||||||
|
}
|
||||||
: {
|
: {
|
||||||
noMain: 1,
|
noMain: 1,
|
||||||
inDepartmentId,
|
inDepartmentId,
|
||||||
|
|
|
||||||
|
|
@ -139,6 +139,7 @@ function UserChange(props) {
|
||||||
<UserSelect
|
<UserSelect
|
||||||
data={fetchUserList}
|
data={fetchUserList}
|
||||||
projectId={query.id}
|
projectId={query.id}
|
||||||
|
useRz={props.useRz}
|
||||||
onCancel={() => {
|
onCancel={() => {
|
||||||
setUsercontentOpen(false);
|
setUsercontentOpen(false);
|
||||||
}}
|
}}
|
||||||
|
|
@ -157,13 +158,19 @@ const UserSelectComponent = (props) => {
|
||||||
const [inDepartmentId, setInDepartmentId] = useState([]); // 存储已选择的部门id
|
const [inDepartmentId, setInDepartmentId] = useState([]); // 存储已选择的部门id
|
||||||
const [tableDataSource, setTableDataSource] = useState([]); // 表格数据源
|
const [tableDataSource, setTableDataSource] = useState([]); // 表格数据源
|
||||||
|
|
||||||
const { tableProps, getData } = useTable(props["userList"], {
|
const { tableProps, getData } = useTable(props[!props.useRz ? "trainingUserListPage" : "userList"], {
|
||||||
form,
|
form,
|
||||||
params: {
|
params: () => (
|
||||||
inDepartmentId,
|
!props.useRz
|
||||||
noMain: 1,
|
? {
|
||||||
eqEmploymentFlag: 1, // 在职
|
departmentList: inDepartmentId,
|
||||||
},
|
}
|
||||||
|
: {
|
||||||
|
noMain: 1,
|
||||||
|
inDepartmentId,
|
||||||
|
eqEmploymentFlag: 1, // 在职
|
||||||
|
}
|
||||||
|
),
|
||||||
useStorageQueryCriteria: false,
|
useStorageQueryCriteria: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue