diff --git a/jsconfig.json b/jsconfig.json index 4cf89dc..ed50d55 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -3,7 +3,8 @@ "baseUrl": "src", "paths": { "~/*": ["*"] - } + }, + "jsx": "react" }, "include": ["src"] } diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/UserChange/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/UserChange/index.js index 16dacf7..dd4e8fa 100644 --- a/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/UserChange/index.js +++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/UserChange/index.js @@ -1,7 +1,7 @@ import ViewUserChange from "~/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange"; function UserChange(props) { - return (); + return (); }; export default UserChange; diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 2a1605b..147acf8 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -1120,11 +1120,13 @@ const UserSelectComponent = (props) => { const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键 const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据 const [inDepartmentId, setInDepartmentId] = useState([]); // 存储已选择的部门id - const { tableProps, getData } = useTable(props[props.useRz ? "trainingUserListPage" : "userList"], { + const { tableProps, getData } = useTable(props[!props.useRz ? "trainingUserListPage" : "userList"], { form, params: () => ( - props.useRz - ? {} + !props.useRz + ? { + departmentList: inDepartmentId, + } : { noMain: 1, inDepartmentId, diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js index 38ee9fd..745c21a 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js @@ -139,6 +139,7 @@ function UserChange(props) { { setUsercontentOpen(false); }} @@ -157,13 +158,19 @@ const UserSelectComponent = (props) => { const [inDepartmentId, setInDepartmentId] = useState([]); // 存储已选择的部门id const [tableDataSource, setTableDataSource] = useState([]); // 表格数据源 - const { tableProps, getData } = useTable(props["userList"], { + const { tableProps, getData } = useTable(props[!props.useRz ? "trainingUserListPage" : "userList"], { form, - params: { - inDepartmentId, - noMain: 1, - eqEmploymentFlag: 1, // 在职 - }, + params: () => ( + !props.useRz + ? { + departmentList: inDepartmentId, + } + : { + noMain: 1, + inDepartmentId, + eqEmploymentFlag: 1, // 在职 + } + ), useStorageQueryCriteria: false, });