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

src/components/Select/SelectUser.vue

@@ -10,6 +10,7 @@
 		:remote-method="remoteSearch"
 		:loading="state.loading"
 		@visible-change="(e: boolean) => e && getOptions()"
+		@change="change"
 	>
 		<el-option v-for="v in state.options" :key="v.userId" :label="`${v.name}-${v.phone}`" :value="v.userId">
 			<div class="flex items-center">
@@ -23,6 +24,7 @@
 <script setup lang="ts" name="select-user">
 import { reactive } from "vue"
 import * as userApi from "/@/api/admin/user"
+const emit = defineEmits(["change"])
 
 const selectId = defineModel()
 
@@ -80,4 +82,9 @@ function clear() {
 	state.selectId = null
 	getOptions()
 }
+
+function change(v: any) {
+	const targetUser = state.options.find((i: any) => i.userId == v)
+	emit("change", targetUser)
+}
 </script>

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

@@ -1,55 +1,30 @@
 <template>
-	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" 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-form-item label="调动用户" prop="userId">
-						<el-input v-model="form.userId" placeholder="请输入用户id" />
+						<select-user v-model="form.userId" @change="(v: any) => { form.sourceDeptId = v?.deptId ?? null}" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
-					<el-form-item label="业务id" prop="bizId">
+					<el-form-item label="源部门" prop="sourceDeptId">
-						<el-input v-model="form.bizId" placeholder="请输入业务id" />
+						<select-dept v-model="form.sourceDeptId" clearable disabled />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
-					<el-form-item label="业务类型" prop="bizType">
+					<el-form-item label="调用类型" prop="bizType">
-						<el-input v-model="form.bizType" placeholder="请输入业务类型" />
+						<dict-select v-model="form.bizType" dict-code="user_transaction" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24" class="mb20" v-if="form.bizType == '30'">
+					<el-form-item label="目标部门" prop="targetDeptId">
+						<select-dept v-model="form.targetDeptId" clearable />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
-					<el-form-item label="源部门id" prop="sourceDeptId">
+					<el-form-item label="备注" prop="remark">
-						<el-input v-model="form.sourceDeptId" placeholder="请输入源部门id" />
+						<el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
-					</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>
@@ -75,7 +50,7 @@ const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
-
+const { user_transaction } = useDict("user_transaction")
 // 提交表单数据
 const form = reactive({
 	id: "",
@@ -89,10 +64,16 @@ const form = reactive({
 	processId: "",
 	processStatus: "",
 	processTime: "",
+	remark: "",
 })
 
 // 定义校验规则
-const dataRules = ref({})
+const dataRules = ref({
+	userId: [{ required: true, message: "请选择用户", trigger: "change" }],
+	sourceDeptId: [{ required: true, message: "请选择源部门", trigger: "change" }],
+	bizType: [{ required: true, message: "请选择调用类型", trigger: "change" }],
+	targetDeptId: [{ required: true, message: "请选择目标部门", trigger: "change" }],
+})
 
 // 打开弹窗
 const openDialog = (id: string) => {

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

@@ -1,6 +1,32 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<el-row>
+				<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+					<el-form-item style="width: 250px" label="调动用户" prop="userId">
+						<select-user v-model="state.queryForm.userId" />
+					</el-form-item>
+					<el-form-item style="width: 250px" label="调动类型" prop="bizType">
+						<dict-select v-model="state.queryForm.bizType" dict-code="user_transaction" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="自动转账到消费钱包" prop="isWalletTransaction">
+						<dict-select v-model="state.queryForm.isWalletTransaction" dict-code="yes_no_type" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="申请时间" prop="createTimeList">
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
+						<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="自动转账时间" prop="walletTransactionTimeList">
+						<el-date-picker v-model="state.queryForm.walletTransactionTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+					</el-form-item>
+					<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-form>
+			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button
@@ -43,35 +69,82 @@
 			>
 				<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="applyUsername" label="申请人" />
-				<el-table-column prop="bizId" label="业务id" show-overflow-tooltip />
+				<el-table-column prop="username" label="调动人" />
-				<el-table-column prop="bizType" label="业务类型" show-overflow-tooltip />
+				<el-table-column prop="userMobile" label="调动人手机号" width="120" />
-				<el-table-column prop="sourceDeptId" label="源部门id" show-overflow-tooltip />
+				<el-table-column prop="bizType" width="120" label="调动类型">
-				<el-table-column prop="targetDeptId" label="目标部门id" show-overflow-tooltip />
+					<template #default="{ row }">
-				<el-table-column prop="isWalletTransaction" label="是否离职自动转账" show-overflow-tooltip />
+						<dict-tag :options="user_transaction" :value="row.bizType" />
-				<el-table-column prop="walletTransactionTime" label="离职自动转账时间" show-overflow-tooltip />
+					</template>
-				<el-table-column prop="processId" label="流程id" show-overflow-tooltip />
+				</el-table-column>
-				<el-table-column prop="processStatus" label="审核状体" show-overflow-tooltip />
+				<el-table-column prop="sourceDeptName" width="200" label="源部门" />
-				<el-table-column prop="processTime" label="审核时间" show-overflow-tooltip />
+				<el-table-column prop="targetDeptName" width="200" label="目标部门" />
-				<el-table-column label="操作" width="150">
+				<el-table-column prop="isWalletTransaction" width="160" label="自动转账到消费钱包">
-					<template #default="scope">
+					<template #default="{ row }">
+						<dict-tag :options="yes_no_type" :value="row.isWalletTransaction" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="walletTransactionTime" width="150" label="自动转账时间">
+					<template #default="{ row }">
+						<span v-if="row.walletTransactionTime">{{ row.walletTransactionTime }}</span>
+						<span v-else class="color-danger">未自动转账</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="processStatus" width="160" label="审核状态">
+					<template #default="{ row }">
+						<dict-tag :options="check_status" :value="row.processStatus" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="processTime" width="160" label="审核时间">
+					<template #default="{ row }">
+						<span v-if="row.processTime">{{ row.processTime }}</span>
+						<span v-else class="color-danger">未审核</span>
+					</template>
+				</el-table-column>
+				<el-table-column
+					label="操作"
+					fixed="right"
+					width="250"
+					v-auths="['admin_sysUserTransaction_edit', 'admin_sysUserTransaction_check', 'admin_sysUserTransaction_del']"
+				>
+					<template #default="{ row }">
 						<el-button
 							icon="edit-pen"
+							v-if="row.processStatus == 1"
 							text
 							type="primary"
 							v-auth="'admin_sysUserTransaction_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
+							@click="formDialogRef.openDialog(row.id)"
-							>编辑</el-button
 						>
-						<el-button icon="delete" text type="primary" v-auth="'admin_sysUserTransaction_del'" @click="handleDelete([scope.row.id])"
+							编辑
-							>删除</el-button
+						</el-button>
+						<el-button
+							icon="VideoPlay"
+							v-if="row.processStatus == 1"
+							text
+							type="primary"
+							v-auth="'admin_sysUserTransaction_check'"
+							@click="deal(row)"
 						>
+							开始处理
+						</el-button>
+						<el-button
+							icon="delete"
+							v-if="row.processStatus == 1"
+							text
+							type="primary"
+							v-auth="'admin_sysUserTransaction_del'"
+							@click="handleDelete([row.id])"
+						>
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
-
+		<!-- 审批抽屉 -->
+		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 	</div>
@@ -85,8 +158,9 @@ import { useDict } from "/@/hooks/dict"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const ProcessDrawer = defineAsyncComponent(() => import("/@/components/processDrawer/index.vue"))
 // 定义查询字典
-
+const { user_transaction, yes_no_type, check_status } = useDict("user_transaction", "yes_no_type", "check_status")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -95,6 +169,8 @@ const showSearch = ref(true)
 // 多选变量
 const selectObjs = ref([]) as any
 const multiple = ref(true)
+const processDrawerRef = ref()
+const batchDealRef = ref()
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -104,6 +180,17 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 //  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
+// 点击开始处理
+const deal = (row: any) => {
+	if (!row.processId) return useMessage().warning("流程id不存在")
+	processDrawerRef.value.openProcessDrawer(row)
+}
+
+// 审批提交事件
+const taskSubmitEvent = () => {
+	getDataList()
+}
+
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件