diff --git a/src/enumerate/enterpriseOptions.js b/src/enumerate/enterpriseOptions.js index c052f16..b4d239e 100644 --- a/src/enumerate/enterpriseOptions.js +++ b/src/enumerate/enterpriseOptions.js @@ -148,10 +148,12 @@ export const EDUCATION_TYPE_OPTIONS = [ /** 学历层次 */ export const EDUCATION_LEVEL_OPTIONS = [ - { label: "专科", value: "专科" }, - { label: "本科", value: "本科" }, - { label: "硕士", value: "硕士" }, - { label: "博士", value: "博士" }, + { label: "博士研究生", value: "博士研究生" }, + { label: "硕士研究生", value: "硕士研究生" }, + { label: "大学本科", value: "大学本科" }, + { label: "大学专科", value: "大学专科" }, + { label: "中专", value: "中专" }, + { label: "高中及以下", value: "高中及以下" }, ]; /** 是否注册安全工程师 */ diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js index f695ea6..f9fd68c 100644 --- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js +++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js @@ -539,7 +539,17 @@ function StaffFormModal({ loading={detailLoading} confirmLoading={submitting} onCancel={handleCancel} - onOk={form.submit} + onOk={() => { + const titleArr = form.getFieldValue("titleCodeArr") || []; + const hasTitleInfo = titleArr.some( + (item) => item?.industryCode && item?.titleCode, + ); + if (!hasTitleInfo) { + message.warning("请添加职称信息"); + return; + } + form.submit(); + }} >
- + diff --git a/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js b/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js index 01a007f..63121a1 100644 --- a/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js +++ b/src/pages/Container/MonitorManage/EvalProjectMonitor/Detail/index.js @@ -407,7 +407,7 @@ const EvalProjectMonitorDetail = (props) => { useEffect(() => { if (projectId) { evalProjectDetail({ id: projectId }); - queryMyOrCreateDoc({ docxUrl: "", projectId }); + } fetchContract(); fetchTeam(); diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx index ea72987..1bbcfef 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx @@ -8,6 +8,7 @@ function OrgEquipmentSelectModalInner(props) { const { open, onCancel, onConfirm, existingIds = [] } = props; const [searchForm] = Form.useForm(); const [selectedRowKeys, setSelectedRowKeys] = useState([]); + const [selectedRows, setSelectedRows] = useState([]); const [loading, setLoading] = useState(false); const [dataSource, setDataSource] = useState([]); const [pagination, setPagination] = useState({ current: 1, pageSize: 10, total: 0 }); @@ -37,6 +38,7 @@ function OrgEquipmentSelectModalInner(props) { useEffect(() => { if (open) { setSelectedRowKeys([]); + setSelectedRows([]); searchForm.resetFields(); getData(); } @@ -52,7 +54,7 @@ function OrgEquipmentSelectModalInner(props) { Modal.warning({ title: "提示", content: "请选择至少一项未添加的装备" }); return; } - const rows = dataSource.filter((row) => ids.includes(row.id)); + const rows = selectedRows.filter((row) => ids.includes(row.id)); onConfirm?.(ids, rows); }; @@ -82,7 +84,11 @@ function OrgEquipmentSelectModalInner(props) { scroll={ { y: 400 }} rowSelection={{ selectedRowKeys, - onChange: setSelectedRowKeys, + preserveSelectedRowKeys: true, + onChange: (keys, rows) => { + setSelectedRowKeys(keys); + setSelectedRows(rows); + }, getCheckboxProps: (record) => ({ disabled: existingIds.includes(String(record.id)), }), diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx index 843b9f1..e93bba8 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx @@ -19,6 +19,7 @@ export default function OrgPersonnelSelectModal(props) { const { open, onCancel, onConfirm, existingIds = [] } = props; const [searchForm] = Form.useForm(); const [selectedRowKeys, setSelectedRowKeys] = useState([]); + const [selectedRows, setSelectedRows] = useState([]); const [viewId, setViewId] = useState(""); const [loading, setLoading] = useState(false); const [dataSource, setDataSource] = useState([]); @@ -47,6 +48,7 @@ export default function OrgPersonnelSelectModal(props) { useEffect(() => { if (open) { setSelectedRowKeys([]); + setSelectedRows([]); searchForm.resetFields(); getData(); } @@ -62,7 +64,7 @@ export default function OrgPersonnelSelectModal(props) { Modal.warning({ title: "提示", content: "请选择至少一名未添加的人员" }); return; } - const rows = dataSource.filter((row) => ids.includes(row.id)); + const rows = selectedRows.filter((row) => ids.includes(row.id)); onConfirm?.(ids, rows); }; @@ -92,7 +94,11 @@ export default function OrgPersonnelSelectModal(props) { dataSource={dataSource} rowSelection={{ selectedRowKeys, - onChange: setSelectedRowKeys, + preserveSelectedRowKeys: true, + onChange: (keys, rows) => { + setSelectedRowKeys(keys); + setSelectedRows(rows); + }, getCheckboxProps: (record) => ({ disabled: existingIds.includes(String(record.id)), }), diff --git a/src/pages/Container/QualApplication/FilingForm/index.js b/src/pages/Container/QualApplication/FilingForm/index.js index 87d79be..a5c0a70 100644 --- a/src/pages/Container/QualApplication/FilingForm/index.js +++ b/src/pages/Container/QualApplication/FilingForm/index.js @@ -416,6 +416,7 @@ function FilingFormPage(props) { !readOnly && mode !== FILING_FORM_MODE.CHANGE ? (