diff --git a/src/api/global/index.js b/src/api/global/index.js index ba35796..638ec62 100644 --- 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}", -// ); diff --git a/src/enumerate/enterpriseOptions.js b/src/enumerate/enterpriseOptions.js index 1e3ea9e..a169b41 100644 --- 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 }, ]; /** 备案状态(机构信息) */ diff --git a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js index e16b250..f169011 100644 --- 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 + } > @@ -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 + } > @@ -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 + } > (typeof value === "string" ? value.trim() : value)} + normalize={(value) => + typeof value === "string" ? value.trim() : value + } > @@ -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 + } > @@ -444,22 +458,30 @@ function OrgInfoPage(props) {