diff --git a/src/components/GlobalModal/components/SupplierRegisterInfo.tsx b/src/components/GlobalModal/components/SupplierRegisterInfo.tsx index 1f8bc68..acf73c2 100644 --- a/src/components/GlobalModal/components/SupplierRegisterInfo.tsx +++ b/src/components/GlobalModal/components/SupplierRegisterInfo.tsx @@ -26,30 +26,30 @@ interface BankInfo { const SupplierRegisterInfo = ({ registerInfo }: { registerInfo: any }) => { -const intl = useIntl(); -const qualificationsColumns:ColumnsType = [ - { title: intl.formatMessage({id: 'component.globalModal.serialNumber'}), dataIndex: 'index', key: 'index', width: 60, align: 'center', render: (_: any, __: any, index: number) => index + 1 }, - { title: intl.formatMessage({id: 'component.globalModal.certificateType'}), dataIndex: 'certificateType', key: 'certificateType' }, - { title: intl.formatMessage({id: 'component.globalModal.certificateName'}), dataIndex: 'name', key: 'name' }, - { title: intl.formatMessage({id: 'component.globalModal.certificateNumber'}), dataIndex: 'code', key: 'code' }, - { title: intl.formatMessage({id: 'component.globalModal.certificateCategoryLevel'}), dataIndex: 'typeLevel', key: 'typeLevel' }, - { title: intl.formatMessage({id: 'component.globalModal.issuingAuthority'}), dataIndex: 'authority', key: 'authority' }, - { title: intl.formatMessage({id: 'component.globalModal.issueDate'}), dataIndex: 'dateTime', key: 'dateTime' }, - { title: intl.formatMessage({id: 'component.globalModal.validUntil'}), dataIndex: 'termOfValidity', key: 'termOfValidity' }, - { title: intl.formatMessage({id: 'component.globalModal.attachment'}), dataIndex: 'accessory', key: 'accessory', render: (text: any) => text ? 查看附件 : '-' }, -]; -const bankColumns:ColumnsType = [ - { title: intl.formatMessage({id: 'component.globalModal.serialNumber'}), dataIndex: 'index', key: 'index', width: 60, align: 'center', render: (_: any, __: any, index: number) => index + 1 }, - { title: intl.formatMessage({id: 'component.globalModal.bankCode'}), dataIndex: 'interbankNumber', key: 'interbankNumber' }, - { title: intl.formatMessage({id: 'component.globalModal.openingBank'}), dataIndex: 'bank', key: 'bank' }, - { title: intl.formatMessage({id: 'component.globalModal.accountName'}), dataIndex: 'accountName', key: 'accountName' }, - { title: intl.formatMessage({id: 'component.globalModal.accountNumber'}), dataIndex: 'account', key: 'account' }, - { title: intl.formatMessage({id: 'component.globalModal.currency'}), dataIndex: 'currency', key: 'currency' }, - { title: intl.formatMessage({id: 'component.globalModal.country'}), dataIndex: 'nation', key: 'nation' }, - { title: intl.formatMessage({id: 'component.globalModal.province'}), dataIndex: 'province', key: 'province' }, - { title: intl.formatMessage({id: 'component.globalModal.city'}), dataIndex: 'city', key: 'city' }, -]; - if (!registerInfo) return
{intl.formatMessage({id: 'component.globalModal.loading'})}...
; + const intl = useIntl(); + const qualificationsColumns: ColumnsType = [ + { title: intl.formatMessage({ id: 'component.globalModal.serialNumber' }), dataIndex: 'index', key: 'index', width: 60, align: 'center', render: (_: any, __: any, index: number) => index + 1 }, + { title: intl.formatMessage({ id: 'component.globalModal.certificateType' }), dataIndex: 'certificateType', key: 'certificateType' }, + { title: intl.formatMessage({ id: 'component.globalModal.certificateName' }), dataIndex: 'name', key: 'name' }, + { title: intl.formatMessage({ id: 'component.globalModal.certificateNumber' }), dataIndex: 'code', key: 'code' }, + { title: intl.formatMessage({ id: 'component.globalModal.certificateCategoryLevel' }), dataIndex: 'typeLevel', key: 'typeLevel' }, + { title: intl.formatMessage({ id: 'component.globalModal.issuingAuthority' }), dataIndex: 'authority', key: 'authority' }, + { title: intl.formatMessage({ id: 'component.globalModal.issueDate' }), dataIndex: 'dateTime', key: 'dateTime' }, + { title: intl.formatMessage({ id: 'component.globalModal.validUntil' }), dataIndex: 'termOfValidity', key: 'termOfValidity' }, + { title: intl.formatMessage({ id: 'component.globalModal.attachment' }), dataIndex: 'accessory', key: 'accessory', render: (text: any) => text ? 查看附件 : '-' }, + ]; + const bankColumns: ColumnsType = [ + { title: intl.formatMessage({ id: 'component.globalModal.serialNumber' }), dataIndex: 'index', key: 'index', width: 60, align: 'center', render: (_: any, __: any, index: number) => index + 1 }, + { title: intl.formatMessage({ id: 'component.globalModal.bankCode' }), dataIndex: 'interbankNumber', key: 'interbankNumber' }, + { title: intl.formatMessage({ id: 'component.globalModal.openingBank' }), dataIndex: 'bank', key: 'bank' }, + { title: intl.formatMessage({ id: 'component.globalModal.accountName' }), dataIndex: 'accountName', key: 'accountName' }, + { title: intl.formatMessage({ id: 'component.globalModal.accountNumber' }), dataIndex: 'account', key: 'account' }, + { title: intl.formatMessage({ id: 'component.globalModal.currency' }), dataIndex: 'currencyName', key: 'currency' }, + { title: intl.formatMessage({ id: 'component.globalModal.country' }), dataIndex: 'nationName', key: 'nation' }, + { title: intl.formatMessage({ id: 'component.globalModal.province' }), dataIndex: 'provinceName', key: 'province' }, + { title: intl.formatMessage({ id: 'component.globalModal.city' }), dataIndex: 'cityName', key: 'city' }, + ]; + if (!registerInfo) return
{intl.formatMessage({ id: 'component.globalModal.loading' })}...
; return ( <> @@ -61,9 +61,28 @@ const bankColumns:ColumnsType = [ style={{ background: '#fff', padding: '16px 0 0' }} > {registerInfo.coscoSupplierBase.supplierType === 'dvs' && ( - - {intl.formatMessage({ id: 'component.globalModal.domesticEnterprise' })} - + <> + + {intl.formatMessage({ id: 'component.globalModal.domesticEnterprise' })} + + + {registerInfo.coscoSupplierBase.licenceAccessory ? ( + + 营业执照 + + ) : ( + 无附件 + )} + + )} {registerInfo.coscoSupplierBase.name} @@ -87,15 +106,9 @@ const bankColumns:ColumnsType = [ )} - - {registerInfo.coscoSupplierBase.socialCreditCode} - {registerInfo.coscoSupplierBase.range} - - {registerInfo.coscoSupplierBase.regAddress} - {registerInfo.coscoSupplierBase.workAddress} @@ -105,24 +118,34 @@ const bankColumns:ColumnsType = [ {registerInfo.coscoSupplierBase.legalPerson} - - {registerInfo.coscoSupplierBase.idCard} - {registerInfo.coscoSupplierBase.capital} - - {registerInfo.coscoSupplierBase.enterpriseType} - + {registerInfo.coscoSupplierBase.supplierType === 'dvs' && ( + <> + + {registerInfo.coscoSupplierBase.socialCreditCode} + + + {registerInfo.coscoSupplierBase.regAddress} + + + {registerInfo.coscoSupplierBase.contactsTypeName} + + + {registerInfo.coscoSupplierBase.idCard} + + + {registerInfo.coscoSupplierBase.enterpriseTypeCn} + + + {registerInfo.coscoSupplierBase.contactsPhone} + + + )} {registerInfo.coscoSupplierBase.contactsName} - - {registerInfo.coscoSupplierBase.contactsPhone} - - - {registerInfo.coscoSupplierBase.contactsType} - {registerInfo.coscoSupplierBase.contactsEmail} @@ -135,7 +158,7 @@ const bankColumns:ColumnsType = [ dataSource={registerInfo.coscoSupplierQualifications} columns={qualificationsColumns} pagination={false} - title={() =>
{intl.formatMessage({id: 'component.globalModal.qualificationInfo'})}
} + title={() =>
{intl.formatMessage({ id: 'component.globalModal.qualificationInfo' })}
} /> {registerInfo.coscoSupplierBase.supplierType === 'dvs' && ( @@ -147,7 +170,7 @@ const bankColumns:ColumnsType = [ style={{ background: '#fff', padding: '16px 0 0' }} > - {registerInfo.coscoSupplierInvoice.taxpayerType} + {registerInfo.coscoSupplierInvoice.taxpayerTypeCn} {registerInfo.coscoSupplierInvoice.head} @@ -183,12 +206,11 @@ const bankColumns:ColumnsType = [ dataSource={registerInfo.coscoSupplierBank} columns={bankColumns} pagination={false} - title={() =>
{intl.formatMessage({id: 'component.globalModal.bankAccount'})}
} + title={() =>
{intl.formatMessage({ id: 'component.globalModal.bankAccount' })}
} /> +
{intl.formatMessage({ id: 'component.globalModal.ethicsQuestionnaireTitle' })}
-
{intl.formatMessage({id: 'component.globalModal.ethicsQuestionnaireTitle'})}
- - {/* = [ style={{ background: '#fff', padding: '16px 16px 0' }} > - {registerInfo.survey.supplierName} + {registerInfo.coscoSupplierSurvey.supplierName} - {registerInfo.survey.name} + {registerInfo.coscoSupplierSurvey.name} - {registerInfo.survey.position} + {registerInfo.coscoSupplierSurvey.position} - {registerInfo.survey.phone} + {registerInfo.coscoSupplierSurvey.phone} - {registerInfo.survey.email} + {registerInfo.coscoSupplierSurvey.email} - {registerInfo.survey.dateTime} + {registerInfo.coscoSupplierSurvey.dateTime} - */} + - {/*
+
index + 1 }, - { title: intl.formatMessage({id: 'component.globalModal.question'}), dataIndex: 'surveyQuestion', key: 'surveyQuestion' }, + { title: intl.formatMessage({id: 'component.globalModal.question'}), dataIndex: 'questionName', key: 'questionName' }, { title: intl.formatMessage({id: 'component.globalModal.answer'}), dataIndex: 'replyValue', key: 'replyValue', width: 120 }, ]} pagination={false} title={() =>
{intl.formatMessage({id: 'component.globalModal.questionnaire'})}
} /> - */} + = [ label={intl.formatMessage({ id: 'component.globalModal.antiBriberyLabel' })} labelStyle={{ width: '200px' }} > - {intl.formatMessage({id: 'component.globalModal.viewAttachment'})} + {intl.formatMessage({ id: 'component.globalModal.viewAttachment' })} @@ -254,8 +276,8 @@ const bankColumns:ColumnsType = [ label={intl.formatMessage({ id: 'component.globalModal.otherAttachmentLabel' })} labelStyle={{ width: '200px' }} > - { registerInfo.coscoSupplierSurveyAttachments[0].fileUrl && ( - {intl.formatMessage({id: 'component.globalModal.viewAttachment'})} + {registerInfo.coscoSupplierSurveyAttachments[0].fileUrl && ( + {intl.formatMessage({ id: 'component.globalModal.viewAttachment' })} )} diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx index f203311..4cd9e85 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx @@ -102,8 +102,8 @@ const SupplierCategoryEntry: React.FC = () => { render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1, }, { title: '准入工作', ellipsis: true, width: 120, dataIndex: 'accessWorkName' }, - { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'deptId' }, - { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptId' }, + { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'orgName' }, + { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptName' }, { title: '准入方式', ellipsis: true, width: 120, dataIndex: 'accessTypeText' }, { title: '申请时间', dataIndex: 'createTime', width: 180 }, { title: '审批状态', ellipsis: true, width: 120, dataIndex: 'approveStatusText' }, diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx index b22302a..e0d6812 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx @@ -73,8 +73,8 @@ const SupplierCategoryEntryReview: React.FC = () => { render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1, }, { title: '准入工作', dataIndex: 'accessWorkName', ellipsis: true }, - { title: '准入单位', dataIndex: 'deptId', ellipsis: true }, - { title: '准入部门', dataIndex: 'deptId', ellipsis: true }, + { title: '准入单位', dataIndex: 'orgName', ellipsis: true }, + { title: '准入部门', dataIndex: 'deptName', ellipsis: true }, { title: '准入方式', dataIndex: 'accessTypeText', width: 120 }, { title: '申请时间', dataIndex: 'createTime', width: 180 }, { title: '审批状态', dataIndex: 'approveStatusText', width: 120 }, diff --git a/src/pages/supplier/admission/SupplierEntryReview/index.tsx b/src/pages/supplier/admission/SupplierEntryReview/index.tsx index a703d3e..44f6299 100644 --- a/src/pages/supplier/admission/SupplierEntryReview/index.tsx +++ b/src/pages/supplier/admission/SupplierEntryReview/index.tsx @@ -31,12 +31,6 @@ interface ModalInfo { record: string | null; } - -const deptOptions = [ - { label: '全部', value: '' }, - { label: '采购部', value: 'DEPT001' }, - { label: '业务部', value: 'DEPT002' }, -]; interface Dict { dicName: string; code: string; @@ -136,7 +130,7 @@ const SupplierEntryReview: React.FC = () => { }, { title: '准入部门', - dataIndex: 'deptId', + dataIndex: 'deptName', align: 'center', width: 120, }, diff --git a/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx b/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx index b79d2f1..4e0fbbd 100644 --- a/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx @@ -19,6 +19,7 @@ interface Reviewer { name: string; id: string; deptId: string; + orgName: string; } // 传入的人接口 interface ReviewerSelectorData { diff --git a/src/pages/supplier/admission/admissionManagement/components/DivisionModal.tsx b/src/pages/supplier/admission/admissionManagement/components/DivisionModal.tsx index 238df63..24a3525 100644 --- a/src/pages/supplier/admission/admissionManagement/components/DivisionModal.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/DivisionModal.tsx @@ -8,6 +8,7 @@ interface Reviewer { name: string; id: string; deptId: string; + orgName: string; } // 传入的人接口 interface ReviewerSelectorData { diff --git a/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx b/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx index 1c4ce7a..517bf78 100644 --- a/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx @@ -10,6 +10,7 @@ interface Reviewer { name: string; userId: string; deptId: string; + orgName: string; isLeader: number; } interface ReviewerSelectorData { @@ -30,7 +31,8 @@ function orgIdAndDeptId(data:any) { const sss = data.map((item:any) => { return { ...item, - deptId: item.orgId + deptId: item.orgId, + orgName: item.orgName } }) @@ -93,7 +95,7 @@ const ReviewerSelector: React.FC = ({ const columns: ColumnsType = [ { title: '姓名', dataIndex: 'name' }, { title: '工号', dataIndex: 'userId' }, - { title: '部门', dataIndex: 'deptId' }, + { title: '部门', dataIndex: 'orgName' }, { title: '组长', render: (_: any, record: Reviewer) => ( diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx index a9ec7bf..c1c89d8 100644 --- a/src/pages/supplier/admission/admissionManagement/index.tsx +++ b/src/pages/supplier/admission/admissionManagement/index.tsx @@ -92,8 +92,8 @@ const AccessManagement: React.FC = () => { render: (_: any, __: any, idx: number) => (((pagination.current ?? 1) - 1) * (pagination.pageSize ?? 10)) + idx + 1, }, { title: '准入工作', ellipsis: true, width: 120, dataIndex: 'accessWorkName' }, - { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'deptId' }, - { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptId' }, + { title: '准入单位', ellipsis: true, width: 120, dataIndex: 'orgName' }, + { title: '准入部门', ellipsis: true, width: 120, dataIndex: 'deptName' }, { title: '准入方式', ellipsis: true, width: 120, dataIndex: 'accessTypeText' }, { title: '申请时间', ellipsis: true, width: 180, dataIndex: 'createTime' }, { diff --git a/src/pages/supplier/admission/admissionReviewManagement/index.tsx b/src/pages/supplier/admission/admissionReviewManagement/index.tsx index 90bc451..a6c1f96 100644 --- a/src/pages/supplier/admission/admissionReviewManagement/index.tsx +++ b/src/pages/supplier/admission/admissionReviewManagement/index.tsx @@ -99,15 +99,15 @@ const CooperateEnterprise: React.FC = () => { }, { title: '发起单位', - dataIndex: 'deptId', - key: 'deptId', + dataIndex: 'orgName', + key: 'orgName', ellipsis: true, width: 120, }, { title: '准入部门', - dataIndex: 'deptId', - key: 'deptId', + dataIndex: 'deptName', + key: 'deptName', ellipsis: true, width: 120, }, diff --git a/src/pages/supplier/backend/changeProgressInquiry/components/DetailView.tsx b/src/pages/supplier/backend/changeProgressInquiry/components/DetailView.tsx index 153ad46..e9f23ec 100644 --- a/src/pages/supplier/backend/changeProgressInquiry/components/DetailView.tsx +++ b/src/pages/supplier/backend/changeProgressInquiry/components/DetailView.tsx @@ -53,7 +53,7 @@ const DetailView: React.FC = ({ visible, onClose, detailId }) = // 把info数组两两合并成一行显示 function renderInfoTable(infoArr: InfoItem[]) { const rows = []; - for (let i = 0; i < infoArr.length; i += 2) { + for (let i = 0; i < infoArr.length; i++) { rows.push( <> {infoArr[i].oldValue} diff --git a/src/pages/supplier/backend/workbenches/components/PersonalInfo.tsx b/src/pages/supplier/backend/workbenches/components/PersonalInfo.tsx index e2db0c3..c12597a 100644 --- a/src/pages/supplier/backend/workbenches/components/PersonalInfo.tsx +++ b/src/pages/supplier/backend/workbenches/components/PersonalInfo.tsx @@ -1,33 +1,51 @@ -import React, { useEffect, useState } from 'react'; +import React, { useMemo } from 'react'; import { Descriptions } from 'antd'; -import { coscoSupplier } from '../services' import { useIntl } from 'umi'; +// 性别转中文 +const getGenderLabel = (sex: string | number | undefined) => { + if (sex === '1' || sex === 1) return '男'; + if (sex === '0' || sex === 0) return '女'; + return ''; +}; const PersonalInfo: React.FC = () => { const intl = useIntl(); - const [registerInfo, setRegisterInfo] = useState({ base: {} }); - - const fetchData = async () => { - const { code, data } = await coscoSupplier({}); - if (code === 200) { - setRegisterInfo(data); + // 从缓存读取,推荐用 useMemo 保证只读一次 + const localUser = useMemo(() => { + const cacheStr = sessionStorage.getItem('currentUser'); + if (!cacheStr) return {}; + try { + return JSON.parse(cacheStr); + } catch { + return {}; } - }; - // 个人信息 - useEffect(() => { - fetchData() - }, []); + }, []); + + // 优先显示 user,其次 supplierUser + const base = localUser.user || localUser.supplierUser || {}; return (
- {registerInfo.base.name} - {registerInfo.base.gender} - {registerInfo.base.phone} - {registerInfo.base.email} - {registerInfo.base.department} - {registerInfo.base.position} - {registerInfo.base.entryDate} + + {base.name || '-'} + + + {getGenderLabel(base.sex)} + + + {base.mobile || base.phone || '-'} + + + {base.email || '-'} + + + {base.orgName || '-'} + + + {base.position || '-'} + + {/* 如有入职日期再补 */}
); diff --git a/src/pages/supplier/informationManagement/SupplierChangeManage/components/DetailView.tsx b/src/pages/supplier/informationManagement/SupplierChangeManage/components/DetailView.tsx index 14c2dec..8ce0274 100644 --- a/src/pages/supplier/informationManagement/SupplierChangeManage/components/DetailView.tsx +++ b/src/pages/supplier/informationManagement/SupplierChangeManage/components/DetailView.tsx @@ -73,7 +73,7 @@ const DetailView: React.FC = ({ visible, onClose, detailId }) = // 把info数组两两合并成一行显示 function renderInfoTable(infoArr: InfoItem[]) { const rows = []; - for (let i = 0; i < infoArr.length; i += 2) { + for (let i = 0; i < infoArr.length; i++) { const left = infoArr[i]; const right = infoArr[i + 1] || { label: '', value: '' }; rows.push( diff --git a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/components/DetailView.tsx b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/components/DetailView.tsx index f1b18f6..e1eb1b4 100644 --- a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/components/DetailView.tsx +++ b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/components/DetailView.tsx @@ -51,7 +51,7 @@ const DetailView: React.FC = ({ visible, onClose, detailId }) = // 把info数组两两合并成一行显示 function renderInfoTable(infoArr: InfoItem[]) { const rows = []; - for (let i = 0; i < infoArr.length; i += 2) { + for (let i = 0; i < infoArr.length; i++) { rows.push( <> {infoArr[i].oldValue} diff --git a/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx b/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx index 7049c86..af6c923 100644 --- a/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx @@ -210,11 +210,9 @@ const groupQualifiedSupplierQuery: React.FC = ({ dispatch }) => { render: (record: any) => ( { setCurrentRecord(record.id); setViewVisible(true); }} >查看 { setCurrentRecord(record.id); setDetailVisible(true); }} >准入明细 diff --git a/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx b/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx index 1163595..e42eaa2 100644 --- a/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx +++ b/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx @@ -179,11 +179,9 @@ const mySupplierInquiry: React.FC = ({ dispatch }) => { render: (record: any) => ( { setCurrentRecord(record.id); setViewVisible(true); }} >查看 { setCurrentRecord(record.id); setDetailVisible(true); }} >准入明细 diff --git a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx index 939cb4a..46ff29f 100644 --- a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx @@ -195,11 +195,9 @@ const personQualifiedSupplierQuery: React.FC = ({ dispatch }) => { render: (record: any) => ( { setCurrentRecord(record.id); setViewVisible(true); }} >查看 { setCurrentRecord(record.id); setDetailVisible(true); }} >准入明细 diff --git a/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx b/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx index dbef18f..15eda74 100644 --- a/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/registrationQuery/index.tsx @@ -27,8 +27,8 @@ interface Data { type OptionType = { label: string; value: string }; //准入状态 const statusColor = (status: string) => { - if (status === '已驳回' || status === '已退出') return 'red'; - if (status === '已准入') return 'green'; + if (status === '已驳回' || status === '已退出') return '#ef6969'; + if (status === '已准入') return '#004f8e'; return undefined; }; @@ -177,11 +177,9 @@ const RegistrationQuery: React.FC = ({ dispatch }) => { render: (record) => ( { setCurrentRecord(record.id); setViewVisible(true); }} >查看 { setCurrentRecord(record.id); setDetailVisible(true); }} >准入明细