From 18a3e7936c963742e2365b72d862dc0a4cf2f83f 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, 11 Aug 2025 16:40:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=AD=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/MessageNotice.tsx | 30 +++++++++---------- .../components/ViewModal.tsx | 2 ++ .../components/ViewModal.tsx | 2 ++ .../components/ViewModal.tsx | 2 ++ .../components/ViewModal.tsx | 2 ++ .../components/ViewModal.tsx | 2 ++ .../components/ViewModal.tsx | 8 +++++ .../components/ViewModal.tsx | 4 +-- .../components/ViewBlacklistModal.tsx | 6 ++-- .../components/ViewBlacklistModal.tsx | 6 ++-- 10 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/layouts/MessageNotice.tsx b/src/layouts/MessageNotice.tsx index ec03704..331acb6 100644 --- a/src/layouts/MessageNotice.tsx +++ b/src/layouts/MessageNotice.tsx @@ -5,7 +5,15 @@ import { getCountMessage } from '@/servers/api/user'; import { history } from 'umi'; const MessageNotice: React.FC = () => { const [count, setCount] = useState(0); - + const handleBellClick = () => { + const activeKey = sessionStorage.getItem('activeKey') || ''; + if (activeKey === 'accountLogin') { + history.push('/supplierMessage'); + } else { + history.push('/backend/supplierNews'); + } + setCount(0) + }; useEffect(() => { let alive = true; // 拉未读数量 @@ -24,22 +32,14 @@ const MessageNotice: React.FC = () => { return count !== 0 ? ( - - { - const activeKey = sessionStorage.getItem('activeKey') || ''; - if (activeKey === 'accountLogin') { - history.push('/supplierMessage') - } else { - history.push('/backend/supplierNews') - } - }} - /> - + + + + + ) : null }; - + export default MessageNotice; diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx index a434fb6..7e1c508 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx @@ -22,6 +22,7 @@ interface coscoAccessSupplierLists { interface coscoAccessWorks { deptId: string; deptName: string; + orgName: string; reviewStatusText: string; approveStatusText: string; } @@ -56,6 +57,7 @@ const ViewModal: React.FC<{ {data && ( + {data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} {data.coscoAccessSupplierList.map((item) => { diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx index f7b3298..f4fc4ad 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx @@ -22,6 +22,7 @@ interface coscoAccessSupplierLists { interface coscoAccessWorks { deptId: string; deptName: string; + orgName: string; reviewStatusText: string; approveStatusText: string; } @@ -56,6 +57,7 @@ const ViewModal: React.FC<{ {data && ( + {data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} {data.coscoAccessSupplierList.map((item) => { diff --git a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx index b2c205a..e2e84b7 100644 --- a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx +++ b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx @@ -34,6 +34,7 @@ interface coscoAccessSupplierLists { interface coscoAccessWorks { deptId: string; deptName: string; + orgName: string; startTime: string; endTime: string; reviewStatusText: string; @@ -72,6 +73,7 @@ const ViewModal: React.FC<{ {data && ( + {data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} {data.coscoAccessSupplierList.map((item) => { diff --git a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx index cfa4d97..c3e51b4 100644 --- a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx @@ -34,6 +34,7 @@ interface coscoAccessSupplierLists { interface coscoAccessWorks { deptId: string; deptName: string; + orgName: string; startTime: string; endTime: string; reviewStatusText: string; @@ -74,6 +75,7 @@ const ViewModal: React.FC<{ {data && ( + {data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} {data.coscoAccessSupplierList.map((item) => { diff --git a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx index f529227..68bbef0 100644 --- a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx +++ b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx @@ -34,6 +34,7 @@ interface coscoAccessSupplierLists { interface coscoAccessWorks { deptId: string; deptName: string; + orgName: string; startTime: string; endTime: string; reviewStatusText: string; @@ -74,6 +75,7 @@ const ViewModal: React.FC<{ {data && ( + {data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} diff --git a/src/pages/supplier/category/CategoryLibraryReview/components/ViewModal.tsx b/src/pages/supplier/category/CategoryLibraryReview/components/ViewModal.tsx index 84cd364..8ce22c2 100644 --- a/src/pages/supplier/category/CategoryLibraryReview/components/ViewModal.tsx +++ b/src/pages/supplier/category/CategoryLibraryReview/components/ViewModal.tsx @@ -11,6 +11,8 @@ interface CategoryInfo { structure?: string; termOfValidity?: string; deptId?: string; + applyOrgName?: string; + orgName?: string; deptName?: string; categoryName?: string; area?: string; @@ -74,6 +76,12 @@ const ViewModal: React.FC<{ {categoryInfo?.termOfValidity || '-'} + + {categoryInfo?.applyOrgName || '-'} + + + {categoryInfo?.orgName || '-'} + {categoryInfo?.deptName || '-'} diff --git a/src/pages/supplier/category/SupplierEntryReview/components/ViewModal.tsx b/src/pages/supplier/category/SupplierEntryReview/components/ViewModal.tsx index ae05132..2b9ccb3 100644 --- a/src/pages/supplier/category/SupplierEntryReview/components/ViewModal.tsx +++ b/src/pages/supplier/category/SupplierEntryReview/components/ViewModal.tsx @@ -140,9 +140,7 @@ const ViewModal: React.FC<{ {categoryInfo?.applyTime || '-'} - - {categoryInfo?.deptName || '-'} - + {categoryInfo?.area ? areaMap[categoryInfo.area] || categoryInfo?.area : '-'} diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx index 967c141..78cd0dc 100644 --- a/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx +++ b/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx @@ -48,11 +48,11 @@ const ViewBlacklistModal: React.FC = ({ // 可传查询条件 form.getFieldsValue() const values = form.getFieldsValue(); - const { exitTheme, time, deptId } = values; + const { time } = values; const startTime = time ? moment(time[0]).format('YYYY-MM-DD') : ''; const endTime = time ? moment(time[1]).format('YYYY-MM-DD') : ''; - const { code, data } = await getExitInfoPage({ supplierexitId: recordId, pageNo, pageSize, exitTheme, deptId, startTime, endTime }); + const { code, data } = await getExitInfoPage({ supplierexitId: recordId, pageNo, pageSize, ...values, startTime, endTime }); if (code === 200) { setData(data.records); setPagination(prev => ({ ...prev, current: pageNo, pageSize, total: data.total })); @@ -112,7 +112,7 @@ const ViewBlacklistModal: React.FC = ({ - + diff --git a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx index ba0e883..fb4a5ea 100644 --- a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx +++ b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx @@ -48,11 +48,11 @@ const ViewBlacklistModal: React.FC = ({ // 可传查询条件 form.getFieldsValue() const values = form.getFieldsValue(); - const { exitTheme, time, deptId } = values; + const { time } = values; const startTime = time ? moment(time[0]).format('YYYY-MM-DD') : ''; const endTime = time ? moment(time[1]).format('YYYY-MM-DD') : ''; - const { code, data } = await getExitInfoPage({ supplierexitId: recordId, pageNo, pageSize, exitTheme, deptId, startTime, endTime }); + const { code, data } = await getExitInfoPage({ supplierexitId: recordId, pageNo, pageSize, ...values, startTime, endTime }); if (code === 200) { setData(data.records); setPagination(prev => ({ ...prev, current: pageNo, pageSize, total: data.total })); @@ -112,7 +112,7 @@ const ViewBlacklistModal: React.FC = ({ - +