diff --git a/src/pages/supplier/ViewReviewPage/components/SupplierCategoryAccessApproval.tsx b/src/pages/supplier/ViewReviewPage/components/SupplierCategoryAccessApproval.tsx index 6975a98..004a10c 100644 --- a/src/pages/supplier/ViewReviewPage/components/SupplierCategoryAccessApproval.tsx +++ b/src/pages/supplier/ViewReviewPage/components/SupplierCategoryAccessApproval.tsx @@ -8,6 +8,7 @@ interface Data { coscoAccessWork: coscoAccessWorks; coscoAccessSupplierList: coscoAccessSupplierLists[]; coscoAccessCategoryList: coscoAccessCategoryLists[]; + coscoAccessSupplierCategoryList: coscoAccessCategoryLists[]; coscoAccessUserls: coscoAccessUserl[]; coscoAccessWorkAttachments: coscoAccessWorkAttachments; } @@ -28,12 +29,15 @@ interface coscoAccessCategoryLists { } interface coscoAccessSupplierLists { supplierName: string; + supplierTypeCn: string; [property: string]: any; } interface coscoAccessWorks { deptId: string; deptName: string; orgName: string; + createByName: string; + createTime: string; startTime: string; endTime: string; reviewStatusText: string; @@ -90,9 +94,15 @@ const ViewModal: React.FC<{ ) })} - {data.coscoAccessWork.orgName} + + {data.coscoAccessSupplierList.map((item) => { + return ( + {item.supplierTypeCn} + ) + })} + - {data.coscoAccessCategoryList.map((item) => { + {data.coscoAccessSupplierCategoryList && data.coscoAccessSupplierCategoryList.map((item) => { return (
{item.categoryPathName}
) @@ -107,8 +117,8 @@ const ViewModal: React.FC<{
{data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} - {data.coscoAccessWork.deptName} - {data.coscoAccessWork.deptName} + {data.coscoAccessWork.createByName} + {data.coscoAccessWork.createTime} )} diff --git a/src/pages/supplier/ViewReviewPage/index.tsx b/src/pages/supplier/ViewReviewPage/index.tsx index b281622..05ed4a3 100644 --- a/src/pages/supplier/ViewReviewPage/index.tsx +++ b/src/pages/supplier/ViewReviewPage/index.tsx @@ -28,10 +28,10 @@ const ViewReviewPage: React.FC = () => { const query = /%[0-9A-F]{2}/i.test(decodedStr) ? decodeURIComponent(decodedStr) : decodedStr; const p2 = new URLSearchParams(query); const id = p2.get('id') ?? ''; - const code = p2.get('code') ?? ''; + const type = p2.get('type') ?? ''; const userId = p2.get('userId') ?? ''; if (!id) return; - setType(code); // code 现在一定是 string + setType(type); // code 现在一定是 string // 初始化字典 if (!sessionStorage.getItem('dict')) { refreshDictCache().then((res) => { diff --git a/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx b/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx index 42d3c87..eebc3bf 100644 --- a/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx +++ b/src/pages/supplier/informationRetrieval/mySupplierInquiry/index.tsx @@ -64,13 +64,13 @@ const mySupplierInquiry: React.FC = ({ dispatch }) => { // 查询 const handleSearch = () => { setPagination({ ...pagination, current: 1 }); - getList(1, pagination.pageSize); + getList(pagination.current, pagination.pageSize); }; // 重置 const handleReset = () => { form.resetFields(); setPagination({ ...pagination, current: 1 }); - getList(1, pagination.pageSize); + getList(pagination.current, pagination.pageSize); }; //列表方法 const getList = async (pageNo: number = 1, pageSize: number = 10) => { diff --git a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx index db1db44..ee2b7e8 100644 --- a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx @@ -54,6 +54,7 @@ const PersonQualifiedSupplierQuery: React.FC = ({ dispatch }) => { const handleTreeSelect = (keys: string | number) => { const key = keys as string; setSelectedKeys(key); + setPagination(p => ({ ...p, current: 1 })); getList(key, 1, pagination.pageSize); };