Merge branch 'master' of http://gitea.zianxin.com/zianxin/biz-pc-cloud

src/components/DraggableDepTree/index.vue

@@ -211,7 +211,7 @@ defineExpose({
 })
 </script>
 
-<style lang="scss">
+<style>
 .splitpanes--vertical > .splitpanes__splitter {
 	background: var(--el-color-primary);
 	/* min-width: 2px; */

src/views/admin/system/user/index.vue

@@ -229,7 +229,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableS
 
 // 部门树使用的数据
 const deptData = reactive({
-	queryList: (name: String) => {
+	queryList: (name: string) => {
 		return deptTree({
 			deptName: name,
 		})

src/views/wallet/wallet-cz/index.vue

@@ -1,6 +1,19 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:query="deptData.queryList"
+				:show-expand="true"
+				@node-click="handleNodeClick"
+				@treeNodeCheckChange="treeNodeCheckChange"
+				@treeDeepSearch="treeDeepSearch"
+				switch-inactive-text="当前部门"
+				switch-active-text="当前部门及子部门"
+				:defaultTreeWidth="20"
+			>
+				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row :gutter="24">
 							<el-col :span="4">
@@ -84,18 +97,15 @@
 						<el-table-column prop="createTime" width="200" label="充值时间" />
 						<el-table-column v-if="false" label="操作" width="150">
 							<template #default="scope">
-						<el-button
+								<el-button icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'" @click="handleDelete([scope.row.id])"
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_walletRecharge_del'"
-							@click="handleDelete([scope.row.id])"
 									>删除</el-button
 								>
 							</template>
 						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
 		</div>
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
@@ -108,6 +118,7 @@ import { pageCz } from "/@/api/wallet/wallet-transaction"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
+import { deptTree } from "/@/api/admin/dept"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -121,6 +132,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -128,8 +140,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
-	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -137,6 +148,8 @@ const resetQuery = () => {
 	queryRef.value?.resetFields()
 	// 清空多选
 	selectObjs.value = []
+	state.queryForm.deptId = ""
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 
@@ -180,11 +193,38 @@ const handleDelete = async (ids: string[]) => {
 	}
 
 	try {
-		await delObjs(ids)``
+		await delObjs(ids)
 		getDataList()
 		useMessage().success("删除成功")
 	} catch (err: any) {
 		useMessage().error(err.msg)
 	}
 }
+
+// 部门树使用的数据
+const deptData = reactive({
+	queryList: (name: string) => {
+		return deptTree({
+			deptName: name,
+		})
+	},
+})
+
+// 点击树
+const handleNodeClick = (clickedNode: any) => {
+	state.queryForm.deptId = clickedNode.id
+	getDataList()
+}
+
+// 树节点勾选改变
+const treeNodeCheckChange = (checkedNodes: any) => {
+	state.queryForm.deptId = checkedNodes.map((item: any) => item.id)
+	getDataList()
+}
+
+// 是否深度搜索
+const treeDeepSearch = (isDeep: boolean) => {
+	state.queryForm.isDeepDept = isDeep
+	getDataList()
+}
 </script>

src/views/wallet/wallet-foreign/index.vue

@@ -1,6 +1,19 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:query="deptData.queryList"
+				:show-expand="true"
+				@node-click="handleNodeClick"
+				@treeNodeCheckChange="treeNodeCheckChange"
+				@treeDeepSearch="treeDeepSearch"
+				switch-inactive-text="当前部门"
+				switch-active-text="当前部门及子部门"
+				:defaultTreeWidth="20"
+			>
+				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row :gutter="24">
 							<el-col :span="4">
@@ -77,13 +90,7 @@
 						<el-table-column label="操作" width="200">
 							<template #default="{ row }">
 								<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
-						<el-button
+								<el-button v-if="row.processStatus == 2" icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
-							v-if="row.processStatus == 2"
-							icon="InfoFilled"
-							text
-							type="primary"
-							@click="codeUseTableRef.openDialog(row.id)"
-						>
 									使用情况
 								</el-button>
 								<el-button
@@ -100,6 +107,8 @@
 						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
 		</div>
 
 		<!-- 编辑、新增  -->
@@ -113,6 +122,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, pageJoin, delObjs } from "/@/api/wallet/wallet-foreign"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { deptTree } from "/@/api/admin/dept"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -128,6 +138,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
 
 const { push } = useRouter()
 
@@ -137,8 +148,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
-	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -146,6 +156,8 @@ const resetQuery = () => {
 	queryRef.value?.resetFields()
 	// 清空多选
 	selectObjs.value = []
+	state.queryForm.deptId = ""
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 
@@ -155,11 +167,7 @@ const doInfo = (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
+	downBlobFile("/wallet/walletForeign/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletForeign.xlsx")
-		"/wallet/walletForeign/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"walletForeign.xlsx",
-	)
 }
 
 // 多选事件
@@ -184,4 +192,31 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+// 部门树使用的数据
+const deptData = reactive({
+	queryList: (name: string) => {
+		return deptTree({
+			deptName: name,
+		})
+	},
+})
+
+// 点击树
+const handleNodeClick = (clickedNode: any) => {
+	state.queryForm.deptId = clickedNode.id
+	getDataList()
+}
+
+// 树节点勾选改变
+const treeNodeCheckChange = (checkedNodes: any) => {
+	state.queryForm.deptId = checkedNodes.map((item: any) => item.id)
+	getDataList()
+}
+
+// 是否深度搜索
+const treeDeepSearch = (isDeep: boolean) => {
+	state.queryForm.isDeepDept = isDeep
+	getDataList()
+}
 </script>

src/views/wallet/wallet-stride/index.vue

@@ -1,6 +1,19 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:query="deptData.queryList"
+				:show-expand="true"
+				@node-click="handleNodeClick"
+				@treeNodeCheckChange="treeNodeCheckChange"
+				@treeDeepSearch="treeDeepSearch"
+				switch-inactive-text="当前部门"
+				switch-active-text="当前部门及子部门"
+				:defaultTreeWidth="20"
+			>
+				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row :gutter="24">
 							<el-col :span="4">
@@ -78,29 +91,19 @@
 									@click="formDialogRef.openDialog(row.id)"
 									>编辑</el-button
 								>
-						<el-button
+								<el-button v-if="false" icon="delete" text type="primary" v-auth="'admin_walletStride_del'" @click="handleDelete([row.id])"
-							v-if="false"
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'admin_walletStride_del'"
-							@click="handleDelete([row.id])"
 									>删除</el-button
 								>
 								<el-button icon="Promotion" text type="primary" @click="doInfo(row)"> 查看审批 </el-button>
-						<el-button
+								<el-button v-if="row.processStatus == 2" icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
-							v-if="row.processStatus == 2"
-							icon="InfoFilled"
-							text
-							type="primary"
-							@click="codeUseTableRef.openDialog(row.id)"
-						>
 									使用情况
 								</el-button>
 							</template>
 						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
 		</div>
 
 		<!-- 编辑、新增  -->
@@ -114,6 +117,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import { fetchList, delObjs, pageJoin } from "/@/api/wallet/wallet-stride"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { deptTree } from "/@/api/admin/dept"
 
 const { push } = useRouter()
 
@@ -131,6 +135,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -138,8 +143,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
-	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -147,6 +151,8 @@ const resetQuery = () => {
 	queryRef.value?.resetFields()
 	// 清空多选
 	selectObjs.value = []
+	state.queryForm.deptId = ""
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 
@@ -181,4 +187,31 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+// 部门树使用的数据
+const deptData = reactive({
+	queryList: (name: string) => {
+		return deptTree({
+			deptName: name,
+		})
+	},
+})
+
+// 点击树
+const handleNodeClick = (clickedNode: any) => {
+	state.queryForm.deptId = clickedNode.id
+	getDataList()
+}
+
+// 树节点勾选改变
+const treeNodeCheckChange = (checkedNodes: any) => {
+	state.queryForm.deptId = checkedNodes.map((item: any) => item.id)
+	getDataList()
+}
+
+// 是否深度搜索
+const treeDeepSearch = (isDeep: boolean) => {
+	state.queryForm.isDeepDept = isDeep
+	getDataList()
+}
 </script>

src/views/wallet/wallet-tk/index.vue

@@ -1,6 +1,19 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:query="deptData.queryList"
+				:show-expand="true"
+				@node-click="handleNodeClick"
+				@treeNodeCheckChange="treeNodeCheckChange"
+				@treeDeepSearch="treeDeepSearch"
+				switch-inactive-text="当前部门"
+				switch-active-text="当前部门及子部门"
+				:defaultTreeWidth="20"
+			>
+				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row :gutter="24">
 							<el-col :span="4">
@@ -102,6 +115,8 @@
 						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
 		</div>
 
 		<!-- 编辑、新增  -->
@@ -116,6 +131,7 @@ import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import * as hardAfterSaleApi from "/@/api/hard/hard-after-sale"
 import { displayPrice } from "/@/utils/formatMoney"
+import { deptTree } from "/@/api/admin/dept"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -129,6 +145,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
 
 const { push } = useRouter()
 
@@ -138,8 +155,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
-	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -147,6 +163,8 @@ const resetQuery = () => {
 	queryRef.value?.resetFields()
 	// 清空多选
 	selectObjs.value = []
+	state.queryForm.deptId = ""
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 
@@ -205,4 +223,31 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+// 部门树使用的数据
+const deptData = reactive({
+	queryList: (name: string) => {
+		return deptTree({
+			deptName: name,
+		})
+	},
+})
+
+// 点击树
+const handleNodeClick = (clickedNode: any) => {
+	state.queryForm.deptId = clickedNode.id
+	getDataList()
+}
+
+// 树节点勾选改变
+const treeNodeCheckChange = (checkedNodes: any) => {
+	state.queryForm.deptId = checkedNodes.map((item: any) => item.id)
+	getDataList()
+}
+
+// 是否深度搜索
+const treeDeepSearch = (isDeep: boolean) => {
+	state.queryForm.isDeepDept = isDeep
+	getDataList()
+}
 </script>

src/views/wallet/wallet-xf/index.vue

@@ -1,6 +1,19 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:query="deptData.queryList"
+				:show-expand="true"
+				@node-click="handleNodeClick"
+				@treeNodeCheckChange="treeNodeCheckChange"
+				@treeDeepSearch="treeDeepSearch"
+				switch-inactive-text="当前部门"
+				switch-active-text="当前部门及子部门"
+				:defaultTreeWidth="20"
+			>
+				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row :gutter="24">
 							<el-col :span="4">
@@ -89,13 +102,21 @@
 									@click="formDialogRef.openDialog(row.id)"
 									>编辑</el-button
 								>
-						<el-button v-if="false" icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'" @click="handleDelete([row.id])"
+								<el-button
+									v-if="false"
+									icon="delete"
+									text
+									type="primary"
+									v-auth="'wallet_walletRecharge_del'"
+									@click="handleDelete([row.id])"
 									>删除</el-button
 								>
 							</template>
 						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+				</template>
+			</DraggableDepTree>
 		</div>
 
 		<!-- 编辑、新增  -->
@@ -109,6 +130,7 @@ import { pageXf } from "/@/api/wallet/wallet-transaction"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
+import { deptTree } from "/@/api/admin/dept"
 
 const { push } = useRouter()
 
@@ -124,6 +146,7 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const draggableDepTreeRef = ref() // 树组件ref引用
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -139,6 +162,8 @@ const resetQuery = () => {
 	queryRef.value?.resetFields()
 	// 清空多选
 	selectObjs.value = []
+	state.queryForm.deptId = ""
+	draggableDepTreeRef.value.resetData()
 	getDataList()
 }
 
@@ -193,4 +218,31 @@ const handleDelete = async (ids: string[]) => {
 		useMessage().error(err.msg)
 	}
 }
+
+// 部门树使用的数据
+const deptData = reactive({
+	queryList: (name: string) => {
+		return deptTree({
+			deptName: name,
+		})
+	},
+})
+
+// 点击树
+const handleNodeClick = (clickedNode: any) => {
+	state.queryForm.deptId = clickedNode.id
+	getDataList()
+}
+
+// 树节点勾选改变
+const treeNodeCheckChange = (checkedNodes: any) => {
+	state.queryForm.deptId = checkedNodes.map((item: any) => item.id)
+	getDataList()
+}
+
+// 是否深度搜索
+const treeDeepSearch = (isDeep: boolean) => {
+	state.queryForm.isDeepDept = isDeep
+	getDataList()
+}
 </script>