diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue index daa2ce21..5cc1f2b2 100644 --- a/src/components/common/BaseTable.vue +++ b/src/components/common/BaseTable.vue @@ -29,6 +29,10 @@ const props = defineProps({ type: String, default: "" }, + pageKey: { + type: String, + default: "pageNo" + }, params: { type: Object, default: () => ({}) @@ -45,7 +49,7 @@ const props = defineProps({ const emit = defineEmits(["update:params", "update:selectedRowKeys", "update:selectedRows"]); const rowSelectKeys = ref([]); const selectsData = ref([]); -const params = useResetRef({ pageNo: 1, pageSize: 10 }); +const params = useResetRef({ [props.pageKey]: 1, pageSize: 10 }); const postParam = computed(() => ({ ...params.value, ...props.params })); const { data, loading, total, fetch: onFetch } = props.request(props.url, postParam); @@ -89,12 +93,12 @@ function onSelectChange(e, l) { const pagination = computed(() => ({ total: total.value, showSizeChanger: false, - current: params.value.pageNo, + current: params.value[props.pageKey], pageSize: params.value.pageSize, onChange: changePagination, })); const changePagination = (e) => { - params.value.pageNo = e; + params.value[props.pageKey] = e; onFetch(); }; diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 9627133e..1cfa5643 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -75,7 +75,7 @@ margin: 0px 4px 120px 10px; border: 1px solid #f0f0f0; "> -