Merge branch 'dev'

This commit is contained in:
zoujiandong 2023-11-21 11:28:02 +08:00
commit 9bb514e370

View File

@ -354,7 +354,7 @@ function useQueryData() {
pager.page=1; pager.page=1;
getSysUserInfo({ ...pager, ...queryForm }); getSysUserInfo({ ...pager, ...queryForm });
}; };
// //
const handleResetQuery = () => { const handleResetQuery = () => {
pager.page=1; pager.page=1;
@ -455,8 +455,7 @@ function useApiInfo() {
*/ */
const getSysUserInfo = async (params = {}) => { const getSysUserInfo = async (params = {}) => {
queryForm.dept_id=params.dept_id; queryForm.dept_id=params.dept_id;
console.log(params) const { data, code, message } = await getUser({...params,...pager});
const { data, code, message } = await getUser(params);
if ( code == 200 ) { if ( code == 200 ) {
tableData.value = data.data; tableData.value = data.data;
Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size }); Object.assign(pager, { total: data.total, page: data.page, page_size: data.page_size });