-
- {{ $t('common.addBtn') }}
+
+ {{ $t("common.addBtn") }}
- {{ $t('common.importBtn') }}
+ {{ $t("common.importBtn") }}
- {{ $t('common.expandBtn') }}
+ {{ $t("common.expandBtn") }}
diff --git a/src/views/admin/system/menu/index.vue b/src/views/admin/system/menu/index.vue
index f35e42c..96ae119 100644
--- a/src/views/admin/system/menu/index.vue
+++ b/src/views/admin/system/menu/index.vue
@@ -139,6 +139,7 @@ const menuDialogRef = ref()
const showSearch = ref(true)
const queryRef = ref()
const state: BasicTableProps = reactive({
+ createdIsNeed: false,
pageList: pageList, // H
queryForm: {
parentId: -1,
@@ -149,6 +150,10 @@ const state: BasicTableProps = reactive({
const { getDataList, tableStyle } = useTable(state)
+onMounted(async () => {
+ getDataList()
+})
+
// 根据类型判断是否有子节点
const setHasChildren = (arr: any[]) => {
arr.forEach((item) => {
@@ -201,7 +206,9 @@ const load = (row: any, treeNode: unknown, resolve: (date: any[]) => void) => {
if (Array.isArray(childrenList)) {
setHasChildren(childrenList)
}
- resolve(childrenList)
+ if (childrenList && childrenList.length) {
+ resolve(childrenList)
+ }
})
}
@@ -222,3 +229,11 @@ const handleDelete = async (row: any) => {
}
}
+
+
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index e7e77b0..cbefbcc 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -140,6 +140,9 @@ const multiple = ref(true)
// 表格变量
const state: BasicTableProps = reactive({
queryForm: {},
+ pagination: {
+ pageSizes: [10, 20, 50, 100, 200, 500, 1000, 2000],
+ },
pageList: walletRechargeImportApi.pageJoin,
})
@@ -155,7 +158,7 @@ const handleDelete = async (ids: string[]) => {
return
}
try {
- await walletRechargeApplyApi.delObjs(ids)
+ // await walletRechargeApplyApi.delObjs(ids)
getDataList()
useMessage().success("删除成功")
} catch (err: any) {