feat:电子钱包用户查询bug

src/views/flow/task/pending.vue

@@ -17,9 +17,9 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
@@ -59,7 +59,7 @@
 
 			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
 
-			<!--			右侧抽屉-->
+			<!--右侧抽屉-->
 			<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
 				<template #header>
 					<h3>{{ currentData?.processName }}</h3>
@@ -104,108 +104,108 @@
 	</div>
 </template>
 <script setup lang="ts">
-import FormRender from '/@/views/flow/form/render/FormRender.vue';
+import FormRender from "/@/views/flow/form/render/FormRender.vue"
-import AgreeHandle from './handler/agree.vue';
+import AgreeHandle from "./handler/agree.vue"
-import RefuseHandle from './handler/refuse.vue';
+import RefuseHandle from "./handler/refuse.vue"
-import TransferHandle from './handler/transfer.vue';
+import TransferHandle from "./handler/transfer.vue"
-import FlowNodeFormat from '/@/views/flow/form/tools/FlowNodeFormatData.vue';
+import FlowNodeFormat from "/@/views/flow/form/tools/FlowNodeFormatData.vue"
-import other from '/@/utils/other';
+import other from "/@/utils/other"
-import { queryMineTask, queryTask } from '/@/api/flow/task';
+import { queryMineTask, queryTask } from "/@/api/flow/task"
-import { BasicTableProps, useTable } from '/@/hooks/table';
+import { BasicTableProps, useTable } from "/@/hooks/table"
 
-const rightDrawerVisible = ref(false);
+const rightDrawerVisible = ref(false)
-const showSearch = ref(true);
+const showSearch = ref(true)
-const loading = ref(false);
+const loading = ref(false)
-const queryRef = ref();
+const queryRef = ref()
 
-const currentData = ref();
+const currentData = ref()
 const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: queryMineTask,
 	queryForm: {
-		processName: '',
+		processName: "",
 		taskTime: undefined,
 	},
-});
+})
 
-const { tableStyle, getDataList, currentChangeHandle, sizeChangeHandle } = useTable(state);
+const { tableStyle, getDataList, currentChangeHandle, sizeChangeHandle } = useTable(state)
 
 /**
  * 点击开始处理
  * @param row
  */
 const deal = (row: any) => {
-	currentData.value = row;
+	currentData.value = row
 	queryTask(row.taskId, false).then((res) => {
-		currentOpenFlowForm.value = res.data.formItems;
+		currentOpenFlowForm.value = res.data.formItems
-		rightDrawerVisible.value = true;
+		rightDrawerVisible.value = true
-	});
+	})
-};
+}
-const currentOpenFlowForm = ref();
+const currentOpenFlowForm = ref()
 const addLayoutOneItem = (id: Number) => {
 	for (const item of currentOpenFlowForm.value) {
 		if (item.id !== id) {
-			continue;
+			continue
 		}
-		let value = item.props.value;
+		let value = item.props.value
-		let oriForm = item.props.oriForm;
+		let oriForm = item.props.oriForm
-		value.push(other.deepClone(oriForm));
+		value.push(other.deepClone(oriForm))
-		item.props.value = value;
+		item.props.value = value
 	}
-};
+}
 const deleteLayoutOneItem = (id, index) => {
 	for (const item of currentOpenFlowForm.value) {
 		if (item.id !== id) {
-			continue;
+			continue
 		}
-		item.props.value.splice(index, 1);
+		item.props.value.splice(index, 1)
 	}
-};
+}
 
-const agreeHandler = ref();
+const agreeHandler = ref()
-const refuseHandler = ref();
+const refuseHandler = ref()
-const transferHandler = ref();
+const transferHandler = ref()
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
+	queryRef.value.resetFields()
-	getDataList();
+	getDataList()
-};
+}
 
 const taskSubmitEvent = () => {
-	rightDrawerVisible.value = false;
+	rightDrawerVisible.value = false
-	getDataList();
+	getDataList()
-};
+}
 
 /**
  * 提交任务
  */
 const submitTask = () => {
-	agreeHandler.value.handle(currentData.value, currentOpenFlowForm.value);
+	agreeHandler.value.handle(currentData.value, currentOpenFlowForm.value)
-};
+}
 /**
  * 拒绝任务
  */
 const refuseTask = () => {
-	refuseHandler.value.handle(currentData.value, currentOpenFlowForm.value);
+	refuseHandler.value.handle(currentData.value, currentOpenFlowForm.value)
-};
+}
 
 /**
  * 转办任务
  */
 const transferTask = () => {
-	transferHandler.value.handle(currentData.value, currentOpenFlowForm.value);
+	transferHandler.value.handle(currentData.value, currentOpenFlowForm.value)
-};
+}
 
 onMounted(() => {
-	getDataList();
+	getDataList()
-});
+})
 
 const formValue = computed(() => {
-	const obj = {};
+	const obj = {}
 
 	for (var item of currentOpenFlowForm.value) {
-		obj[item.id] = item.props.value;
+		obj[item.id] = item.props.value
 	}
-	return obj;
+	return obj
-});
+})
 </script>

src/views/flow/task/started.vue

@@ -68,11 +68,7 @@
 				</el-table-column>
 			</el-table>
 
-			<pagination
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
-				@current-change="currentChangeHandle"
-				@size-change="sizeChangeHandle"
-				v-bind="state.pagination"
-			></pagination>
 			<!--			右侧抽屉-->
 			<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
 				<template #header>

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

@@ -22,13 +22,7 @@
 
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_walletFreeze_add'">
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'wallet_walletFreeze_add'"
-					>
 						新 增
 					</el-button>
 					<el-button
@@ -89,14 +83,7 @@
 							@click="formDialogRef.openDialog(row.id)"
 							>编辑</el-button
 						>
-						<el-button
+						<el-button icon="delete" text type="primary" v-auth="'wallet_walletFreeze_del'" @click="handleDelete([row.id])">删除</el-button>
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_walletFreeze_del'"
-							@click="handleDelete([row.id])"
-							>删除</el-button
-						>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -110,7 +97,7 @@
 
 <script setup lang="ts" name="systemWalletFreeze">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { getObj, addObj, putObj, fetchList, pageJoin } from "/@/api/wallet/wallet-freeze"
+import { delObjs, pageJoin } from "/@/api/wallet/wallet-freeze"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 const { push } = useRouter()
@@ -134,8 +121,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 = () => {

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

@@ -14,8 +14,8 @@
 					<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">
+								<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-col>
 							<el-col :span="4">

src/views/wallet/wallet-recharge-apply/index.vue

@@ -21,13 +21,7 @@
 			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
+					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()" v-auth="'wallet_walletRechargeApply_add'">
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="uploadExcelRef.show()"
-						v-auth="'wallet_walletRechargeApply_add'"
-					>
 						导 入
 					</el-button>
 					<el-button
@@ -60,14 +54,14 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="80" />
-				<el-table-column prop="username" label="申请人" show-overflow-tooltip />
+				<el-table-column prop="username" label="申请人" />
-				<el-table-column prop="bizType" label="充值类型" show-overflow-tooltip>
+				<el-table-column prop="bizType" width="100" label="充值类型">
 					<template #default="{ row }">
 						<dict-tag :options="wallet_biz_recharge" :value="row.bizType" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="walletTypeId" widht="150" label="饭卡类型" show-overflow-tooltip>
+				<el-table-column prop="walletTypeId" width="200" label="饭卡类型">
 					<template #default="{ row }">
 						<div class="flex items-center justify-center">
 							<div class="color-primary">{{ row.walletTypeName }}</div>
@@ -77,25 +71,18 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip />
+				<el-table-column prop="deptName" width="200" label="部门" />
-				<el-table-column prop="importTime" label="充值月" show-overflow-tooltip />
+				<el-table-column prop="importTime" width="100" label="充值月" />
-				<el-table-column prop="processStatus" label="审核状态">
+				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="remark" label="备注" show-overflow-tooltip />
+				<el-table-column prop="remark" width="300" label="备注" />
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
+				<el-table-column prop="createTime" width="200" label="创建时间" />
-				<el-table-column label="操作" width="300">
+				<el-table-column label="操作" width="300" fixed="right">
 					<template #default="{ row }">
-						<el-button
+						<el-button icon="Document" text type="primary" v-auth="'wallet_walletRechargeApply_edit'" @click="doInfo(row)">数据</el-button>
-							icon="Document"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargeApply_edit'"
-							@click="doInfo(row)"
-							>数据</el-button
-						>
 						<el-button
 							v-if="row.importTime && !row.processId"
 							icon="Connection"
@@ -171,8 +158,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 = () => {
@@ -185,11 +171,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
+	downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx")
-		"/wallet/walletRechargeApply/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"walletRechargeApply.xlsx",
-	)
 }
 
 const doApply = async (row: any) => {