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/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<BasicTableProps>({
 	},
 	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")
 }
 
 // 是否可以多选
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 @@
 									<select-user v-model="state.queryForm.userId" />
 								</el-form-item>
 							</el-col>
+							<el-col :span="4">
+								<el-form-item class="w100" label="充值方式" prop="bizType">
+									<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
+								</el-form-item>
+							</el-col>
+							<el-col :span="4">
+								<el-form-item class="w100" label="充值类型" prop="type">
+									<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
+								</el-form-item>
+							</el-col>
 							<el-col :span="6">
 								<el-form-item class="w100" label="充值时间" prop="createTimeList">
 									<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
@@ -83,7 +93,7 @@
 						</el-table-column>
 						<el-table-column prop="price" width="200" align="center" label="充值金额">
 							<template #default="{ row }">
-								<div class="color-success">{{ displayPrice(row.price) }}</div>
+								<div :class="{ 'color-success': row.price > 0 }">{{ displayPrice(row.price) }}</div>
 							</template>
 						</el-table-column>
 						<el-table-column prop="balance" width="200" align="center" label="饭卡余额">
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 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-				<el-row :gutter="24">
-					<el-col :span="4">
-						<el-form-item class="w100" label="用户" prop="userIds">
-							<select-user v-model="state.queryForm.userIds" placeholder="用户" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="w100" label="用户部门" prop="userDeptId">
-							<select-dept v-model="state.queryForm.userDeptId" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="w100" label="审核状态" prop="processStatus">
-							<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item class="w100" label="审核时间" prop="processTimeList">
-							<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="8">
-						<el-form-item>
-							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
-							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
-						</el-form-item>
-					</el-col>
-				</el-row>
-			</el-form>
-			<el-row>
-				<div class="mb8" style="width: 100%">
-					<right-toolbar
-						v-model:showSearch="showSearch"
-						:export="'wallet_walletRechargeApply_export'"
-						@exportExcel="exportExcel"
-						class="ml10 mr20"
-						style="float: right"
-						@queryTable="getDataList"
-					></right-toolbar>
-				</div>
-			</el-row>
-			<el-table
-				:data="state.dataList"
-				v-loading="state.loading"
-				border
-				:cell-style="tableStyle.cellStyle"
-				:header-cell-style="tableStyle.headerCellStyle"
-				:summary-method="getSummaries"
-				show-summary
-				@selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle"
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:show-expand="true"
+				@getSelectNode="handleGetSelectNode"
+				switch-inactive-text="当前部门"
+				switch-active-text="当前部门及子部门"
+				:defaultTreeWidth="20"
 			>
-				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="80" />
-				<el-table-column width="200" label="用户">
-					<template #default="{ row }">
-						<div class="flex flex-row items-center justify-center">
-							<preview-image width="50px" height="50px" :src="row.userAvatar" />
-							<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
-								<span> {{ row.username }} </span>
-								<span> {{ row.userMobile }} </span>
-								<span> {{ row.userDeptName }} </span>
-							</div>
+				<template #default>
+					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+						<el-row :gutter="24">
+							<el-col :span="4">
+								<el-form-item class="w100" label="用户" prop="userId">
+									<select-user v-model="state.queryForm.userId" placeholder="用户" />
+								</el-form-item>
+							</el-col>
+							<el-col :span="4">
+								<el-form-item class="w100" label="充值类型" prop="bizType">
+									<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" />
+								</el-form-item>
+							</el-col>
+							<el-col :span="4">
+								<el-form-item class="w100" label="审核状态" prop="processStatus">
+									<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
+								</el-form-item>
+							</el-col>
+							<el-col :span="4">
+								<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
+									<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+								</el-form-item>
+							</el-col>
+							<el-col :span="8">
+								<el-form-item class="w100" label="审核时间" prop="processTimeList">
+									<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+								</el-form-item>
+							</el-col>
+							<el-col :span="8">
+								<el-form-item>
+									<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+									<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+					<el-row>
+						<div class="mb8" style="width: 100%">
+							<right-toolbar
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletRechargeApply_export'"
+								@exportExcel="exportExcel"
+								class="ml10 mr20"
+								style="float: right"
+								@queryTable="getDataList"
+							></right-toolbar>
 						</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="importTime" label="充值月" />
-				<el-table-column prop="bizType" label="充值类型">
-					<template #default="{ row }">
-						<dict-tag :options="wallet_biz_recharge" :value="row.bizType" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="walletTypeId" widht="150" label="饭卡类型">
-					<template #default="{ row }">
-						<div class="flex items-center justify-center">
-							<div class="color-primary">{{ row.walletTypeName }}</div>
-							<div class="flex items-center just ml5">
-								<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
-							</div>
-						</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="processStatus" label="审核状态">
-					<template #default="{ row }">
-						<dict-tag :options="check_status" :value="row.processStatus" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="processTime" label="审核时间" align="center" />
-				<el-table-column prop="beforePrice" label="操作前的金额" align="center">
-					<template #default="{ row }">
-						<div class="color-primary">{{ displayPrice(row.beforePrice) }}</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="price" label="操作金额" align="center">
-					<template #default="{ row }">
-						<div class="color-success">{{ displayPrice(row.price) }}</div>
-					</template>
-				</el-table-column>
-				<el-table-column v-auths="['wallet_walletRechargeImport_recover']" label="操作" width="200">
-					<template #default="{ row }">
-						<el-button v-auth="'wallet_walletRechargeImport_recover'" icon="RefreshRight" text type="primary" @click="handleRecover(row.id)"
-							>恢复</el-button
-						>
-					</template>
-				</el-table-column>
-			</el-table>
-			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+					</el-row>
+					<el-table
+						:data="state.dataList"
+						v-loading="state.loading"
+						border
+						:cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle"
+						:summary-method="getSummaries"
+						show-summary
+						@selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle"
+					>
+						<el-table-column type="selection" width="40" align="center" />
+						<el-table-column type="index" label="#" width="80" />
+						<el-table-column width="200" label="用户">
+							<template #default="{ row }">
+								<div class="flex flex-row items-center justify-center">
+									<preview-image width="50px" height="50px" :src="row.userAvatar" />
+									<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+										<span> {{ row.username }} </span>
+										<span> {{ row.userMobile }} </span>
+										<span> {{ row.userDeptName }} </span>
+									</div>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column prop="importTime" label="充值月" />
+						<el-table-column prop="bizType" label="充值类型">
+							<template #default="{ row }">
+								<dict-tag :options="wallet_biz_recharge" :value="row.bizType" />
+							</template>
+						</el-table-column>
+						<el-table-column prop="walletTypeId" width="200" label="饭卡类型">
+							<template #default="{ row }">
+								<div class="flex items-center justify-center">
+									<div class="color-primary">{{ row.walletTypeName }}</div>
+									<div class="flex items-center just ml5">
+										<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+									</div>
+								</div>
+							</template>
+						</el-table-column>
+						<el-table-column prop="processStatus" label="审核状态">
+							<template #default="{ row }">
+								<dict-tag :options="check_status" :value="row.processStatus" />
+							</template>
+						</el-table-column>
+						<el-table-column prop="processTime" label="审核时间" align="center" />
+						<el-table-column prop="beforePrice" label="操作前的金额" align="center">
+							<template #default="{ row }">
+								<div class="color-primary">{{ displayPrice(row.beforePrice) }}</div>
+							</template>
+						</el-table-column>
+						<el-table-column prop="price" label="操作金额" align="center">
+							<template #default="{ row }">
+								<div class="color-success">{{ displayPrice(row.price) }}</div>
+							</template>
+						</el-table-column>
+						<el-table-column v-auths="['wallet_walletRechargeImport_recover']" label="操作" width="200">
+							<template #default="{ row }">
+								<el-button
+									v-auth="'wallet_walletRechargeImport_recover'"
+									icon="RefreshRight"
+									text
+									type="primary"
+									@click="handleRecover(row.id)"
+									>恢复</el-button
+								>
+							</template>
+						</el-table-column>
+					</el-table>
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
 		</div>
 	</div>
 </template>
@@ -131,6 +148,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const draggableDepTreeRef = ref()
 // 表格变量
 const state: BasicTableProps = reactive<BasicTableProps>({
 	pagination: {
@@ -141,7 +159,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  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()
 }
 </script>