diff --git a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx index 9431f8c..9b68237 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntry/index.tsx @@ -81,13 +81,13 @@ const SupplierCategoryEntry: React.FC = () => { const closeModal = () => { setModalInfo({ type: '', visible: false }); const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); }; // 重置 const handleReset = () => { form.resetFields() const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); }; const handleApproval = (accessWorkId: string) => { @@ -98,7 +98,7 @@ const SupplierCategoryEntry: React.FC = () => { if (res.code === 200) { message.success('发起审批成功'); const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); } }, }); diff --git a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx index a820456..924715b 100644 --- a/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx +++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/index.tsx @@ -70,13 +70,13 @@ const SupplierCategoryEntryReview: React.FC = () => { const closeModal = () => { setModalInfo({ type: '', visible: false }); const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); }; // 重置 const handleReset = () => { form.resetFields() const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); }; //列表头部数据 const columns: ColumnsType = [ diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx index 1876dd2..cf46fbe 100644 --- a/src/pages/supplier/admission/admissionManagement/index.tsx +++ b/src/pages/supplier/admission/admissionManagement/index.tsx @@ -59,7 +59,7 @@ const AccessManagement: React.FC = () => { //初始化 useEffect(() => { const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); getDictList('approve_type').then((res) => { if (res.code == 200) { @@ -80,13 +80,13 @@ const AccessManagement: React.FC = () => { const closeModal = () => { setModalInfo({ type: '', visible: false }); const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); }; // 重置 const handleReset = () => { form.resetFields() const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); }; const handleApproval = (id: string) => { @@ -97,7 +97,7 @@ const AccessManagement: React.FC = () => { if (res.code === 200) { message.success('发起审批成功'); const values = form.getFieldsValue(); - getList(values, 1, 10); + getList(values, 1, pagination.pageSize); } }, }); diff --git a/src/pages/supplier/category/CategoryLibraryManage/index.tsx b/src/pages/supplier/category/CategoryLibraryManage/index.tsx index 7d168d4..5aa0b04 100644 --- a/src/pages/supplier/category/CategoryLibraryManage/index.tsx +++ b/src/pages/supplier/category/CategoryLibraryManage/index.tsx @@ -254,7 +254,7 @@ const CategoryLibraryManage: React.FC = () => { onCancel={() => setAddVisible(false)} onSuccess={() => { setAddVisible(false); - getList(); + getList(1, pagination.pageSize || 10); }} /> {/* 添加供应商弹窗 */} @@ -264,7 +264,7 @@ const CategoryLibraryManage: React.FC = () => { onCancel={() => setAddSupplierVisible(false)} onSuccess={() => { setAddSupplierVisible(false); - getList(); + getList(1, pagination.pageSize || 10); }} /> {/* 库内供应商数量弹窗 */} diff --git a/src/pages/supplier/category/SupplierEntryManage/index.tsx b/src/pages/supplier/category/SupplierEntryManage/index.tsx index 2a8c0c8..b851dbf 100644 --- a/src/pages/supplier/category/SupplierEntryManage/index.tsx +++ b/src/pages/supplier/category/SupplierEntryManage/index.tsx @@ -236,7 +236,7 @@ const SupplierEntryManage: React.FC = () => { onCancel={() => setAddVisible(false)} onSuccess={() => { setAddVisible(false); - getList(); + getList(1, pagination.pageSize || 10); }} /> {/* 添加供应商弹窗 */} @@ -246,7 +246,7 @@ const SupplierEntryManage: React.FC = () => { onCancel={() => setAddSupplierVisible(false)} onSuccess={() => { setAddSupplierVisible(false); - getList(); + getList(1, pagination.pageSize || 10); }} /> {/* 库内供应商数量弹窗 */} diff --git a/src/pages/supplier/category/SupplierEntryReview/index.tsx b/src/pages/supplier/category/SupplierEntryReview/index.tsx index f5a3844..ae2c2cb 100644 --- a/src/pages/supplier/category/SupplierEntryReview/index.tsx +++ b/src/pages/supplier/category/SupplierEntryReview/index.tsx @@ -73,7 +73,7 @@ const CategoryLibraryManage: React.FC = () => { const res = await approval({ id }); if (res.code === 200) { message.success('提交成功'); - getList(); // 刷新列表 + getList(1, pagination.pageSize || 10); // 刷新列表 } }, }); @@ -267,7 +267,7 @@ const CategoryLibraryManage: React.FC = () => { onCancel={() => setAddVisible(false)} onSuccess={() => { setAddVisible(false); - getList(); + getList(1, pagination.pageSize || 10); }} /> {/* 新增品类库弹窗 */} diff --git a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx index 8d6625c..3b3edf2 100644 --- a/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx +++ b/src/pages/supplier/informationManagement/SupplierChangeReviewManage/index.tsx @@ -199,18 +199,18 @@ const SupplierChangeReviewManage: React.FC = ({ dispatch }) => { fixed: 'right', render: (_: any, record: any) => ( <> - {/* 测试使用,需删除 */} - { record.approveStatus === '0' && userId == '8' && ( - + }}> + 审批 + )} @@ -264,7 +264,13 @@ const SupplierChangeReviewManage: React.FC = ({ dispatch }) => { dataSource={data} loading={loading} pagination={{ ...tableProps.pagination, total: pagination.total }} - onChange={() => setPagination({ ...pagination })} + onChange={(pag) => { + setPagination({ + current: pag.current ?? 1, + pageSize: pag.pageSize ?? 10, + total: pag.total ?? 0, + }); + }} style={{ flex: 1, minHeight: 0 }} scroll={{ y: 'calc(100vh - 350px)' }} /> diff --git a/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx b/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx index 477e4fd..ff49831 100644 --- a/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx +++ b/src/pages/supplier/supplierExit/supplierExitAudit/index.tsx @@ -42,11 +42,11 @@ const supplierExitAudit: React.FC = () => { setLoading(true); // 可传查询条件 form.getFieldsValue() const values = form.getFieldsValue(); - const { exitTheme, time, orgId, approveStatus } = 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 getPage({ pageNo, pageSize, exitTheme, orgId, approveStatus, startTime, endTime }); + const { code, data } = await getPage({ pageNo, pageSize, ...values, startTime, endTime }); if (code === 200) { setData(data.records); setPagination(prev => ({ ...prev, current: pageNo, pageSize, total: data.total })); @@ -74,7 +74,7 @@ const supplierExitAudit: React.FC = () => { setCreateVisible(true) }; const handleSelectOk = () => { - getList(); + getList(1, pagination.pageSize); setCreateVisible(false); }; useEffect(() => { diff --git a/src/pages/supplier/supplierExit/supplierExitManage/index.tsx b/src/pages/supplier/supplierExit/supplierExitManage/index.tsx index f35b434..1b91f3a 100644 --- a/src/pages/supplier/supplierExit/supplierExitManage/index.tsx +++ b/src/pages/supplier/supplierExit/supplierExitManage/index.tsx @@ -41,11 +41,11 @@ const supplierExitManage: React.FC = () => { // 可传查询条件 form.getFieldsValue() const values = form.getFieldsValue(); - const { exitTheme, time, deptId, approveStatus } = 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 getPage({ pageNo, pageSize, exitTheme, deptId, approveStatus, startTime, endTime }); + const { code, data } = await getPage({ pageNo, pageSize, ...values, startTime, endTime }); if (code === 200) { setData(data.records); setPagination(prev => ({ ...prev, current: pageNo, pageSize, total: data.total })); @@ -73,7 +73,7 @@ const supplierExitManage: React.FC = () => { setCreateVisible(true) }; const handleSelectOk = () => { - getList(); + getList(1, pagination.pageSize); setCreateVisible(false); }; useEffect(() => {