From b219cc8c28f60a6d1b1713efe69902d87d427123 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 21 Feb 2025 15:44:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wallet/wallet-recharge-import.ts | 10 +- src/views/wallet/wallet-cz/index.vue | 12 +- .../wallet/wallet-recharge-water/index.vue | 255 ++++++++++-------- 3 files changed, 160 insertions(+), 117 deletions(-) diff --git a/src/api/wallet/wallet-recharge-import.ts b/src/api/wallet/wallet-recharge-import.ts index 3d59f07..a2c56c2 100644 --- a/src/api/wallet/wallet-recharge-import.ts +++ b/src/api/wallet/wallet-recharge-import.ts @@ -1,10 +1,14 @@ import request from "/@/utils/request" -export function pageJoin(query?: Object) { +export function pageJoin(query: any) { return request({ url: "/wallet/wallet-recharge-import/page-join", - method: "get", - params: query, + method: "post", + params: { + current: query.current, + size: query.size, + }, + data: query, }) } diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue index e815281..489447d 100644 --- a/src/views/wallet/wallet-cz/index.vue +++ b/src/views/wallet/wallet-cz/index.vue @@ -18,6 +18,16 @@ + + + + + + + + + + @@ -83,7 +93,7 @@ diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue index 206ebe1..a3124de 100644 --- a/src/views/wallet/wallet-recharge-water/index.vue +++ b/src/views/wallet/wallet-recharge-water/index.vue @@ -1,119 +1,136 @@ @@ -131,6 +148,7 @@ const showSearch = ref(true) // 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) +const draggableDepTreeRef = ref() // 表格变量 const state: BasicTableProps = reactive({ pagination: { @@ -141,7 +159,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state) // 恢复操作 const handleRecover = async (id: string) => { @@ -173,7 +191,7 @@ const getSummaries = (param: any) => { // 导出excel const exportExcel = () => { - downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx") + postDownBlobFile("/wallet/wallet-recharge-import/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx") } // 多选事件 @@ -188,6 +206,17 @@ const resetQuery = () => { queryRef.value?.resetFields() // 清空多选 selectObjs.value = [] + state.queryForm.userDeptId = "" + state.queryForm.userDeptIds = [] + draggableDepTreeRef.value.resetData() + getDataList() +} + +// 树节点选择时 +const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => { + state.queryForm.userDeptId = curClickedNode.id + state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id) + state.queryForm.isDeepDept = isDeepTree getDataList() } From a7ea3cdf83bb63751efc2550ba9ddf3e0174e5ea Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 21 Feb 2025 15:58:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BA=BA=E5=91=98=E5=AF=BC=E5=87=BAbu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/system/user/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 1b55600..ed8baba 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -222,7 +222,7 @@ const state: BasicTableProps = reactive({ }, pageList: pageList, }) -const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, postDownBlobFile, tableStyle } = useTable(state) // 清空搜索条件 const resetQuery = () => { @@ -243,7 +243,7 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT // 导出excel const exportExcel = () => { - downBlobFile("/admin/user/export", Object.assign(state.queryForm, { ids: selectObjs }), "users.xlsx") + postDownBlobFile("/admin/user/export", Object.assign(state.queryForm, { ids: selectObjs }), "users.xlsx") } // 是否可以多选