From 176aa00b8f6f83911be052ee898e3e7970855397 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 27 Feb 2025 20:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=91=E7=BB=84=E4=BB=B6=E5=B0=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/index.vue         |   7 +-
 src/views/hard/hard-invoice/index.vue         |   7 +-
 src/views/wallet/wallet-manage/index.vue      |   7 +-
 src/views/wallet/wallet-qb/change-balance.vue | 162 ------------------
 src/views/wallet/wallet-qb/index.vue          |  37 +---
 .../wallet/wallet-recharge-water/index.vue    |   7 +-
 6 files changed, 21 insertions(+), 206 deletions(-)
 delete mode 100644 src/views/wallet/wallet-qb/change-balance.vue

diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index ed8baba..09f101c 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -6,9 +6,10 @@
 				placeholder="请输入部门名称"
 				:show-expand="true"
 				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="当前部门"
-				switch-active-text="当前部门及子部门"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
 				:defaultTreeWidth="20"
+				:nodeClickable="false"
 			>
 				<template #default>
 					<el-row v-show="showSearch">
@@ -237,7 +238,7 @@ const resetQuery = () => {
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: boolean) => {
 	state.queryForm.deptId = curClickedNode.id
 	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
-	state.queryForm.isDeepDept = isDeepTree
+	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }
 
diff --git a/src/views/hard/hard-invoice/index.vue b/src/views/hard/hard-invoice/index.vue
index 7bbef35..c030785 100644
--- a/src/views/hard/hard-invoice/index.vue
+++ b/src/views/hard/hard-invoice/index.vue
@@ -6,9 +6,10 @@
 				placeholder="请输入部门名称"
 				:show-expand="true"
 				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="当前部门"
-				switch-active-text="当前部门及子部门"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
 				:defaultTreeWidth="20"
+				:nodeClickable="false"
 			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
@@ -206,7 +207,7 @@ const handleDelete = async (ids: string[]) => {
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
 	state.queryForm.deptId = curClickedNode.id
 	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
-	state.queryForm.isDeepDept = isDeepTree
+	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }
 </script>
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index ddc325a..3788a88 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -6,9 +6,10 @@
 				placeholder="请输入部门名称"
 				:show-expand="true"
 				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="当前部门"
-				switch-active-text="当前部门及子部门"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
 				:defaultTreeWidth="20"
+				:nodeClickable="false"
 			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
@@ -218,7 +219,7 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
 	state.queryForm.deptId = curClickedNode.id
 	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
-	state.queryForm.isDeepDept = isDeepTree
+	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }
 
diff --git a/src/views/wallet/wallet-qb/change-balance.vue b/src/views/wallet/wallet-qb/change-balance.vue
deleted file mode 100644
index 12fef1a..0000000
--- a/src/views/wallet/wallet-qb/change-balance.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-	<el-dialog title="修改余额" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
-			<el-row :gutter="24">
-				<el-col :span="24" class="mb20">
-					<el-form-item label="用户编号" prop="id">
-						<el-input v-model="form.id" placeholder="" disabled />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="用户昵称" prop="nickname">
-						<el-input v-model="form.nickname" placeholder="" disabled />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="变动前余额(元)" prop="balance">
-						<el-input v-model="form.balance" placeholder="" disabled />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="变动类型" prop="changeType">
-						<el-radio-group v-model="form.changeType">
-							<el-radio :label="1">充值</el-radio>
-							<el-radio :label="-1">减少</el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="变动余额(元)" prop="changeBalance">
-						<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1" class="!w-240px" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="变动后余额(元)" prop="balanceResult">
-						<el-input v-model="balanceResult" placeholder="" disabled />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<template #footer>
-			<span class="dialog-footer">
-				<el-button @click="visible = false">取消</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-			</span>
-		</template>
-	</el-dialog>
-</template>
-
-<script setup lang="ts" name="WalletManageDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import * as walletApi from "/@/api/wallet/wallet-manage"
-import * as walletTransactionApi from "/@/api/wallet/wallet-transaction"
-import * as AdminUserApi from "/@/api/admin/user"
-import { rule } from "/@/utils/validate"
-import { displayPrice } from "/@/utils/formatMoney"
-import { convertToInteger } from "/@/utils/convert"
-const emit = defineEmits(["refresh"])
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-// 定义字典
-
-// 提交表单数据
-const form = reactive<any>({
-	id: undefined,
-	walletId: undefined,
-	nickname: undefined,
-	balance: "0",
-	changeBalance: 0,
-	changeType: 1,
-})
-
-/** 变动后的余额 */
-const balanceResult = computed(() =>
-	displayPrice(convertToInteger(form.balance) + convertToInteger(form.changeBalance) * form.changeType),
-)
-
-// 定义校验规则
-const dataRules = ref({
-	changeBalance: [{ required: true, message: "变动余额不能为空", trigger: "blur" }],
-})
-
-// 打开弹窗
-const openDialog = (userId: string, id: string) => {
-	visible.value = true
-	form.id = ""
-	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
-	// 获取walletManage信息
-	if (id) {
-		form.id = id
-		getwalletManageData(userId, id)
-	}
-}
-
-// 提交
-const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
-	if (!valid) return false
-	if (form.changeBalance <= 0) {
-		useMessage().error("变动余额不能为零")
-		return
-	}
-	if (convertToInteger(balanceResult.value) < 0) {
-		useMessage().error("变动后的余额不能小于 0")
-		return
-	}
-	try {
-		loading.value = true
-		const pa = {
-			...form,
-			userId: form.id,
-			walletId: form.walletId,
-			balance: form.changeBalance * 100,
-		}
-		if (pa.changeType == -1) {
-			pa.balance = -1 * pa.balance
-		}
-		await walletTransactionApi.updateBalance(pa)
-		useMessage().success("操作成功")
-		visible.value = false
-		emit("refresh")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 初始化表单数据
-const getwalletManageData = async (userId: string, id: string) => {
-	// 获取数据
-	loading.value = true
-	try {
-		const { data: user } = await AdminUserApi.getObj(userId)
-		const { data: wallet } = await walletApi.getObj(id)
-		form.id = user.userId
-		form.walletId = wallet.id
-		form.nickname = user.nickname
-		form.balance = displayPrice(wallet.balance, "")
-		form.changeType = 1
-		form.changeBalance = 0
-	} finally {
-		loading.value = false
-	}
-}
-
-// 暴露变量
-defineExpose({
-	openDialog,
-})
-</script>
diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index ddc325a..8337fa5 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -6,9 +6,10 @@
 				placeholder="请输入部门名称"
 				:show-expand="true"
 				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="当前部门"
-				switch-active-text="当前部门及子部门"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
 				:defaultTreeWidth="20"
+				:nodeClickable="false"
 			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
@@ -110,51 +111,23 @@
 						</el-table-column>
 						<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 						<el-table-column prop="createTime" width="200" label="创建时间" />
-						<el-table-column label="操作" fixed="right" width="200">
-							<template #default="{ row }">
-								<el-button
-									icon="InfoFilled"
-									text
-									type="primary"
-									v-auth="'wallet_walletManage_edit'"
-									@click="formDialogRef.openDialog(row.id)"
-									>详情</el-button
-								>
-								<el-button
-									icon="Money"
-									text
-									type="primary"
-									v-auth="'wallet_walletTransaction_update_balance'"
-									@click="changeBalanceRef.openDialog(row.userId, row.id)"
-									>充值/扣款</el-button
-								>
-							</template>
-						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>
-		<transaction-list ref="formDialogRef" @refresh="getDataList(false)" />
-		<change-balance ref="changeBalanceRef" @refresh="getDataList(false)" />
 	</div>
 </template>
 
 <script setup lang="ts" name="systemWalletManage">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, fetchListJoin, delObjs } from "/@/api/wallet/wallet-manage"
+import { fetchListJoin, delObjs } from "/@/api/wallet/wallet-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 
-// 引入组件
-const TransactionList = defineAsyncComponent(() => import("../components/transaction-list.vue"))
-const ChangeBalance = defineAsyncComponent(() => import("./change-balance.vue"))
-// 定义查询字典
 const { wallet_type, yes_no_type } = useDict("wallet_type", "yes_no_type")
 // 定义变量内容
-const formDialogRef = ref()
-const changeBalanceRef = ref()
 const draggableDepTreeRef = ref()
 // 搜索变量
 const queryRef = ref()
@@ -218,7 +191,7 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
 	state.queryForm.deptId = curClickedNode.id
 	state.queryForm.deptIds = checkedTreeNodes.map((item: any) => item.id)
-	state.queryForm.isDeepDept = isDeepTree
+	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }
 
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index a3124de..cb0f7c8 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -6,9 +6,10 @@
 				placeholder="请输入部门名称"
 				:show-expand="true"
 				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="当前部门"
-				switch-active-text="当前部门及子部门"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
 				:defaultTreeWidth="20"
+				:nodeClickable="false"
 			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
@@ -216,7 +217,7 @@ const resetQuery = () => {
 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
+	state.queryForm.isInclude = !isDeepTree
 	getDataList()
 }
 </script>