分页问题

This commit is contained in:
孙景学
2025-08-12 15:57:06 +08:00
parent 3b66c7ff87
commit fa0e41d1c7
9 changed files with 35 additions and 29 deletions

View File

@ -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);
}
},
});

View File

@ -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<Data> = [

View File

@ -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);
}
},
});

View File

@ -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);
}}
/>
{/* 库内供应商数量弹窗 */}

View File

@ -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);
}}
/>
{/* 库内供应商数量弹窗 */}

View File

@ -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);
}}
/>
{/* 新增品类库弹窗 */}

View File

@ -199,18 +199,18 @@ const SupplierChangeReviewManage: React.FC<Props> = ({ dispatch }) => {
fixed: 'right',
render: (_: any, record: any) => (
<>
<Button type="link" onClick={() => handleDetail(record)}>
<Button type="link" onClick={() => handleDetail(record)}>
</Button>
{/* 测试使用,需删除 */}
{ record.approveStatus === '0' && userId == '8' && (
<Button type="link" onClick={() => {
supplierChangeApprove({ id:record.id, approveStatus: '1' }).then(() => {
{record.approveStatus === '0' && userId == '8' && (
<Button type="link" onClick={() => {
supplierChangeApprove({ id: record.id, approveStatus: '1' }).then(() => {
handleReset()
})
}}>
</Button>
}}>
</Button>
)}
</>
@ -264,7 +264,13 @@ const SupplierChangeReviewManage: React.FC<Props> = ({ 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)' }}
/>

View File

@ -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(() => {

View File

@ -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(() => {