diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx index 7e1c508..b201e45 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx @@ -3,7 +3,8 @@ import { Modal, Descriptions, Spin } from 'antd'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; import { coscoAccessWorkCategory } from '../services' - +//字典 +import { getDictList } from '@/servers/api/dicts' //数据接口 interface Data { coscoAccessWork: coscoAccessWorks; @@ -25,6 +26,7 @@ interface coscoAccessWorks { orgName: string; reviewStatusText: string; approveStatusText: string; + approveStatus: string; } const ViewModal: React.FC<{ @@ -36,11 +38,21 @@ const ViewModal: React.FC<{ const [data, setData] = useState(null); const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); +const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); //初始化 useEffect(() => { if (record.id) { setLoading(true); + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) coscoAccessWorkCategory(record.id).then((res) => { const { code, data } = res; if (code == 200) { @@ -73,8 +85,7 @@ const ViewModal: React.FC<{ ) })} - - {data.coscoAccessWork.approveStatusText} + { approveTypeMap[data.coscoAccessWork.approveStatus] || data.coscoAccessWork.approveStatus} )} diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx index f4fc4ad..67b051f 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx @@ -3,7 +3,8 @@ import { Modal, Descriptions, Spin } from 'antd'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; import { coscoAccessWorkCategory } from '../services' - +//字典 +import { getDictList } from '@/servers/api/dicts' //数据接口 interface Data { coscoAccessWork: coscoAccessWorks; @@ -25,6 +26,8 @@ interface coscoAccessWorks { orgName: string; reviewStatusText: string; approveStatusText: string; + approveStatus: string; + } const ViewModal: React.FC<{ @@ -36,11 +39,21 @@ const ViewModal: React.FC<{ const [data, setData] = useState(null); const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); + const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); //初始化 useEffect(() => { if (record.id) { setLoading(true); + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) coscoAccessWorkCategory(record.id).then((res) => { const { code, data } = res; if (code == 200) { @@ -54,7 +67,7 @@ const ViewModal: React.FC<{ return ( - + {data && ( {data.coscoAccessWork.orgName} @@ -73,11 +86,11 @@ const ViewModal: React.FC<{ ) })} - - {data.coscoAccessWork.approveStatusText} + {approveTypeMap[data.coscoAccessWork.approveStatus] || data.coscoAccessWork.approveStatus} + )} - + ); }; diff --git a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx index e2e84b7..a872713 100644 --- a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx +++ b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx @@ -3,7 +3,8 @@ import { Modal, Descriptions, Spin } from 'antd'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; import { coscoAccessWork } from '../services' - +//字典 +import { getDictList } from '@/servers/api/dicts' //数据接口 interface Data { coscoAccessWork: coscoAccessWorks; @@ -38,6 +39,7 @@ interface coscoAccessWorks { startTime: string; endTime: string; reviewStatusText: string; + approveStatus: string; accessType: string; accessDesc: string; approveStatusText: string; @@ -52,11 +54,21 @@ const ViewModal: React.FC<{ const [data, setData] = useState(null); const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); + const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); //初始化 useEffect(() => { if (record) { setLoading(true); + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) coscoAccessWork(record).then((res) => { const { code, data } = res; if (code == 200) { @@ -132,7 +144,7 @@ const ViewModal: React.FC<{ ) })} - {data.coscoAccessWork.approveStatusText} + { approveTypeMap[data.coscoAccessWork.approveStatus] || data.coscoAccessWork.approveStatus} )} diff --git a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx index c3e51b4..dacc18e 100644 --- a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx +++ b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx @@ -3,7 +3,8 @@ import { Modal, Descriptions, Spin } from 'antd'; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; import { coscoAccessWork } from '../services' - +//字典 +import { getDictList } from '@/servers/api/dicts' //数据接口 interface Data { coscoAccessWork: coscoAccessWorks; @@ -38,6 +39,7 @@ interface coscoAccessWorks { startTime: string; endTime: string; reviewStatusText: string; + approveStatus: string; accessType: string; accessDesc: string; approveStatusText: string; @@ -52,11 +54,20 @@ const ViewModal: React.FC<{ const [data, setData] = useState(null); const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); - +const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); //初始化 useEffect(() => { if (record.id) { setLoading(true); + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) coscoAccessWork(record.id) .then((res) => { const { code, data } = res; @@ -135,7 +146,7 @@ const ViewModal: React.FC<{ ) })} - {data.coscoAccessWork.approveStatusText} + { approveTypeMap[data.coscoAccessWork.approveStatus] || data.coscoAccessWork.approveStatus} )} diff --git a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx index 68bbef0..f932b7a 100644 --- a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx +++ b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx @@ -3,6 +3,8 @@ import { Modal, Descriptions, Spin } from 'antd'; import { coscoAccessWork } from '../services' import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; +//字典 +import { getDictList } from '@/servers/api/dicts' //数据接口 interface Data { @@ -38,6 +40,7 @@ interface coscoAccessWorks { startTime: string; endTime: string; reviewStatusText: string; + approveStatus: string; accessType: string; accessDesc: string; approveStatusText: string; @@ -52,11 +55,21 @@ const ViewModal: React.FC<{ const [data, setData] = useState(null); const supplierDetailModal = useSupplierDetailModal(); const [loading, setLoading] = useState(false); - + const [approveTypeMap, setApproveTypeMap] = useState<{ [code: string]: string }>({}); + //初始化 useEffect(() => { if (record.id) { setLoading(true); + getDictList('approve_type').then((res) => { + if (res.code == 200) { + const map: { [code: string]: string } = {}; + res.data.forEach((item: { code: string, dicName: string }) => { + map[item.code] = item.dicName; + }); + setApproveTypeMap(map); + } + }) coscoAccessWork(record.id) .then((res) => { const { code, data } = res; @@ -135,7 +148,7 @@ const ViewModal: React.FC<{ ) })} - {data.coscoAccessWork.approveStatusText} + {approveTypeMap[data.coscoAccessWork.approveStatus] || data.coscoAccessWork.approveStatus} )} diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx index c3e01cf..09380cf 100644 --- a/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx +++ b/src/pages/supplier/supplierExit/supplierExitAudit/components/ViewBlacklistModal.tsx @@ -5,7 +5,6 @@ import { SearchOutlined, DeleteOutlined } from "@ant-design/icons"; //umi 相关 import { connect } from 'umi'; import moment from 'moment'; -import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" //接口 import { getExitInfoPage } from "../services"; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; @@ -133,6 +132,9 @@ const ViewBlacklistModal: React.FC = ({ loading={loading} rowKey="id" pagination={{ ...tableProps.pagination, total: pagination.total }} + onChange={(pagination) => { + getList(pagination.current, pagination.pageSize); + }} style={{ flex: 1, minHeight: 'calc(100vh - 350px)' }} scroll={{ y: 'calc(100vh - 350px)' }} /> diff --git a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx index c5ef791..ddada2b 100644 --- a/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx +++ b/src/pages/supplier/supplierExit/supplierExitManage/components/ViewBlacklistModal.tsx @@ -5,7 +5,6 @@ import { SearchOutlined, DeleteOutlined } from "@ant-design/icons"; //umi 相关 import { connect } from 'umi'; import moment from 'moment'; -import AccessDepartmentSelect from "@/components/AccessDepartmentSelect" //接口 import { getExitInfoPage } from "../services"; import { useSupplierDetailModal } from '@/components/SupplierDetailModalContext/SupplierDetailModalContext'; @@ -133,6 +132,9 @@ const ViewBlacklistModal: React.FC = ({ loading={loading} rowKey="id" pagination={{ ...tableProps.pagination, total: pagination.total }} + onChange={(pagination) => { + getList(pagination.current, pagination.pageSize); + }} style={{ flex: 1, minHeight: 'calc(100vh - 350px)' }} scroll={{ y: 'calc(100vh - 350px)' }} />