diff --git a/src/hooks/table.ts b/src/hooks/table.ts index 3ee39e80..d840c735 100644 --- a/src/hooks/table.ts +++ b/src/hooks/table.ts @@ -138,8 +138,10 @@ export function useTable(options?: BasicTableProps) { query(); } - const getDataList = () => { - state.pagination!.current = 1 + const getDataList = (refresh: boolean = true) => { + if(refresh){ + state.pagination!.current = 1 + } query() } diff --git a/src/views/admin/client/index.vue b/src/views/admin/client/index.vue index 36abe021..ff01f91b 100644 --- a/src/views/admin/client/index.vue +++ b/src/views/admin/client/index.vue @@ -2,7 +2,7 @@
- + diff --git a/src/views/admin/dept/form.vue b/src/views/admin/dept/form.vue index c3c865e9..b0e48670 100644 --- a/src/views/admin/dept/form.vue +++ b/src/views/admin/dept/form.vue @@ -7,8 +7,7 @@ + :render-after-expand="false" :placeholder="$t('sysdept.inputparentIdTip')"/> diff --git a/src/views/admin/dept/index.vue b/src/views/admin/dept/index.vue index 757908d4..01e7dc46 100644 --- a/src/views/admin/dept/index.vue +++ b/src/views/admin/dept/index.vue @@ -2,21 +2,27 @@
- - - {{ $t('common.queryBtn') }} - - - {{ $t('common.addBtn') }} - - - {{ $t('common.importBtn') }} - - - {{ $t('common.exportBtn') }} - + + + + + + + {{ $t('common.queryBtn') }} + + + {{ $t('common.addBtn') }} + + + {{ $t('common.importBtn') }} + + + {{ $t('common.exportBtn') }} + + +
diff --git a/src/views/admin/dict/index.vue b/src/views/admin/dict/index.vue index 061758cc..17c01db4 100644 --- a/src/views/admin/dict/index.vue +++ b/src/views/admin/dict/index.vue @@ -2,7 +2,7 @@
- + diff --git a/src/views/admin/file/index.vue b/src/views/admin/file/index.vue index 651cd9aa..b4b06d05 100644 --- a/src/views/admin/file/index.vue +++ b/src/views/admin/file/index.vue @@ -2,7 +2,7 @@
- + diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue index 52a71c5f..08825626 100644 --- a/src/views/admin/log/index.vue +++ b/src/views/admin/log/index.vue @@ -16,7 +16,7 @@ :end-placeholder="$t('syslog.inputEndPlaceholderTip')"/> - {{ $t('common.queryBtn') }} + {{ $t('common.queryBtn') }} {{ $t('common.resetBtn') }} diff --git a/src/views/admin/menu/form.vue b/src/views/admin/menu/form.vue index 41e3556b..4b216926 100644 --- a/src/views/admin/menu/form.vue +++ b/src/views/admin/menu/form.vue @@ -13,7 +13,7 @@ - @@ -115,7 +115,9 @@ const state = reactive({ // 从后端获取菜单信息 const getMenuData = () => { state.parentData = [] - pageList().then(res => { + pageList({ + type: '0' + }).then(res => { let menu = { createBy: "", createTime: "", diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue index 9be93c3d..5702969a 100644 --- a/src/views/admin/menu/index.vue +++ b/src/views/admin/menu/index.vue @@ -2,14 +2,20 @@
- - - {{ $t('common.queryBtn') }} - - - {{ $t('common.addBtn') }} - + + + + + + + {{ $t('common.queryBtn') }} + + + {{ $t('common.addBtn') }} + + +
diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue index d84875f4..7f5ddf13 100644 --- a/src/views/admin/role/index.vue +++ b/src/views/admin/role/index.vue @@ -2,7 +2,7 @@
- + @@ -173,4 +173,4 @@ const handleDelete = (ids: string[]) => { }) }; - \ No newline at end of file + diff --git a/src/views/admin/user/index.vue b/src/views/admin/user/index.vue index 398865ef..a0072bba 100644 --- a/src/views/admin/user/index.vue +++ b/src/views/admin/user/index.vue @@ -10,14 +10,14 @@ - + + style="width: 240px" /> + style="width: 240px" /> {{ $t('common.queryBtn') }} @@ -100,7 +100,7 @@ - + @@ -196,11 +196,11 @@ const handleDelete = (ids: string[]) => { useMessageBox().confirm(t('common.delConfirmText')) .then(() => { delObj(ids).then(() => { - getDataList(); + getDataList(false); useMessage().success(t('common.delSuccessText')); }).catch((err: any) => { useMessage().error(err.msg) }) }) }; - \ No newline at end of file + diff --git a/src/views/gen/table/preview.vue b/src/views/gen/table/preview.vue index 0978a9d8..93ab55e4 100644 --- a/src/views/gen/table/preview.vue +++ b/src/views/gen/table/preview.vue @@ -2,7 +2,7 @@ - + @@ -24,6 +24,7 @@