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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjf committed 2024-12-31 13:59:55 +08:00
2 parents ec438815ef fce1603a2e
commit 52349bc31f
12 files changed
+415 -126
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/api/admin/userFace.ts
+49
View File
@@ -0,0 +1,49 @@
import request from "/@/utils/request"
export function pageJoin(query?: Object) {
return request({
url: '/admin/user-face/page-join',
method: 'get',
params: query
})
}
export function fetchList(query?: Object) {
return request({
url: '/admin/user-face/page',
method: 'get',
params: query
})
}
export function addObj(obj?: Object) {
return request({
url: '/admin/user-face',
method: 'post',
data: obj
})
}
export function getObj(id?: string) {
return request({
url: '/admin/user-face/' + id,
method: 'get'
})
}
export function delObjs(ids?: Object) {
return request({
url: '/admin/user-face',
method: 'delete',
data: ids
})
}
export function putObj(obj?: Object) {
return request({
url: '/admin/user-face',
method: 'put',
data: obj
})
}
src/assets/styles/global.scss
View File
Whitespace-only changes.
src/components/Select/SelectUser.vue
+73
View File
@@ -0,0 +1,73 @@
<template>
<el-select style="width: 100%;" v-model="state.selectId" :placeholder="props.placeholder" clearable
remote-show-suffix filterable remote :remote-method="remoteSearch" :loading="state.loading"
@visible-change="(e: boolean) => e && getOptions()">
<el-option v-for="v in state.options" :key="v.userId" :label="`${v.name}-${v.phone}`" :value="v.userId">
<div class="flex items-center">
<div class="color-primary">{{ v.name }}</div>
<div class="pl5 color-success">{{ v.phone }}</div>
</div>
<template #loading>
<svg class="circular" viewBox="0 0 50 50">
<circle class="path" cx="25" cy="25" r="20" fill="none" />
</svg>
</template>
</el-option>
</el-select>
</template>
<script setup lang="ts" name="select-user">
import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
import * as userApi from '/@/api/admin/user'
const selectId = defineModel()
export type Props = {
placeholder?: string,
}
const props = withDefaults(defineProps<Props>(), {
placeholder: "请选择",
})
const queryForm = reactive<any>({
name: "",
current: 1,
size: 10,
})
const state = reactive<any>({
loading: true,
selectId: selectId,
options: []
})
watch(selectId, (newVal, oldValue) => {
if (newVal == oldValue) return
state.selectId = newVal
getOptions()
}, { immediate: true })
async function getOptions() {
try {
state.loading = true
const _pa = {
...queryForm
}
const { data } = await userApi.pageList(_pa)
state.options = data.records ?? []
} finally {
setTimeout(() => state.loading = false, 500);
}
}
function remoteSearch(params: string) {
queryForm.name = params
getOptions()
}
function clear() {
state.selectId = null
getOptions()
}
</script>
src/components/index.ts
+7 -2
View File
@@ -13,6 +13,10 @@ import TagList from '/@/components/TagList/index.vue';
import SvgIcon from '/@/components/SvgIcon/index.vue';
import PreviewImage from "/@/components/PreviewImage/index.vue"
// 业务组件
import SelectUser from '/@/components/Select/SelectUser.vue'
// 第三方组件
import ElementPlus from 'element-plus';
import * as ElementPlusIconsVue from '@element-plus/icons-vue';
@@ -34,7 +38,7 @@ import { App } from 'vue';
export default {
install(app: App) {
app.component('DictTag', DictTag);
app.component('DictSelect',DictSelect)
app.component('DictSelect', DictSelect)
app.component('Pagination', Pagination);
app.component('RightToolbar', RightToolbar);
app.component('uploadExcel', UploadExcel);
@@ -46,7 +50,8 @@ export default {
app.component('DelWrap', DelWrap);
app.component('TagList', TagList);
app.component('SvgIcon', SvgIcon);
app.component('PreviewImage',PreviewImage)
app.component('PreviewImage', PreviewImage)
app.component('SelectUser', SelectUser)
// 导入全部的elmenet-plus的图标
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
src/i18n/pages/form/zh-cn.ts
+1
View File
@@ -1,6 +1,7 @@
// 定义通用内容
export default {
common: {
confirmTitle: '警告',
queryBtn: '查询',
addBtn: '新 增',
editBtn: '修 改',
src/main.ts
+1
View File
@@ -7,6 +7,7 @@ import Components from '/@/components';
import { i18n } from '/@/i18n';
import { properties } from '/@/utils/globalProperties';
import { initAntiDebug } from '/@/utils/anti-debug';
import "/@/assets/styles/global.scss"
// Initialize anti-debug protection
initAntiDebug();
src/views/admin/system/user/face-manage.vue
+164
View File
@@ -0,0 +1,164 @@
<template>
<div class="system-user-dialog-container">
<el-dialog :close-on-click-modal="false" title="人脸管理" draggable v-model="dialogVisible">
<el-button icon="folder-add" type="primary" @click="addFace">
新增
</el-button>
<div class="h-4" />
<el-table v-loading="state.loading" :data="state.dataList" row-key="userId" border
:cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle">
<el-table-column prop="username" align="center" label="用户名" />
<el-table-column prop="date" align="center" label="人脸">
<template #default="{ row }">
<preview-image :src="row.faceImg" />
</template>
</el-table-column>
<el-table-column prop="address" align="center" label="操作">
<template #default="{ row }">
<el-button link type="primary" @click="editFace(row)">
<Icon icon="ep:edit" />修改
</el-button>
<el-button link type="danger" @click="delFace(row)">
删除
</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<el-button @click="submitForm" type="primary">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</el-dialog>
<el-dialog v-model="uploadDialogVisible" :close-on-click-modal="false" :title="faceUploadTitle" width="30%"
@close="uploadDialogClone">
<el-form v-loading="formLoading" ref="formRef" :model="formData" :rules="formRules" label-width="80px">
<el-form-item label="人脸" prop="uploadFace">
<upload-img v-model:image-url="formData.uploadFace" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitFace" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="uploadDialogVisible = false">取 消</el-button>
</template>
</el-dialog>
</div>
</template>
<script lang="ts" setup name="face-manage">
import { BasicTableProps, useTable } from '/@/hooks/table';
import * as userFaceApi from "/@/api/admin/userFace"
import { useMessage } from '/@/hooks/message';
// 定义刷新表格emit
const emit = defineEmits(['refresh']);
// 定义变量内容
const formRef = ref()
const dialogVisible = ref(false)
const uploadDialogVisible = ref(false)
const faceUploadTitle = ref<"上传人脸" | "修改人脸">("上传人脸")
const formLoading = ref(false)
const faceTableLoading = ref(false)
const formData = ref<any>({
id: undefined,
uploadFace: undefined,
})
const detailId = ref<any>(null)
// 定义表格查询、后台调用的API
const state: BasicTableProps = reactive<BasicTableProps>({
queryForm: {
deptId: '',
username: '',
phone: '',
},
pageList: userFaceApi.pageJoin,
});
const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
const formRules = reactive({
uploadFace: [{ required: true, message: '请上传人脸', trigger: 'blur' }],
})
const submitForm = async () => {
dialogVisible.value = false
emit('refresh')
}
const addFace = (row: any) => {
faceUploadTitle.value = "上传人脸"
formData.value.uploadFace = ""
uploadDialogVisible.value = true
}
const editFace = (row: any) => {
faceUploadTitle.value = "修改人脸"
formData.value.id = row.id
formData.value.uploadFace = row.faceImg
uploadDialogVisible.value = true
}
const delFace = async (row: any) => {
try {
await useMessage().delConfirm('是否删除人脸?')
userFaceApi.delObjs(row.id)
useMessage().success("删除成功")
getDataList()
} catch (error) {
console.log(error);
}
}
const openDialog = async (id: number) => {
if (!id) return;
dialogVisible.value = true
resetForm()
detailId.value = id
getDataList()
}
const submitFace = async () => {
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
formLoading.value = true
const pa: any = {
userId: detailId.value,
faceImg: formData.value.uploadFace,
}
if (faceUploadTitle.value == "修改人脸") {
pa.id = formData.value.id
}
try {
const fc = faceUploadTitle.value == "上传人脸" ? userFaceApi.addObj : userFaceApi.putObj
await fc(pa)
useMessage().success("操作成功")
uploadDialogClone()
getDataList()
} catch (error) {
console.log(error);
} finally {
formLoading.value = false
}
}
const uploadDialogClone = () => {
uploadDialogVisible.value = false
resetForm()
}
const resetForm = () => {
formData.value = {
id: undefined,
uploadFace: undefined,
}
formRef.value?.resetFields()
}
defineExpose({ openDialog })
</script>
src/views/admin/system/user/form.vue
+33 -32
View File
@@ -1,16 +1,19 @@
<template>
<div class="system-user-dialog-container">
<el-dialog :close-on-click-modal="false" :title="dataForm.userId ? $t('common.editBtn') : $t('common.addBtn')" draggable v-model="visible">
<el-dialog :close-on-click-modal="false" :title="dataForm.userId ? $t('common.editBtn') : $t('common.addBtn')"
draggable v-model="visible">
<el-form :model="dataForm" :rules="dataRules" label-width="90px" ref="dataFormRef" v-loading="loading">
<el-row :gutter="20">
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.username')" prop="username">
<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model="dataForm.username"></el-input>
<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名"
v-model="dataForm.username"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.password')" prop="password">
<el-input clearable placeholder="请输入密码" type="password" v-model="dataForm.password"></el-input>
<el-input clearable placeholder="请输入密码" type="password"
v-model="dataForm.password"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
@@ -26,28 +29,24 @@
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.role')" prop="role">
<el-select clearable multiple placeholder="请选择角色" v-model="dataForm.role">
<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId" v-for="item in roleData" />
<el-option :key="item.roleId" :label="item.roleName" :value="item.roleId"
v-for="item in roleData" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.post')" prop="post">
<el-select clearable multiple placeholder="请选择岗位" v-model="dataForm.post">
<el-option :key="item.postId" :label="item.postName" :value="item.postId" v-for="item in postData" />
<el-option :key="item.postId" :label="item.postName" :value="item.postId"
v-for="item in postData" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.dept')" prop="deptId">
<el-tree-select
:data="deptData"
:props="{ value: 'id', label: 'name', children: 'children' }"
check-strictly
class="w100"
clearable
placeholder="请选择所属部门"
v-model="dataForm.deptId"
>
<el-tree-select :data="deptData"
:props="{ value: 'id', label: 'name', children: 'children' }" check-strictly
class="w100" clearable placeholder="请选择所属部门" v-model="dataForm.deptId">
</el-tree-select>
</el-form-item>
</el-col>
@@ -65,7 +64,8 @@
<el-col :span="12" class="mb20">
<el-form-item :label="$t('sysuser.lockFlag')" prop="lockFlag">
<el-radio-group v-model="dataForm.lockFlag">
<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{ item.label }} </el-radio>
<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{
item.label }} </el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -74,7 +74,8 @@
<template #footer>
<span class="dialog-footer">
<el-button @click="visible = false">{{ $t('common.cancelButtonText') }}</el-button>
<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t('common.confirmButtonText') }}</el-button>
<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t('common.confirmButtonText')
}}</el-button>
</span>
</template>
</el-dialog>
@@ -107,10 +108,10 @@ const postData = ref<any[]>([]);
const loading = ref(false);
const props = defineProps({
deptId: {
type: String,
default: '',
}
deptId: {
type: String,
default: '',
}
});
const dataForm = reactive({
@@ -155,7 +156,7 @@ const dataRules = ref({
],
// 姓名校验，不能为空、只能是中文
name: [
{ validator: rule.overLength, trigger: 'blur' },
{ validator: rule.overLength, trigger: 'blur' },
{ required: true, message: '姓名不能为空', trigger: 'blur' },
{ validator: rule.chinese, trigger: 'blur' },
],
@@ -173,7 +174,7 @@ const dataRules = ref({
trigger: 'blur',
},
],
email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] },{ validator: rule.overLength, trigger: 'blur' }],
email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }, { validator: rule.overLength, trigger: 'blur' }],
lockFlag: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
});
@@ -202,7 +203,7 @@ const openDialog = async (id: string) => {
// 提交
const onSubmit = async () => {
const valid = await dataFormRef.value.validate().catch(() => {});
const valid = await dataFormRef.value.validate().catch(() => { });
if (!valid) return false;
try {
@@ -263,9 +264,9 @@ const getDeptData = () => {
deptTree().then((res) => {
deptData.value = res.data;
// 默认选择在树中选中的部门
if (!dataForm.userId) {
dataForm.deptId = props.deptId;
}
if (!dataForm.userId) {
dataForm.deptId = props.deptId;
}
});
};
@@ -274,9 +275,9 @@ const getPostData = () => {
postList().then((res) => {
postData.value = res.data;
// 默认选择第一个
if (!dataForm.userId) {
dataForm.post = [res.data[0].postId];
}
if (!dataForm.userId) {
dataForm.post = [res.data[0].postId];
}
});
};
// 角色数据
@@ -284,9 +285,9 @@ const getRoleData = () => {
roleList().then((res) => {
roleData.value = res.data;
// 默认选择第一个
if (!dataForm.userId) {
dataForm.role = [res.data[0].roleId];
}
if (!dataForm.userId) {
dataForm.role = [res.data[0].roleId];
}
});
};
src/views/admin/system/user/index.vue
+59 -61
View File
@@ -4,12 +4,13 @@
<pane size="15">
<div class="layout-padding-auto layout-padding-view">
<el-scrollbar>
<query-tree :placeholder="$t('common.queryDeptTip')" :query="deptData.queryList" :show-expand="true" @node-click="handleNodeClick">
<query-tree :placeholder="$t('common.queryDeptTip')" :query="deptData.queryList"
:show-expand="true" @node-click="handleNodeClick">
<!-- 没有数据权限提示 -->
<template #default="{ node, data }">
<el-tooltip v-if="data.isLock" class="item" effect="dark" :content="$t('sysuser.noDataScopeTip')" placement="right-start">
<span
>{{ node.label }}
<el-tooltip v-if="data.isLock" class="item" effect="dark"
:content="$t('sysuser.noDataScopeTip')" placement="right-start">
<span>{{ node.label }}
<SvgIcon name="ele-Lock" />
</span>
</el-tooltip>
@@ -24,103 +25,99 @@
<el-row v-show="showSearch">
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-form-item :label="$t('sysuser.username')" prop="username">
<el-input v-model="state.queryForm.username" :placeholder="$t('sysuser.inputUsernameTip')" clearable />
<el-input v-model="state.queryForm.username"
:placeholder="$t('sysuser.inputUsernameTip')" clearable />
</el-form-item>
<el-form-item :label="$t('sysuser.phone')" prop="phone">
<el-input v-model="state.queryForm.phone" :placeholder="$t('sysuser.inputPhoneTip')" clearable />
<el-input v-model="state.queryForm.phone" :placeholder="$t('sysuser.inputPhoneTip')"
clearable />
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn') }}</el-button>
<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-form>
</el-row>
<el-row>
<div class="mb8" style="width: 100%">
<el-button v-auth="'sys_user_add'" icon="folder-add" type="primary" @click="userDialogRef.openDialog()">
<el-button v-auth="'sys_user_add'" icon="folder-add" type="primary"
@click="userDialogRef.openDialog()">
{{ $t('common.addBtn') }}
</el-button>
<el-button plain v-auth="'sys_user_add'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
<el-button plain v-auth="'sys_user_add'" class="ml10" icon="upload-filled" type="primary"
@click="excelUploadRef.show()">
{{ $t('common.importBtn') }}
</el-button>
<el-button
plain
v-auth="'sys_user_del'"
:disabled="multiple"
class="ml10"
icon="Delete"
type="primary"
@click="handleDelete(selectObjs)"
>
<el-button plain v-auth="'sys_user_del'" :disabled="multiple" class="ml10" icon="Delete"
type="primary" @click="handleDelete(selectObjs)">
{{ $t('common.delBtn') }}
</el-button>
<right-toolbar
v-model:showSearch="showSearch"
:export="'sys_user_export'"
@exportExcel="exportExcel"
@queryTable="getDataList"
class="ml10 mr20"
style="float: right"
/>
<right-toolbar v-model:showSearch="showSearch" :export="'sys_user_export'"
@exportExcel="exportExcel" @queryTable="getDataList" class="ml10 mr20"
style="float: right" />
</div>
</el-row>
<el-table
v-loading="state.loading"
:data="state.dataList"
@selection-change="handleSelectionChange"
row-key="userId"
border
:cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle"
>
<el-table v-loading="state.loading" :data="state.dataList" @selection-change="handleSelectionChange"
row-key="userId" border :cell-style="tableStyle.cellStyle"
:header-cell-style="tableStyle.headerCellStyle">
<el-table-column :selectable="handleSelectable" type="selection" width="40" />
<el-table-column :label="$t('sysuser.index')" type="index" width="60" fixed="left" />
<el-table-column :label="$t('sysuser.username')" prop="username" fixed="left" show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('sysuser.name')" prop="name" show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('sysuser.phone')" prop="phone" show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('sysuser.username')" prop="username" fixed="left"
show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('sysuser.name')" prop="name"
show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('sysuser.phone')" prop="phone"
show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('sysuser.post')" show-overflow-tooltip>
<template #default="scope">
<el-tag v-for="(item, index) in scope.row.postList" :key="index">{{ item.postName }}</el-tag>
<el-tag v-for="(item, index) in scope.row.postList" :key="index">{{ item.postName
}}</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('sysuser.role')" show-overflow-tooltip>
<template #default="scope">
<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName }}</el-tag>
<el-tag v-for="(item, index) in scope.row.roleList" :key="index">{{ item.roleName
}}</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('sysuser.lockFlag')" show-overflow-tooltip>
<template #default="scope">
<el-switch v-model="scope.row.lockFlag" @change="changeSwitch(scope.row)" active-value="0" inactive-value="9"></el-switch>
<el-switch v-model="scope.row.lockFlag" @change="changeSwitch(scope.row)"
active-value="0" inactive-value="9"></el-switch>
</template>
</el-table-column>
<el-table-column :label="$t('common.action')" width="200" fixed="right">
<el-table-column :label="$t('common.action')" width="300" fixed="right">
<template #default="scope">
<div style="display: flex">
<!-- 重置密码 -->
<popover-input v-model="inputPassword" @confirm="changePassword(scope.row)">
<template #default>
<el-button v-auth="'sys_user_edit'" icon="RefreshLeft" text type="primary" class="mr-4">
<el-button v-auth="'sys_user_edit'" icon="RefreshLeft" text type="primary"
class="mr-4">
{{ $t('sysuser.passwordBtn') }}
</el-button>
</template>
</popover-input>
<!-- 修改信息 -->
<el-button v-auth="'sys_user_edit'" icon="edit-pen" text type="primary" @click="userDialogRef.openDialog(scope.row.userId)">
<el-button v-auth="'sys_user_edit'" icon="edit-pen" text type="primary"
@click="userDialogRef.openDialog(scope.row.userId)">
{{ $t('common.editBtn') }}
</el-button>
<!-- 人脸管理 -->
<el-button icon="User" text type="primary"
@click="faceManageRef.openDialog(scope.row.userId)">
人脸管理
</el-button>
<!-- 删除用户 -->
<el-tooltip :content="$t('sysuser.deleteDisabledTip')" :disabled="scope.row.userId !== '1'" placement="top">
<el-tooltip :content="$t('sysuser.deleteDisabledTip')"
:disabled="scope.row.userId !== '1'" placement="top">
<span style="margin-left: 12px">
<el-button
icon="delete"
v-auth="'sys_user_del'"
:disabled="scope.row.username === 'admin'"
text
type="primary"
@click="handleDelete([scope.row.userId])"
>{{ $t('common.delBtn') }}
<el-button icon="delete" v-auth="'sys_user_del'"
:disabled="scope.row.username === 'admin'" text type="primary"
@click="handleDelete([scope.row.userId])">{{ $t('common.delBtn') }}
</el-button>
</span>
</el-tooltip>
@@ -128,20 +125,19 @@
</template>
</el-table-column>
</el-table>
<pagination v-bind="state.pagination" @current-change="currentChangeHandle" @size-change="sizeChangeHandle"> </pagination>
<pagination v-bind="state.pagination" @current-change="currentChangeHandle"
@size-change="sizeChangeHandle">
</pagination>
</div>
</pane>
</splitpanes>
<user-form ref="userDialogRef" @refresh="getDataList(false)" :deptId="state.queryForm.deptId" />
<upload-excel
ref="excelUploadRef"
:title="$t('sysuser.importUserTip')"
temp-url="/admin/sys-file/local/file/user.xlsx"
url="/admin/user/import"
@refreshDataList="getDataList"
/>
<face-manage ref="faceManageRef" @refresh="getDataList(false)" />
<upload-excel ref="excelUploadRef" :title="$t('sysuser.importUserTip')"
temp-url="/admin/sys-file/local/file/user.xlsx" url="/admin/user/import" @refreshDataList="getDataList" />
</div>
</template>
@@ -154,6 +150,7 @@ import { useI18n } from 'vue-i18n';
// 动态引入组件
const UserForm = defineAsyncComponent(() => import('./form.vue'));
const FaceManage = defineAsyncComponent(() => import('./face-manage.vue'));
const QueryTree = defineAsyncComponent(() => import('/@/components/QueryTree/index.vue'));
const PopoverInput = defineAsyncComponent(() => import('/@/components/PopoverInput/index.vue'));
@@ -161,6 +158,7 @@ const { t } = useI18n();
// 定义变量内容
const userDialogRef = ref();
const faceManageRef = ref();
const excelUploadRef = ref();
const queryRef = ref();
const showSearch = ref(true);
src/views/wallet/wallet-manage/index.vue
+21 -2
View File
@@ -1,6 +1,25 @@
<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" />
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="w100" label="饭卡卡号" prop="cardNumber">
<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
</el-form-item>
</el-col>
<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-row>
</el-form>
<el-row>
<div class="mb8" style="width: 100%">
<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletManage_del'"
@@ -55,9 +74,9 @@
<el-table-column prop="createTime" width="200" label="创建时间" show-overflow-tooltip />
<el-table-column label="操作" fixed="right" width="200">
<template #default="{ row }">
<el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletManage_edit'"
<el-button icon="InfoFilled" text type="primary" v-auth="'wallet_walletManage_edit'"
@click="formDialogRef.openDialog(row.id)">详情</el-button>
<el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletManage_edit'"
<el-button icon="Money" text type="primary" v-auth="'wallet_walletManage_edit'"
@click="changeBalanceRef.openDialog(row.userId, row.id)">充值/扣款</el-button>
</template>
</el-table-column>
src/views/wallet/wallet-manage/transaction-list.vue
+4 -27
View File
@@ -30,27 +30,19 @@ import { displayPrice } from "/@/utils/formatMoney"
const emit = defineEmits(['refresh']);
// 定义变量内容
const dataFormRef = ref();
const visible = ref(false)
const loading = ref(false)
// 定义字典
// 提交表单数据
const form = reactive({
id: '',
isFreeze: '',
activeBindTime: '',
activeBindStatus: '',
});
const state: BasicTableProps = reactive<BasicTableProps>({
pagination: { size: 5, },
queryForm: {},
pageList: walletTransactionApi.pageJoin
})
// 定义校验规则
const dataRules = ref({
})
// table hook
const {
getDataList,
@@ -65,30 +57,15 @@ const {
const openDialog = (id: string) => {
visible.value = true
form.id = ''
// 重置表单数据
nextTick(() => {
dataFormRef.value?.resetFields();
});
// 获取walletManage信息
if (id) {
form.id = id
getwalletManageData(id)
state.queryForm.walletId = id
state.dataList = []
getDataList()
}
};
// 初始化表单数据
const getwalletManageData = (id: string) => {
// 获取数据
loading.value = true
const res = walletTransactionApi.pageJoin({ walletId: id });
console.log(res);
};
// 暴露变量
defineExpose({
openDialog
src/views/wallet/wallet-type/index.vue
+3 -2
View File
@@ -11,8 +11,9 @@
@click="handleDelete(selectObjs)">
删除
</el-button>
<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletType_export'" @exportExcel="exportExcel"
class="ml10 mr20" style="float: right;" @queryTable="getDataList"></right-toolbar>
<right-toolbar :search="false" v-model:showSearch="showSearch" :export="'wallet_walletType_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"