diff --git a/src/components/TreeCategorySelector/index.tsx b/src/components/TreeCategorySelector/index.tsx index d355d78..fc9c6b3 100644 --- a/src/components/TreeCategorySelector/index.tsx +++ b/src/components/TreeCategorySelector/index.tsx @@ -259,7 +259,6 @@ const TreeCategorySelector: React.FC = ({ const next = valueArray.length ? valueArray[0] : null; if (selectedKey !== next) setSelectedKey(next); } - setSearch(''); setDisplayTree(origin); setAutoExpandParent(true); }, [open, multiple, valueArray, origin]); @@ -467,7 +466,7 @@ const TreeCategorySelector: React.FC = ({ width={720} footer={multiple ? undefined : null} > - + = ({ value={search} style={{ marginBottom: 8 }} /> +
{data && ( + {data.coscoAccessWork.orgName} {data.coscoAccessWork.deptName} {data.coscoAccessSupplierList.map((item) => { diff --git a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx index af878c0..8d6625c 100644 --- a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx +++ b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx @@ -58,9 +58,9 @@ const SupplierChangeReviewManage: React.FC = ({ dispatch }) => { setLoading(true); try { const values = form.getFieldsValue(); - const { changeTime } = values; - const startTime = changeTime ? moment(changeTime[0]).format('YYYY-MM-DD') : ''; - const endTime = changeTime ? moment(changeTime[1]).format('YYYY-MM-DD') : ''; + 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, message } = await getPage({ pageNo: pagination.current, @@ -242,7 +242,7 @@ const SupplierChangeReviewManage: React.FC = ({ dispatch }) => { ))} - + diff --git a/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx b/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx index b824104..4e79ba7 100644 --- a/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx +++ b/src/pages/supplier/informationManagement/SupplierRegisterAgent/index.tsx @@ -34,20 +34,20 @@ const SupplierRegisterAgent: React.FC = () => { const [currentRecord, setCurrentRecord] = useState(''); // 新增与修改 const [exitModalVisible, setExitModalVisible] = useState(false); - const [exitId, setExitId] = useState(''); + // const [exitId, setExitId] = useState(''); const supplierDetailModal = useSupplierDetailModal(); // 查询数据 const fetchData = async (page = 1, pageSize = 10) => { setLoading(true); // 获取表单参数 - const { keyword, dateRange } = form.getFieldsValue(); + const { name, dateRange } = form.getFieldsValue(); let params: any = { pageNo: page, pageSize, + name, supplierType: tabKey, }; - if (keyword) params.keyword = keyword; if (dateRange && dateRange.length === 2) { params.startDate = dateRange[0].format('YYYY-MM-DD'); params.endDate = dateRange[1].format('YYYY-MM-DD'); @@ -95,10 +95,6 @@ const SupplierRegisterAgent: React.FC = () => { form.resetFields(); fetchData(1, pagination.pageSize); }; - // 切页 - const handleTableChange = (pag: any) => { - fetchData(pag.current, pag.pageSize); - }; // 列 境内 const columnsDvs: ColumnsType = [ @@ -202,7 +198,7 @@ const SupplierRegisterAgent: React.FC = () => { { title: '创建单位', dataIndex: 'orgName', - align: 'center', + align: 'center', width: 120, ellipsis: true, }, @@ -346,7 +342,9 @@ const SupplierRegisterAgent: React.FC = () => { rowKey="id" loading={loading} pagination={{ ...tableProps.pagination, total: pagination.total }} - onChange={(current, pageSize) => handleTableChange({ current, pageSize })} + onChange={(pagination) => { + fetchData(pagination.current, pagination.pageSize); + }} style={{ flex: 1, minHeight: 0 }} scroll={{ y: 'calc(100vh - 350px)' }} /> @@ -358,7 +356,7 @@ const SupplierRegisterAgent: React.FC = () => { /> { fetchData(1, pagination.pageSize); setExitModalVisible(false) diff --git a/src/pages/supplier/informationManagement/SupplierRegisterAgent/services.ts b/src/pages/supplier/informationManagement/SupplierRegisterAgent/services.ts index 3aecb21..9b80807 100644 --- a/src/pages/supplier/informationManagement/SupplierRegisterAgent/services.ts +++ b/src/pages/supplier/informationManagement/SupplierRegisterAgent/services.ts @@ -5,11 +5,7 @@ import request from '@/utils/request'; * 供应商变更审批管理分页列表 */ interface getPageAgent { - pageNo: number; - pageSize: number; - accessStatus?: string; - name?: string; - supplierType?: string; + pageNo: number; pageSize: number; name: string; supplierType: string; startDate:string; endDate:string; } export const getPageAgent = (data: getPageAgent) => request.post('/coscoSupplierBase/getPageAgent', { data });