fix

2026-07-09 13:15:13 +08:00 · 2026-07-09 13:15:13 +08:00 · 2c4344b69a
parent b573b0947f
commit 2c4344b69a
5 changed files with 45 additions and 30 deletions
--- a/src/api/global/index.js
+++ b/src/api/global/index.js
@ -1,11 +1,2 @@
 export {};

-// export const riskList = declareRequest(
-//   "loading",
-//   "Post > @/xxx",
-//   "dataSource: [] | res.data || [] & total: 0 | res.totalCount || 0 & pageIndex: 1 | res.pageIndex || 1 & pageSize: 10 | res.pageSize || 10",
-// );
-// export const riskDelete = declareRequest(
-//   "loading",
-//   "Delete > @/xxx/{id}",
-// );
--- a/src/enumerate/enterpriseOptions.js
+++ b/src/enumerate/enterpriseOptions.js
@ -41,8 +41,8 @@ export const REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS = [
 /** 监管端已备案机构 - 备案状态搜索（1=已备案，2=未备案） */
 export const REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS = [
 
-  { label: "已备案", value: "1" },
-  { label: "未备案", value: "2" },
+  { label: "已备案", value: 1 },
+  { label: "未备案", value: 2 },
 ];

 /** 备案状态（机构信息） */
--- a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js
+++ b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js
@ -21,11 +21,11 @@ import {
  CHONGQING_DISTRICTS,
  ENTERPRISE_SCALE_OPTIONS,
  ENTERPRISE_STATUS_OPTIONS,
-  FILING_RECORD_STATUS_OPTIONS,
+  REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS,
  REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS,
 } from "~/enumerate/enterpriseOptions";
 import { NS_ORG_INFO } from "~/enumerate/namespace";
-import { mockUploadFileList } from "~/utils/mockUpload";
+
 import {
  coordinatePairRule,
  creditCodeRule,
@ -57,7 +57,9 @@ function OrgInfoPage(props) {
          productionDate: res.data.productionDate
            ? dayjs(res.data.productionDate)
            : undefined,
-          attachmentUrls: res.data.attachmentUrls? JSON.parse(res.data.attachmentUrls) :null,
+          attachmentUrls: res.data.attachmentUrls
+            ? JSON.parse(res.data.attachmentUrls)
+            : null,
        });
        setHasExistingData(true);
        setEditing(false);
@ -79,7 +81,7 @@ function OrgInfoPage(props) {
  }, []);

  const handleCancelEdit = () => {
-     setEditing(false);
+    setEditing(false);
  };

  const handleSave = async (submitType) => {
@ -90,7 +92,9 @@ function OrgInfoPage(props) {
        productionDate: formValues.productionDate
          ? dayjs(formValues.productionDate).format("YYYY-MM-DD")
          : undefined,
-        attachmentUrls: formValues.attachmentUrls? JSON.stringify(formValues.attachmentUrls) :null,
+        attachmentUrls: formValues.attachmentUrls
+          ? JSON.stringify(formValues.attachmentUrls)
+          : null,
        infoDisclosureUrl: formValues.infoDisclosureUrl
          ? normalizeUrl(formValues.infoDisclosureUrl)
          : undefined,
@ -120,7 +124,7 @@ function OrgInfoPage(props) {
        setEditing(false);
        loadDetail();
      }
-    }  finally {
+    } finally {
      setSubmitting(false);
    }
  };
@ -289,7 +293,9 @@ function OrgInfoPage(props) {
              name="legalRepresentativePhone"
              label="法定代表人联系电话"
              rules={[phoneRule("法定代表人联系电话", false)]}
-              normalize={(value) => (typeof value === "string" ? value.trim() : value)}
+              normalize={(value) =>
+                typeof value === "string" ? value.trim() : value
+              }
            >
              <Input placeholder="请输入法定代表人联系电话" allowClear />
            </Form.Item>
@ -308,7 +314,9 @@ function OrgInfoPage(props) {
              name="principalPhone"
              label="主要负责人联系电话"
              rules={[phoneRule("主要负责人联系电话", true)]}
-              normalize={(value) => (typeof value === "string" ? value.trim() : value)}
+              normalize={(value) =>
+                typeof value === "string" ? value.trim() : value
+              }
            >
              <Input placeholder="请输入主要负责人联系电话" allowClear />
            </Form.Item>
@ -323,7 +331,9 @@ function OrgInfoPage(props) {
              name="safetyDeptManagerPhone"
              label="安全管理部门负责人联系电话"
              rules={[phoneRule("安全管理部门负责人联系电话", false)]}
-              normalize={(value) => (typeof value === "string" ? value.trim() : value)}
+              normalize={(value) =>
+                typeof value === "string" ? value.trim() : value
+              }
            >
              <Input
                placeholder="请输入安全管理部门负责人联系电话"
@ -341,7 +351,9 @@ function OrgInfoPage(props) {
              name="safetyDeputyPhone"
              label="主管安全副总联系电话"
              rules={[phoneRule("主管安全副总联系电话", false)]}
-              normalize={(value) => (typeof value === "string" ? value.trim() : value)}
+              normalize={(value) =>
+                typeof value === "string" ? value.trim() : value
+              }
            >
              <Input placeholder="请输入主管安全副总联系电话" allowClear />
            </Form.Item>
@ -364,7 +376,9 @@ function OrgInfoPage(props) {
              name="infoDisclosureUrl"
              label="信息公开网址"
              rules={[urlRule("信息公开网址", false)]}
-              normalize={(value) => (typeof value === "string" ? value.trim() : value)}
+              normalize={(value) =>
+                typeof value === "string" ? value.trim() : value
+              }
            >
              <Input placeholder="请输入信息公开网址" allowClear />
            </Form.Item>
@ -444,22 +458,30 @@ function OrgInfoPage(props) {
            </Form.Item>
          </Col>
          <Col span={12}>
-            <Form.Item name="filingTypeName" label="备案类型">
+            <Form.Item name="filingTypeCode" label="备案类型">
              <Select
                options={REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS}
                placeholder="请选择备案类型"
                allowClear
+                onChange={(value, option)=>{
+                  form.setFieldValue("filingTypeName", option?.label);
+                }}
              />
            </Form.Item>
+            <Form.Item name="filingTypeName" noStyle />
          </Col>
          <Col span={12}>
-            <Form.Item name="filingRecordStatusName" label="备案状态">
+            <Form.Item name="filingRecordStatusCode" label="备案状态">
              <Select
-                options={FILING_RECORD_STATUS_OPTIONS}
+                options={REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS}
                placeholder="请选择备案状态"
                allowClear
+                onChange={(value, option)=>{
+                  form.setFieldValue("filingRecordStatusName", option?.label || "");
+                }}
              />
            </Form.Item>
+             <Form.Item name="filingRecordStatusName" noStyle />
          </Col>
          <Col span={12}>
            <AttachmentUpload name="attachmentUrls" label="上传附件" />
--- a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx
+++ b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx
@ -17,8 +17,8 @@ function OrgEquipmentSelectModalInner(props) {
      const values = searchForm.getFieldsValue();
      const res = await props.equipInfoList({
        current: page,
-        pageSize,
-        likeDeviceName: values.deviceName || undefined,
+        size: pageSize,
+        deviceName: values.deviceName || undefined,
      });
      if (res?.success !== false) {
        setDataSource(res?.data || []);
@ -76,6 +76,7 @@ function OrgEquipmentSelectModalInner(props) {
        rowKey="id"
        loading={loading}
        dataSource={dataSource}
+        scroll={ { y: 400 }}
        rowSelection={{
          selectedRowKeys,
          onChange: setSelectedRowKeys,
--- a/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx
+++ b/src/pages/Container/QualApplication/FilingForm/components/OrgPersonnelSelectModal.jsx
@ -19,8 +19,8 @@ function OrgPersonnelSelectModalInner(props) {
      const values = searchForm.getFieldsValue();
      const res = await props.staffInfoList({
        current: page,
-        pageSize,
-        likeStaffName: values.staffName || undefined,
+        size: pageSize,
+        userName: values.staffName || undefined,
      });
      if (res?.success !== false) {
        setDataSource(res?.data || []);
@ -68,7 +68,7 @@ function OrgPersonnelSelectModalInner(props) {
      >
        <Form form={searchForm} layout="inline" style={{ marginBottom: 16 }}>
          <Form.Item name="staffName">
-            <Input placeholder="关键字搜索" allowClear />
+            <Input placeholder="人员姓名搜索" allowClear />
          </Form.Item>
          <Form.Item>
            <Button type="primary" onClick={handleSearch}>搜索</Button>
@ -92,6 +92,7 @@ function OrgPersonnelSelectModalInner(props) {
            showTotal: (t) => `共 ${t} 条`,
            onChange: (page, pageSize) => getData(page, pageSize),
          }}
+          scroll={ { y: 400 }}
          columns={[
            { title: "人员姓名", dataIndex: "userName" },
            { title: "类型", dataIndex: "personTypeName" },