From e1dd6bfa98081eb0e4163274c5f3f49e8d168f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E6=99=AF=E5=AD=A6?= <5412262+sun_jing_xue@user.noreply.gitee.com> Date: Mon, 14 Jul 2025 10:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=8E=BB=E6=8E=89=E5=9B=BA=E5=AE=9A=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyInfo/component/AttachmentsTab.tsx | 6 ++- .../CompanyInfo/component/BankFormModal.tsx | 3 +- .../CompanyInfo/component/BankInfoTab.tsx | 6 ++- .../CompanyInfo/component/BaseInfoTab.tsx | 8 ++-- .../CompanyInfo/component/ContactsInfoTab.tsx | 6 ++- .../component/InvoiceFormModal.tsx | 5 ++- .../CompanyInfo/component/InvoiceTab.tsx | 6 ++- .../CompanyInfo/component/PeBaseInfoTab.tsx | 8 ++-- .../component/QualificationFormModal.tsx | 3 +- .../component/QualificationTab.tsx | 6 ++- src/components/CompanyInfo/index.tsx | 19 +++++---- .../GlobalModal/components/RiskList.tsx | 42 +++++++++---------- .../SupplierChangeReviewManage/index.tsx | 3 +- .../mySupplierInquiry/index.tsx | 3 ++ 14 files changed, 73 insertions(+), 51 deletions(-) diff --git a/src/components/CompanyInfo/component/AttachmentsTab.tsx b/src/components/CompanyInfo/component/AttachmentsTab.tsx index 391974f..222d0db 100644 --- a/src/components/CompanyInfo/component/AttachmentsTab.tsx +++ b/src/components/CompanyInfo/component/AttachmentsTab.tsx @@ -75,8 +75,10 @@ const OtherAttachmentsTab: React.FC = (props) => { //初始化 useEffect(() => { - getList(); - }, []); + if(record) { + getList(); + } + }, [record]); const columns: ColumnsType = [ diff --git a/src/components/CompanyInfo/component/BankFormModal.tsx b/src/components/CompanyInfo/component/BankFormModal.tsx index 5fa7032..532f8f5 100644 --- a/src/components/CompanyInfo/component/BankFormModal.tsx +++ b/src/components/CompanyInfo/component/BankFormModal.tsx @@ -38,6 +38,7 @@ const InvoiceFormModal: React.FC = ({ initialValues, readOnly = false, }) => { + const userId = sessionStorage.getItem('userId') || ''; // 新增与修改 const [form] = Form.useForm(); //查看 @@ -75,7 +76,7 @@ const InvoiceFormModal: React.FC = ({ const values = await form.validateFields(); const payload = { ...values, - "supplierId": "9c12e8ea-a681-4184-81ba-5fa276299a00", + supplierId: userId, }; if (!values.id) { bankAdd(payload).then((res) => { diff --git a/src/components/CompanyInfo/component/BankInfoTab.tsx b/src/components/CompanyInfo/component/BankInfoTab.tsx index 3619c79..b3ec7b5 100644 --- a/src/components/CompanyInfo/component/BankInfoTab.tsx +++ b/src/components/CompanyInfo/component/BankInfoTab.tsx @@ -75,8 +75,10 @@ const BankInfoTab: React.FC = (props) => { //初始化 useEffect(() => { - getList(); - }, []); + if(record) { + getList(); + } + }, [record]); // 表格头部 const columns: ColumnsType = [ { diff --git a/src/components/CompanyInfo/component/BaseInfoTab.tsx b/src/components/CompanyInfo/component/BaseInfoTab.tsx index 8d3227d..4ef2984 100644 --- a/src/components/CompanyInfo/component/BaseInfoTab.tsx +++ b/src/components/CompanyInfo/component/BaseInfoTab.tsx @@ -77,9 +77,11 @@ const BaseInfoTab: React.FC = (props) => { useEffect(() => { - //供应商信息 - fetchData() - }, []); + if(record) { + //供应商信息 + fetchData() + } + }, [record]); if (!registerInfo?.coscoSupplierBase) return
{intl.formatMessage({ id: 'component.globalModal.loading' })}...
; diff --git a/src/components/CompanyInfo/component/ContactsInfoTab.tsx b/src/components/CompanyInfo/component/ContactsInfoTab.tsx index 3c226cd..8d9ce03 100644 --- a/src/components/CompanyInfo/component/ContactsInfoTab.tsx +++ b/src/components/CompanyInfo/component/ContactsInfoTab.tsx @@ -41,8 +41,10 @@ const ContactsInfoTab: React.FC = (props) => { }; useEffect(() => { - fetchContacts(); - }, []); + if(record) { + fetchContacts(); + } + }, [record]); const handleTableChange = (pagination: TablePaginationConfig) => { fetchContacts(pagination.current!, pagination.pageSize!); diff --git a/src/components/CompanyInfo/component/InvoiceFormModal.tsx b/src/components/CompanyInfo/component/InvoiceFormModal.tsx index 463cbaa..b9b354e 100644 --- a/src/components/CompanyInfo/component/InvoiceFormModal.tsx +++ b/src/components/CompanyInfo/component/InvoiceFormModal.tsx @@ -35,7 +35,8 @@ const InvoiceFormModal: React.FC = ({ initialValues, readOnly = false, }) => { - // 新增与修改 + const userId = sessionStorage.getItem('userId') || ''; + // 新增与修改 const [form] = Form.useForm(); //查看 const [viewData, setViewData] = useState({}); @@ -72,7 +73,7 @@ const InvoiceFormModal: React.FC = ({ const payload = { ...values, qualificationCertificate, - "supplierId": "9c12e8ea-a681-4184-81ba-5fa276299a00", + supplierId: userId, }; console.log(values,'values'); diff --git a/src/components/CompanyInfo/component/InvoiceTab.tsx b/src/components/CompanyInfo/component/InvoiceTab.tsx index 9886d97..3fc6abe 100644 --- a/src/components/CompanyInfo/component/InvoiceTab.tsx +++ b/src/components/CompanyInfo/component/InvoiceTab.tsx @@ -77,8 +77,10 @@ const InvoiceTab: React.FC = (props) => { //初始化 useEffect(() => { - getList(); - }, []); + if(record) { + getList(); + } + }, [record]); const columns: ColumnsType = [ { title: 'page.workbench.invoice.index', dataIndex: 'index', width: 80, key: 'index', render: (_: any, __: any, index: number) => index + 1 }, diff --git a/src/components/CompanyInfo/component/PeBaseInfoTab.tsx b/src/components/CompanyInfo/component/PeBaseInfoTab.tsx index 9d677e3..1f657fb 100644 --- a/src/components/CompanyInfo/component/PeBaseInfoTab.tsx +++ b/src/components/CompanyInfo/component/PeBaseInfoTab.tsx @@ -62,9 +62,11 @@ const BaseInfoTab: React.FC = (props) => { useEffect(() => { - //供应商信息 - fetchData() - }, []); + if(record) { + //供应商信息 + fetchData() + } + }, [record]); if (!registerInfo?.coscoSupplierBase) return
{intl.formatMessage({ id: 'component.globalModal.loading' })}...
; diff --git a/src/components/CompanyInfo/component/QualificationFormModal.tsx b/src/components/CompanyInfo/component/QualificationFormModal.tsx index 444c268..1622b42 100644 --- a/src/components/CompanyInfo/component/QualificationFormModal.tsx +++ b/src/components/CompanyInfo/component/QualificationFormModal.tsx @@ -34,6 +34,7 @@ const QualificationFormModal: React.FC = ({ initialValues, readOnly = false, }) => { + const userId = sessionStorage.getItem('userId') || ''; // 新增与修改 const [form] = Form.useForm(); //查看 @@ -78,7 +79,7 @@ const QualificationFormModal: React.FC = ({ dateTime: values.dateTime ? moment(values.dateTime) : undefined, termOfValidity: values.termOfValidity ? moment(values.termOfValidity) : undefined, accessory, - "supplierId": "9c12e8ea-a681-4184-81ba-5fa276299a00", + supplierId: userId, }; if(!values.id) { qualificationsaAdd(payload).then((res) => { diff --git a/src/components/CompanyInfo/component/QualificationTab.tsx b/src/components/CompanyInfo/component/QualificationTab.tsx index 4f2bec1..bf6662d 100644 --- a/src/components/CompanyInfo/component/QualificationTab.tsx +++ b/src/components/CompanyInfo/component/QualificationTab.tsx @@ -48,8 +48,10 @@ const QualificationTab: React.FC = (props) => { }; useEffect(() => { - getList(); - }, []); + if(record) { + getList(); + } + }, [record]); const handleAdd = () => { setEditingRecord(null); diff --git a/src/components/CompanyInfo/index.tsx b/src/components/CompanyInfo/index.tsx index 2ccf0ff..b3672f9 100644 --- a/src/components/CompanyInfo/index.tsx +++ b/src/components/CompanyInfo/index.tsx @@ -26,16 +26,17 @@ const CompanyInfo: React.FC = (props) => { const [subTab, setSubTab] = useState(''); useEffect(() => { - coscoSupplierBase(record).then((res) => { - if (res.code === 200) { - if (res.data.coscoSupplierBase.supplierType === 'pe') { - setSubTab('pe') - } else { - setSubTab('base') + if(record) { + coscoSupplierBase(record).then((res) => { + if (res.code === 200) { + if (res.data.coscoSupplierBase.supplierType === 'pe') { + setSubTab('pe') + } else { + setSubTab('base') + } } - } - }) - + }) + } }, [record]) return ( diff --git a/src/components/GlobalModal/components/RiskList.tsx b/src/components/GlobalModal/components/RiskList.tsx index 38dbce4..f3897be 100644 --- a/src/components/GlobalModal/components/RiskList.tsx +++ b/src/components/GlobalModal/components/RiskList.tsx @@ -5,17 +5,17 @@ import { useIntl } from 'umi'; import type { ColumnsType } from 'antd/es/table'; interface data { - hit:string; - countries:string; - d1:string; - d2:string; + hit: string; + countries: string; + d1: string; + d2: string; [key: string]: any; } -const RiskList = ({id}:{id:string}) => { +const RiskList = ({ id }: { id: string }) => { const intl = useIntl(); - const columns:ColumnsType = [ + const columns: ColumnsType = [ { title: intl.formatMessage({ id: 'component.globalModal.hit', defaultMessage: '命中对象' }), dataIndex: 'hit', @@ -40,7 +40,7 @@ const RiskList = ({id}:{id:string}) => { //合规风险 const [dataList, setDataList] = useState([]) //加载 const [loading, setLoading] = useState(false); - + //分页 //数据渲染 @@ -51,17 +51,17 @@ const RiskList = ({id}:{id:string}) => { if (code === 200) { setDataList(data); } else { - message.error(intl.formatMessage({id: 'component.globalModal.fetchRiskFail'})); + message.error(intl.formatMessage({ id: 'component.globalModal.fetchRiskFail' })); } } catch (error) { - message.error(intl.formatMessage({id: 'component.globalModal.apiError'})); + message.error(intl.formatMessage({ id: 'component.globalModal.apiError' })); } finally { // setLoading(false); } }; //初始化 useEffect(() => { - if(id) { + if (id) { getList(); } }, [id]); @@ -69,17 +69,17 @@ const RiskList = ({id}:{id:string}) => { return ( <> { - dataList.map((item, idx) => ( - - {columns.map(col => ( - - {item[(col as any).dataIndex] ?? '-'} - - ))} - - )) -} - + dataList.map((item, idx) => ( + + {columns.map(col => ( + + {item[(col as any).dataIndex] ?? '-'} + + ))} + + )) + } + ); }; diff --git a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx index 5107bcb..c1e7dda 100644 --- a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx +++ b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx @@ -144,7 +144,7 @@ const SupplierChangeReviewManage: React.FC = ({ dispatch }) => { }, { title: '境内/境外', - dataIndex: 'supplierTypeCn', + dataIndex: 'supplierType', align: 'center', width: 160, }, @@ -179,6 +179,7 @@ const SupplierChangeReviewManage: React.FC = ({ dispatch }) => { key: 'action', align: 'center', width: 160, + fixed: 'right', render: (_: any, record: any) => (