From 8dd70ed8dbf967550f719b118bcd365144217e32 Mon Sep 17 00:00:00 2001
From: tangjie <122778500@qq.com>
Date: Thu, 6 Aug 2026 15:52:14 +0800
Subject: [PATCH] fix

---
 .../EnterpriseInfo/PersonnelInfo/List/index.js         |  2 +-
 .../FilingForm/components/OrgEquipmentSelectModal.jsx  | 10 ++++++++--
 .../FilingForm/components/OrgPersonnelSelectModal.jsx  | 10 ++++++++--
 .../Container/QualApplication/FilingForm/index.js      |  1 +
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
index f695ea6..f1804b6 100644
--- a/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
+++ b/src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js
@@ -576,7 +576,7 @@ function StaffFormModal({
             </Form.Item>
           </Col>
           <Col span={12}>
-            <Form.Item name="birthDate" label="出生日期">
+            <Form.Item name="birthDate" label="出生日期" rules={[{ required: true, message: "请选择出生日期" }]}>
               <DatePicker style={{ width: "100%" }} />
             </Form.Item>
           </Col>
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 ? (
           <Button
             loading={submitting}
+            type="primary"
             onClick={() => handleVerifyConfirm({ isSaveDraft: true })}
           >
             暂存