diff --git a/src/api/courseware/index.js b/src/api/courseware/index.js index 20e1842..7c8506e 100644 --- a/src/api/courseware/index.js +++ b/src/api/courseware/index.js @@ -128,6 +128,13 @@ export const orgPersonnelPage = declareRequest( "orgPersonnelList: [] | res.data || [] & orgPersonnelTotal: 0 | res.total || 0", ); +/** 分页查询人员信息(选择学员弹窗数据源,复用人员信息管理接口) */ +export const orgPersonneEasyPage = declareRequest( + "orgPersonnelLoading", + "Get > /safetyEval/org-personnel/classSelect/page", + "orgPersonnelList: [] | res.data || [] & orgPersonnelTotal: 0 | res.total || 0", +); + /** 批量新增班级学员(请求体为 ClassStudentDTO 数组) */ export const classStudentBatchSave = declareRequest( "classStudentConfirmLoading", diff --git a/src/pages/Container/EduTraining/ClassManage/Add/StudentTab.js b/src/pages/Container/EduTraining/ClassManage/Add/StudentTab.js index cfaf100..5fe0cc3 100644 --- a/src/pages/Container/EduTraining/ClassManage/Add/StudentTab.js +++ b/src/pages/Container/EduTraining/ClassManage/Add/StudentTab.js @@ -120,7 +120,7 @@ function ClassStudentTab(props) { type="link" size="small" onClick={() => { - setViewId(record.fileNumber || record.id); + setViewId(record.studentId || record.id); }} > 查看 @@ -240,17 +240,19 @@ function ClassStudentTab(props) { confirmLoading={props.courseware?.classStudentConfirmLoading} dataSource={props.courseware?.orgPersonnelList} total={props.courseware?.orgPersonnelTotal} - requestPage={props.orgPersonnelPage} + requestPage={props.orgPersonneEasyPage} tableSource={tableSource} onOk={async (rows) => { // 批量新增班级学员 const res = await props.classStudentBatchSave( - rows.map(({ userName, deptName, account, fileNumber, id }) => ({ + rows.map(({ userName, deptName, account, studentId, id, unitName, fileNumber }) => ({ classId, studentName: userName, department: deptName, phone: account, + studentId: studentId || id, fileNumber: fileNumber|| id, + unitName: unitName, })), ); if (res?.success === false) return; @@ -279,7 +281,7 @@ function StudentSelectModal({ const [query, setQuery] = useState({ current: 1, size: 10 }); const [keyword, setKeyword] = useState(""); const [selectedRows, setSelectedRows] = useState([]); - const ids= tableSource.map(item=>item.fileNumber); + const ids= tableSource.map(item=>item.studentId); const handleSearch = (params) => { @@ -332,8 +334,8 @@ function StudentSelectModal({ (query.current - 1) * query.size + index + 1, }, { - title: "公司名称", - dataIndex: "orgName", + title: "参训单位", + dataIndex: "unitName", ellipsis: true, render: (v) => v || "-", }, @@ -356,7 +358,7 @@ function StudentSelectModal({ preserveSelectedRowKeys: true, selectedRowKeys: selectedRows.map((r) => r.id), getCheckboxProps: (record) => ({ - disabled: ids.includes(record.fileNumber || record.id), + disabled: ids.includes(record.studentId || record.id), }), onChange: (_, rows) => setSelectedRows(rows), }}