zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
weiwei committed 2025-02-21 14:50:41 +08:00
2 parents 8fb6c10873 1b843c1146
commit 28b3d645ad
8 files changed
+68 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env.development
+4 -4
View File
@@ -8,18 +8,18 @@ VITE_OPEN = true
ENV = 'development' ENV = 'development'
# ADMIN 服务地址 # ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
# VITE_ADMIN_PROXY_PATH = http://localhost:9999/ # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
# VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地 VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地
# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境
# 图片访问基础地址 # 图片访问基础地址
VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
# VITE_IMAGE_BASE_PATH = http://localhost:9999 # VITE_IMAGE_BASE_PATH = http://localhost:9999
# VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地 VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地
# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
# 代码生成服务地址 # 代码生成服务地址
src/api/admin/user.ts
+1 -1
View File
@@ -3,7 +3,7 @@ import request from "/@/utils/request"
export const list = () => { export const list = () => {
return request({ return request({
url: "/admin/user/list", url: "/admin/user/list",
method: "get", method: "post",
}) })
} }
src/api/wallet/wallet-manage.ts
+22 -19
View File
@@ -2,48 +2,51 @@ import request from "/@/utils/request"
export function fetchList(query?: Object) { export function fetchList(query?: Object) {
return request({ return request({
url: '/wallet/wallet-manage/page', url: "/wallet/wallet-manage/page",
method: 'get', method: "get",
params: query params: query,
}) })
} }
export function fetchListJoin(query?: Object) { export function fetchListJoin(query: any) {
return request({ return request({
url: '/wallet/wallet-manage/page-join', url: "/wallet/wallet-manage/page-join",
method: 'get', method: "post",
params: query params: {
current: query.current,
size: query.size,
},
data: query,
}) })
} }
export function addObj(obj?: Object) { export function addObj(obj?: Object) {
return request({ return request({
url: '/wallet/wallet-manage', url: "/wallet/wallet-manage",
method: 'post', method: "post",
data: obj data: obj,
}) })
} }
export function getObj(id?: string) { export function getObj(id?: string) {
return request({ return request({
url: '/wallet/wallet-manage/' + id, url: "/wallet/wallet-manage/" + id,
method: 'get' method: "get",
}) })
} }
export function delObjs(ids?: Object) { export function delObjs(ids?: Object) {
return request({ return request({
url: '/wallet/wallet-manage', url: "/wallet/wallet-manage",
method: 'delete', method: "delete",
data: ids data: ids,
}) })
} }
export function putObj(obj?: Object) { export function putObj(obj?: Object) {
return request({ return request({
url: '/wallet/wallet-manage', url: "/wallet/wallet-manage",
method: 'put', method: "put",
data: obj data: obj,
}) })
} }
src/views/admin/system/user/index.vue
+3 -3
View File
@@ -13,9 +13,9 @@
<template #default> <template #default>
<el-row v-show="showSearch"> <el-row v-show="showSearch">
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-form-item label="用户" prop="userIds"> <el-form-item label="用户" prop="userId">
<div style="width: 180px"> <div style="width: 180px">
<select-user v-model="state.queryForm.userIds" clearable /> <select-user v-model="state.queryForm.userId" clearable />
</div> </div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('sysuser.username')" prop="username"> <el-form-item :label="$t('sysuser.username')" prop="username">
@@ -116,7 +116,7 @@
<el-table-column <el-table-column
v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']" v-auths="['sys_user_edit', 'userFace_sysUserFace_view', 'sys_user_del']"
:label="$t('common.action')" :label="$t('common.action')"
width="200" width="300"
fixed="right" fixed="right"
> >
<template #default="scope"> <template #default="scope">
src/views/wallet/wallet-cz/index.vue
+4 -4
View File
@@ -14,13 +14,13 @@
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="4"> <el-col :span="4">
<el-form-item class="w100" label="用户" prop="userIds"> <el-form-item class="w100" label="用户" prop="userId">
<select-user v-model="state.queryForm.userIds" /> <select-user v-model="state.queryForm.userId" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="w100" label="充值时间" prop="payTimeList"> <el-form-item class="w100" label="充值时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" /> <el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item> <el-form-item>
src/views/wallet/wallet-manage/index.vue
+26 -3
View File
@@ -1,6 +1,16 @@
<template> <template>
<div class="layout-padding"> <div class="layout-padding">
<div class="layout-padding-auto layout-padding-view"> <div class="layout-padding-auto layout-padding-view">
<DraggableDepTree
ref="draggableDepTreeRef"
placeholder="请输入部门名称"
:show-expand="true"
@getSelectNode="handleGetSelectNode"
switch-inactive-text="当前部门"
switch-active-text="当前部门及子部门"
:defaultTreeWidth="20"
>
<template #default>
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="4"> <el-col :span="4">
@@ -122,6 +132,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" /> <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
</template>
</DraggableDepTree>
</div> </div>
<transaction-list ref="formDialogRef" @refresh="getDataList(false)" /> <transaction-list ref="formDialogRef" @refresh="getDataList(false)" />
<change-balance ref="changeBalanceRef" @refresh="getDataList(false)" /> <change-balance ref="changeBalanceRef" @refresh="getDataList(false)" />
@@ -143,6 +155,7 @@ const { wallet_type, yes_no_type } = useDict("wallet_type", "yes_no_type")
// 定义变量内容 // 定义变量内容
const formDialogRef = ref() const formDialogRef = ref()
const changeBalanceRef = ref() const changeBalanceRef = ref()
const draggableDepTreeRef = ref()
// 搜索变量 // 搜索变量
const queryRef = ref() const queryRef = ref()
const showSearch = ref(true) const showSearch = ref(true)
@@ -156,8 +169,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
}) })
// table hook // table hook
const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
useTable(state)
// 清空搜索条件 // 清空搜索条件
const resetQuery = () => { const resetQuery = () => {
@@ -165,12 +177,15 @@ const resetQuery = () => {
queryRef.value?.resetFields() queryRef.value?.resetFields()
// 清空多选 // 清空多选
selectObjs.value = [] selectObjs.value = []
state.queryForm.deptId = ""
state.queryForm.deptIds = []
draggableDepTreeRef.value.resetData()
getDataList() getDataList()
} }
// 导出excel // 导出excel
const exportExcel = () => { const exportExcel = () => {
downBlobFile( postDownBlobFile(
"/wallet/wallet-manage/export", "/wallet/wallet-manage/export",
Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }), Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
"walletManage.xlsx", "walletManage.xlsx",
@@ -199,6 +214,14 @@ const selectionChangHandle = (objs: { id: string }[]) => {
multiple.value = !objs.length multiple.value = !objs.length
} }
// 树节点选择时
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
getDataList()
}
// 删除操作 // 删除操作
const handleDelete = async (ids: string[]) => { const handleDelete = async (ids: string[]) => {
try { try {
src/views/wallet/wallet-tk/index.vue
+4 -4
View File
@@ -14,13 +14,13 @@
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="4"> <el-col :span="4">
<el-form-item class="w100" label="用户" prop="userIds"> <el-form-item class="w100" label="用户" prop="userId">
<select-user v-model="state.queryForm.userIds" /> <select-user v-model="state.queryForm.userId" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="w100" label="退款时间" prop="payTimeList"> <el-form-item class="w100" label="退款时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" /> <el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item> <el-form-item>
src/views/wallet/wallet-xf/index.vue
+4 -4
View File
@@ -14,13 +14,13 @@
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList"> <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="4"> <el-col :span="4">
<el-form-item class="w100" label="用户" prop="userIds"> <el-form-item class="w100" label="用户" prop="userId">
<select-user v-model="state.queryForm.userIds" /> <select-user v-model="state.queryForm.userId" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="w100" label="消费时间" prop="payTimeList"> <el-form-item class="w100" label="消费时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" /> <el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-form-item> <el-form-item>