Merge remote-tracking branch 'origin/master'

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

@@ -69,8 +69,8 @@
 						<el-button text type="primary" icon="edit-pen" v-auth="'sys_role_edit'" @click="roleDialogRef.openDialog(scope.row.roleId)">{{
 							$t("common.editBtn")
 						}}</el-button>
-
-						<el-button text type="primary" icon="turn-off" v-auth="'sys_role_perm'" @click="permessionRef.openDialog(scope.row)">{{
+						<!-- v-auth="'sys_role_perm'" -->
+						<el-button text type="primary" icon="turn-off" @click="permessionRef.openDialog(scope.row)">{{
 							$t("sysrole.permissionTip")
 						}}</el-button>
 

src/views/admin/system/sys-user-transaction/form.vue

@@ -0,0 +1,150 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="用户id" prop="userId">
+						<el-input v-model="form.userId" placeholder="请输入用户id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="业务id" prop="bizId">
+						<el-input v-model="form.bizId" placeholder="请输入业务id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="业务类型" prop="bizType">
+						<el-input v-model="form.bizType" placeholder="请输入业务类型" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="源部门id" prop="sourceDeptId">
+						<el-input v-model="form.sourceDeptId" placeholder="请输入源部门id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="目标部门id" prop="targetDeptId">
+						<el-input v-model="form.targetDeptId" placeholder="请输入目标部门id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="是否离职自动转账" prop="isWalletTransaction">
+						<el-input v-model="form.isWalletTransaction" placeholder="请输入是否离职自动转账" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="离职自动转账时间" prop="walletTransactionTime">
+						<el-input v-model="form.walletTransactionTime" placeholder="请输入离职自动转账时间" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="流程id" prop="processId">
+						<el-input v-model="form.processId" placeholder="请输入流程id" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="审核状体" prop="processStatus">
+						<el-input v-model="form.processStatus" placeholder="请输入审核状体" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="审核时间" prop="processTime">
+						<el-input v-model="form.processTime" placeholder="请输入审核时间" />
+					</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="SysUserTransactionDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as sysUserTransactionApi from "/@/api/admin/sys-user-transaction"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	userId: "",
+	bizId: "",
+	bizType: "",
+	sourceDeptId: "",
+	targetDeptId: "",
+	isWalletTransaction: "",
+	walletTransactionTime: "",
+	processId: "",
+	processStatus: "",
+	processTime: "",
+})
+
+// 定义校验规则
+const dataRules = ref({})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+
+	// 获取sysUserTransaction信息
+	if (id) {
+		form.id = id
+		getsysUserTransactionData(id)
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	try {
+		loading.value = true
+		form.id ? await sysUserTransactionApi.putObj(form) : await sysUserTransactionApi.addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getsysUserTransactionData = (id: string) => {
+	// 获取数据
+	loading.value = true
+	sysUserTransactionApi
+		.getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/admin/system/sys-user-transaction/index.vue

@@ -0,0 +1,143 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'admin_sysUserTransaction_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'admin_sysUserTransaction_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'admin_sysUserTransaction_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"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="userId" label="用户id" show-overflow-tooltip />
+				<el-table-column prop="bizId" label="业务id" show-overflow-tooltip />
+				<el-table-column prop="bizType" label="业务类型" show-overflow-tooltip />
+				<el-table-column prop="sourceDeptId" label="源部门id" show-overflow-tooltip />
+				<el-table-column prop="targetDeptId" label="目标部门id" show-overflow-tooltip />
+				<el-table-column prop="isWalletTransaction" label="是否离职自动转账" show-overflow-tooltip />
+				<el-table-column prop="walletTransactionTime" label="离职自动转账时间" show-overflow-tooltip />
+				<el-table-column prop="processId" label="流程id" show-overflow-tooltip />
+				<el-table-column prop="processStatus" label="审核状体" show-overflow-tooltip />
+				<el-table-column prop="processTime" label="审核时间" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'admin_sysUserTransaction_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'admin_sysUserTransaction_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" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="systemSysUserTransaction">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as sysUserTransactionApi from "/@/api/admin/sys-user-transaction"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: sysUserTransactionApi.pageJoin,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/admin/sysUserTransaction/export", Object.assign(state.queryForm, { ids: selectObjs }), "sysUserTransaction.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await sysUserTransactionApi.delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+</script>