From 9ce33414d693a559c22f43f20c58820dfbf5ded1 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 28 Feb 2025 09:30:40 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/log/index.vue                 |  2 +-
 src/views/admin/system/user/index.vue         |  6 +-
 src/views/flow/task/cc.vue                    | 82 +++++++++---------
 src/views/flow/task/completed.vue             | 86 ++++++++++---------
 src/views/flow/task/pending.vue               |  2 +-
 src/views/flow/task/started.vue               |  2 +-
 src/views/hard/hard-after-sale/index.vue      | 26 +++---
 src/views/hard/hard-dept-total/index.vue      | 20 ++---
 src/views/hard/hard-group/index.vue           | 35 ++------
 src/views/hard/hard-invoice/index.vue         | 34 +++-----
 src/views/hard/hard-order/index.vue           | 42 ++++-----
 src/views/hard/hard-sb/index.vue              | 18 ++--
 src/views/hard/hard-sh/index.vue              | 18 ++--
 src/views/wallet/wallet-active/index.vue      | 26 +++---
 src/views/wallet/wallet-cz/index.vue          | 34 +++-----
 src/views/wallet/wallet-foreign/index.vue     | 10 +--
 src/views/wallet/wallet-freeze/index.vue      | 18 ++--
 src/views/wallet/wallet-manage/index.vue      | 26 +++---
 src/views/wallet/wallet-qb/index.vue          | 28 +++---
 .../wallet/wallet-recharge-apply/index.vue    | 18 ++--
 .../wallet/wallet-recharge-water/index.vue    | 52 +++++------
 src/views/wallet/wallet-stride/index.vue      | 10 +--
 src/views/wallet/wallet-tk/index.vue          | 18 ++--
 src/views/wallet/wallet-xf/index.vue          | 18 ++--
 24 files changed, 260 insertions(+), 371 deletions(-)

diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue
index 7cad3b1..276e1fa 100644
--- a/src/views/admin/log/index.vue
+++ b/src/views/admin/log/index.vue
@@ -11,7 +11,7 @@
 							<el-option :key="item.value" :label="item.label" :value="item.value" v-for="item in log_type" />
 						</el-select>
 					</el-form-item>
-					<el-form-item :label="$t('syslog.createTime')" prop="createTime">
+					<el-form-item style="width: 450px" :label="$t('syslog.createTime')" prop="createTime">
 						<el-date-picker
 							:end-placeholder="$t('syslog.inputEndPlaceholderTip')"
 							:start-placeholder="$t('syslog.inputStartPlaceholderTip')"
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 09f101c..4afa38b 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -14,10 +14,8 @@
 				<template #default>
 					<el-row v-show="showSearch">
 						<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-							<el-form-item label="用户" prop="userId">
-								<div style="width: 180px">
-									<select-user v-model="state.queryForm.userId" clearable />
-								</div>
+							<el-form-item style="width: 250px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" clearable />
 							</el-form-item>
 							<el-form-item :label="$t('sysuser.username')" prop="username">
 								<el-input v-model="state.queryForm.username" :placeholder="$t('sysuser.inputUsernameTip')" clearable />
diff --git a/src/views/flow/task/cc.vue b/src/views/flow/task/cc.vue
index 409d052..d986862 100644
--- a/src/views/flow/task/cc.vue
+++ b/src/views/flow/task/cc.vue
@@ -3,14 +3,20 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-					<el-form-item label="发起时间" prop="taskTime">
-						<el-date-picker type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" v-model="state.queryForm.taskTime" is-range range-separator="To" />
+					<el-form-item style="width: 450px" label="发起时间" prop="taskTime">
+						<el-date-picker
+							type="datetimerange"
+							value-format="YYYY-MM-DD HH:mm:ss"
+							v-model="state.queryForm.taskTime"
+							is-range
+							range-separator="To"
+						/>
 					</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>
@@ -49,8 +55,7 @@
 				</el-table-column>
 			</el-table>
 
-      <pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle"
-                  v-bind="state.pagination"></pagination>
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
 		</div>
 		<!--			右侧抽屉-->
 		<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
@@ -74,59 +79,56 @@
 </template>
 
 <script setup lang="ts">
-import FormRender from '/@/views/flow/form/render/FormRender.vue';
-import FlowNodeFormat from '/@/views/flow/form/tools/FlowNodeFormatData.vue';
-
-import {queryMineCC, queryMineCCDetail} from '/@/api/flow/task';
-import { BasicTableProps, useTable } from '/@/hooks/table';
+import FormRender from "/@/views/flow/form/render/FormRender.vue"
+import FlowNodeFormat from "/@/views/flow/form/tools/FlowNodeFormatData.vue"
 
+import { queryMineCC, queryMineCCDetail } from "/@/api/flow/task"
+import { BasicTableProps, useTable } from "/@/hooks/table"
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  pageList: queryMineCC,
-  queryForm: {
-    taskTime: undefined,
-  },
-});
+	pageList: queryMineCC,
+	queryForm: {
+		taskTime: undefined,
+	},
+})
 
-const { tableStyle ,getDataList, currentChangeHandle,
-  sortChangeHandle,
-  sizeChangeHandle, } = useTable(state);
+const { tableStyle, getDataList, currentChangeHandle, sortChangeHandle, sizeChangeHandle } = useTable(state)
 
-const rightDrawerVisible = ref(false);
+const rightDrawerVisible = ref(false)
 
-const loading = ref(false);
-const showSearch = ref(true);
-const queryRef = ref();
-const currentData = ref();
+const loading = ref(false)
+const showSearch = ref(true)
+const queryRef = ref()
+const currentData = ref()
 /**
  * 点击开始处理
  * @param row
  */
 const deal = (row) => {
-	currentData.value = row;
+	currentData.value = row
 
 	queryMineCCDetail({ id: row.id }).then((res) => {
-		currentOpenFlowForm.value = res.data.formItems;
-		rightDrawerVisible.value = true;
-	});
-};
-const currentOpenFlowForm = ref();
+		currentOpenFlowForm.value = res.data.formItems
+		rightDrawerVisible.value = true
+	})
+}
+const currentOpenFlowForm = ref()
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 onMounted(() => {
-	getDataList();
-});
+	getDataList()
+})
 
 const formValue = computed(() => {
-  const obj = {};
-  for (const item of currentOpenFlowForm.value) {
-		obj[item.id] = item.props.value;
+	const obj = {}
+	for (const item of currentOpenFlowForm.value) {
+		obj[item.id] = item.props.value
 	}
-	return obj;
-});
+	return obj
+})
 </script>
diff --git a/src/views/flow/task/completed.vue b/src/views/flow/task/completed.vue
index 6310a7c..707e166 100644
--- a/src/views/flow/task/completed.vue
+++ b/src/views/flow/task/completed.vue
@@ -3,14 +3,20 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-					<el-form-item label="发起时间" prop="taskTime">
-						<el-date-picker type="datetimerange" value-format="YYYY-MM-DD HH:mm:ss" v-model="state.queryForm.taskTime" is-range range-separator="To" />
+					<el-form-item style="width: 450px" label="发起时间" prop="taskTime">
+						<el-date-picker
+							type="datetimerange"
+							value-format="YYYY-MM-DD HH:mm:ss"
+							v-model="state.queryForm.taskTime"
+							is-range
+							range-separator="To"
+						/>
 					</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>
@@ -48,8 +54,7 @@
 				</el-table-column>
 			</el-table>
 
-      <pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle"
-                  v-bind="state.pagination"></pagination>
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"></pagination>
 		</div>
 		<!--			右侧抽屉-->
 		<el-drawer v-model="rightDrawerVisible" direction="rtl" size="400px">
@@ -72,67 +77,64 @@
 	</div>
 </template>
 <script setup lang="ts">
-import FormRender from '/@/views/flow/form/render/FormRender.vue';
-import FlowNodeFormat from '/@/views/flow/form/tools/FlowNodeFormatData.vue';
+import FormRender from "/@/views/flow/form/render/FormRender.vue"
+import FlowNodeFormat from "/@/views/flow/form/tools/FlowNodeFormatData.vue"
 
-import {queryMineEndTask, queryTask, stopProcessInstance} from '/@/api/flow/task';
+import { queryMineEndTask, queryTask, stopProcessInstance } from "/@/api/flow/task"
 
-import { BasicTableProps, useTable } from '/@/hooks/table';
+import { BasicTableProps, useTable } from "/@/hooks/table"
 
 function stop(row) {
 	stopProcessInstance({
 		processInstanceId: row.processInstanceId,
 	}).then((res) => {
-		getDataList();
-	});
+		getDataList()
+	})
 }
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  pageList: queryMineEndTask,
-  queryForm: {
-    taskTime: undefined,
-  },
-});
+	pageList: queryMineEndTask,
+	queryForm: {
+		taskTime: undefined,
+	},
+})
 
-const { tableStyle ,getDataList, currentChangeHandle,
-  sortChangeHandle,
-  sizeChangeHandle, } = useTable(state);
+const { tableStyle, getDataList, currentChangeHandle, sortChangeHandle, sizeChangeHandle } = useTable(state)
 
-const rightDrawerVisible = ref(false);
+const rightDrawerVisible = ref(false)
 
-const loading = ref(false);
-const showSearch = ref(true);
-const queryRef = ref();
-const currentData = ref();
+const loading = ref(false)
+const showSearch = ref(true)
+const queryRef = ref()
+const currentData = ref()
 /**
  * 点击开始处理
  * @param row
  */
 const deal = (row) => {
-	currentData.value = row;
+	currentData.value = row
 	queryTask(row.taskId, true).then((res) => {
-		currentOpenFlowForm.value = res.data.formItems;
-		rightDrawerVisible.value = true;
-	});
-};
-const currentOpenFlowForm = ref();
-
+		currentOpenFlowForm.value = res.data.formItems
+		rightDrawerVisible.value = true
+	})
+}
+const currentOpenFlowForm = ref()
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 onMounted(() => {
-	getDataList();
-});
+	getDataList()
+})
 
 const formValue = computed(() => {
-  const obj = {};
-  for (const item of currentOpenFlowForm.value) {
-		obj[item.id] = item.props.value;
+	const obj = {}
+	for (const item of currentOpenFlowForm.value) {
+		obj[item.id] = item.props.value
 	}
-	return obj;
-});
+	return obj
+})
 </script>
diff --git a/src/views/flow/task/pending.vue b/src/views/flow/task/pending.vue
index 5296a68..ed0c4f4 100644
--- a/src/views/flow/task/pending.vue
+++ b/src/views/flow/task/pending.vue
@@ -6,7 +6,7 @@
 					<el-form-item label="流程" prop="processName">
 						<el-input placeholder="请输入流程名称" v-model="state.queryForm.processName" />
 					</el-form-item>
-					<el-form-item label="发起时间" prop="taskTime">
+					<el-form-item style="width: 450px" label="发起时间" prop="taskTime">
 						<el-date-picker
 							type="datetimerange"
 							value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/flow/task/started.vue b/src/views/flow/task/started.vue
index 4d631b3..b431f9e 100644
--- a/src/views/flow/task/started.vue
+++ b/src/views/flow/task/started.vue
@@ -9,7 +9,7 @@
 							<el-option :key="2" label="已结束" :value="2" />
 						</el-select>
 					</el-form-item>
-					<el-form-item label="发起时间" prop="taskTime">
+					<el-form-item style="width: 450px" label="发起时间" prop="taskTime">
 						<el-date-picker
 							type="datetimerange"
 							value-format="YYYY-MM-DD HH:mm:ss"
diff --git a/src/views/hard/hard-after-sale/index.vue b/src/views/hard/hard-after-sale/index.vue
index a29d650..3cd7656 100644
--- a/src/views/hard/hard-after-sale/index.vue
+++ b/src/views/hard/hard-after-sale/index.vue
@@ -2,22 +2,16 @@
 	<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="status">
-							<dict-select v-model="state.queryForm.status" dict-code="hard_sale_status" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item class="w100" label="申请时间" prop="createTimeList">
-							<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
-						</el-form-item>
-					</el-col>
+				<el-row>
+					<el-form-item style="width: 250px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</el-form-item>
+					<el-form-item style="width: 200px" label="退款状态" prop="status">
+						<dict-select v-model="state.queryForm.status" dict-code="hard_sale_status" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="申请时间" prop="createTimeList">
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+					</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>
diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue
index 49ae20c..27f5fb6 100644
--- a/src/views/hard/hard-dept-total/index.vue
+++ b/src/views/hard/hard-dept-total/index.vue
@@ -13,18 +13,14 @@
 			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-						<el-row :gutter="24">
-							<el-col :span="8">
-								<el-form-item class="w100" 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-col>
-							<el-col :span="8">
-								<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-col>
+						<el-row>
+							<el-form-item style="width: 400px" 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>
+								<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>
diff --git a/src/views/hard/hard-group/index.vue b/src/views/hard/hard-group/index.vue
index 114befa..71d5a4a 100644
--- a/src/views/hard/hard-group/index.vue
+++ b/src/views/hard/hard-group/index.vue
@@ -2,12 +2,10 @@
 	<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="name">
-							<el-input v-model="state.queryForm.name" placeholder="分组名" />
-						</el-form-item>
-					</el-col>
+				<el-row>
+					<el-form-item style="width: 200px" label="分组名" prop="name">
+						<el-input v-model="state.queryForm.name" placeholder="分组名" />
+					</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>
@@ -16,13 +14,7 @@
 			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'hard_hardGroup_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'hard_hardGroup_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -60,20 +52,10 @@
 				<el-table-column prop="deptName" label="部门" />
 				<el-table-column v-auths="['hard_hardGroup_edit', 'hard_hardGroup_del']" label="操作" width="150">
 					<template #default="scope">
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'hard_hardGroup_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
+						<el-button icon="edit-pen" text type="primary" v-auth="'hard_hardGroup_edit'" @click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
 						>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'hard_hardGroup_del'"
-							@click="handleDelete([scope.row.id])"
+						<el-button icon="delete" text type="primary" v-auth="'hard_hardGroup_del'" @click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
 					</template>
@@ -112,8 +94,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
diff --git a/src/views/hard/hard-invoice/index.vue b/src/views/hard/hard-invoice/index.vue
index c030785..457fd5c 100644
--- a/src/views/hard/hard-invoice/index.vue
+++ b/src/views/hard/hard-invoice/index.vue
@@ -13,27 +13,19 @@
 			>
 				<template #default>
 					<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="userIdChild">
-									<select-user v-model="state.queryForm.userIdChild" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="商户" prop="merchantIds">
-									<select-mch v-model="state.queryForm.merchantIds" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="设备类型" prop="hardType">
-									<dict-select v-model="state.queryForm.hardType" dict-code="hard_type" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="5">
-								<el-form-item class="w100" label="打印时间" prop="createTimeList">
-									<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 250px" label="用户" prop="userIdChild">
+								<select-user v-model="state.queryForm.userIdChild" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="商户" prop="merchantIds">
+								<select-mch v-model="state.queryForm.merchantIds" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="设备类型" prop="hardType">
+								<dict-select v-model="state.queryForm.hardType" dict-code="hard_type" />
+							</el-form-item>
+							<el-form-item style="width: 300px" label="打印时间" prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+							</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>
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 578f6ca..952a09e 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -2,32 +2,22 @@
 	<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="mchIds">
-							<select-mch v-model="state.queryForm.mchIds" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="w100" label="用户部门" prop="deptId">
-							<select-dept v-model="state.queryForm.deptId" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="w100" label="用餐时间段" prop="hourType">
-							<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="5">
-						<el-form-item class="w100" label="创建时间" prop="payTimeList">
-							<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
-						</el-form-item>
-					</el-col>
+				<el-row>
+					<el-form-item style="width: 250px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</el-form-item>
+					<el-form-item style="width: 200px" label="商户" prop="mchIds">
+						<select-mch v-model="state.queryForm.mchIds" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="用户部门" prop="deptId">
+						<select-dept v-model="state.queryForm.deptId" />
+					</el-form-item>
+					<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
+						<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+					</el-form-item>
+					<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
+						<el-date-picker v-model="state.queryForm.payTimeList" 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>
diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue
index 0a1c3e4..e0dd594 100644
--- a/src/views/hard/hard-sb/index.vue
+++ b/src/views/hard/hard-sb/index.vue
@@ -13,17 +13,13 @@
 			>
 				<template #default>
 					<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="hourType">
-									<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="5">
-								<el-form-item class="w100" label="创建时间" prop="payTimeList">
-									<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
+								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+							</el-form-item>
+							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
+								<el-date-picker v-model="state.queryForm.payTimeList" 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>
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 3164747..90971bd 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -13,17 +13,13 @@
 			>
 				<template #default>
 					<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="hourType">
-									<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="5">
-								<el-form-item class="w100" label="创建时间" prop="payTimeList">
-									<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
+								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
+							</el-form-item>
+							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
+								<el-date-picker v-model="state.queryForm.payTimeList" 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>
diff --git a/src/views/wallet/wallet-active/index.vue b/src/views/wallet/wallet-active/index.vue
index d621c41..58f1131 100644
--- a/src/views/wallet/wallet-active/index.vue
+++ b/src/views/wallet/wallet-active/index.vue
@@ -2,22 +2,16 @@
 	<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="isActiveHardware">
-							<dict-select v-model="state.queryForm.isActiveHardware" dict-code="yes_no_type" placeholder="是否激活" />
-						</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-row>
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</el-form-item>
+					<el-form-item style="width: 200px" label="是否激活" prop="isActiveHardware">
+						<dict-select v-model="state.queryForm.isActiveHardware" dict-code="yes_no_type" placeholder="是否激活" />
+					</el-form-item>
+					<el-form-item style="width: 200px" label="卡号" prop="cardNumber">
+						<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+					</el-form-item>
 					<el-form-item>
 						<el-button icon="Search" type="primary" @click="getDataList">
 							{{ $t("common.queryBtn") }}
diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index 8f89023..b94914b 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -13,27 +13,19 @@
 			>
 				<template #default>
 					<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="userId">
-									<select-user v-model="state.queryForm.userId" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="充值方式" prop="bizType">
-									<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="充值类型" prop="type">
-									<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="6">
-								<el-form-item class="w100" label="充值时间" prop="createTimeList">
-									<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
+								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="充值类型" prop="type">
+								<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
+							</el-form-item>
+							<el-form-item style="width: 300px" label="充值时间" prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+							</el-form-item>
 							<el-form-item>
 								<el-button icon="Search" type="primary" @click="getDataList">
 									{{ $t("common.queryBtn") }}
diff --git a/src/views/wallet/wallet-foreign/index.vue b/src/views/wallet/wallet-foreign/index.vue
index eaaeb59..a79c39f 100644
--- a/src/views/wallet/wallet-foreign/index.vue
+++ b/src/views/wallet/wallet-foreign/index.vue
@@ -2,12 +2,10 @@
 	<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-row>
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</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>
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index 97b9142..4a5f45b 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -2,17 +2,13 @@
 	<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-row>
+					<el-form-item style="width: 300px" label="申请人" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="饭卡卡号" prop="cardNumber">
+						<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+					</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>
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 3788a88..4e6949b 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -13,22 +13,16 @@
 			>
 				<template #default>
 					<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="userId">
-									<select-user v-model="state.queryForm.userId" />
-								</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-col :span="4">
-								<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-									<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
+								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+							</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>
diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index 8337fa5..5e1460c 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -13,22 +13,16 @@
 			>
 				<template #default>
 					<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="userId">
-									<select-user v-model="state.queryForm.userId" />
-								</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-col :span="4">
-								<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-									<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
+								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+							</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>
@@ -68,7 +62,7 @@
 						@selection-change="selectionChangHandle"
 						@sort-change="sortChangeHandle"
 					>
-						<el-table-column type="selection" width="40" align="center" />
+						<el-table-column v-auth="'wallet_walletManage_del'" type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="80" />
 						<el-table-column prop="username" width="100" label="用户" />
 						<el-table-column prop="userAvatar" width="80" label="头像">
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 2486424..2d2ba13 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -2,17 +2,13 @@
 	<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" placeholder="用户" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
-						</el-form-item>
-					</el-col>
+				<el-row>
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" placeholder="用户" />
+					</el-form-item>
+					<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+						<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+					</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>
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index cb0f7c8..96aeeb1 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -13,38 +13,26 @@
 			>
 				<template #default>
 					<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="userId">
-									<select-user v-model="state.queryForm.userId" placeholder="用户" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="充值类型" prop="bizType">
-									<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="审核状态" prop="processStatus">
-									<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="4">
-								<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-									<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
-								</el-form-item>
-							</el-col>
-							<el-col :span="8">
-								<el-form-item class="w100" 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-col>
-							<el-col :span="8">
-								<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-col>
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" placeholder="用户" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="充值类型" prop="bizType">
+								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="审核状态" prop="processStatus">
+								<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
+							</el-form-item>
+							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+							</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>
+								<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>
diff --git a/src/views/wallet/wallet-stride/index.vue b/src/views/wallet/wallet-stride/index.vue
index 93e03b0..cbe7640 100644
--- a/src/views/wallet/wallet-stride/index.vue
+++ b/src/views/wallet/wallet-stride/index.vue
@@ -2,12 +2,10 @@
 	<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-row>
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</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>
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index 2920ca5..03894aa 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -13,17 +13,13 @@
 			>
 				<template #default>
 					<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="userId">
-									<select-user v-model="state.queryForm.userId" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="6">
-								<el-form-item class="w100" label="退款时间" prop="createTimeList">
-									<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" />
+							</el-form-item>
+							<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+							</el-form-item>
 							<el-form-item>
 								<el-button icon="Search" type="primary" @click="getDataList">
 									{{ $t("common.queryBtn") }}
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index c0c0221..2d5bdac 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -13,17 +13,13 @@
 			>
 				<template #default>
 					<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="userId">
-									<select-user v-model="state.queryForm.userId" />
-								</el-form-item>
-							</el-col>
-							<el-col :span="6">
-								<el-form-item class="w100" label="消费时间" prop="createTimeList">
-									<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
-								</el-form-item>
-							</el-col>
+						<el-row>
+							<el-form-item style="width: 300px" label="用户" prop="userId">
+								<select-user v-model="state.queryForm.userId" />
+							</el-form-item>
+							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+							</el-form-item>
 							<el-form-item>
 								<el-button icon="Search" type="primary" @click="getDataList">
 									{{ $t("common.queryBtn") }}

From 1588ef9cfc0b2c662912eddfa77b785f914f0cfb Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 28 Feb 2025 10:32:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=92=B1=E5=8C=85=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=88=E4=BB=BD=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/wallet-qb/index.vue | 50 +++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index 5e1460c..a3cbf38 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -20,6 +20,15 @@
 							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
 								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="月份" prop="walletRecordMonth">
+								<el-date-picker
+									v-model="state.queryForm.walletRecordMonth"
+									value-format="YYYY-MM"
+									type="month"
+									:clearable="false"
+									placeholder="选择月份"
+								/>
+							</el-form-item>
 							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
 								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 							</el-form-item>
@@ -119,6 +128,7 @@ import { fetchListJoin, delObjs } from "/@/api/wallet/wallet-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
+import { formatDate } from "/@/utils/formatTime"
 
 const { wallet_type, yes_no_type } = useDict("wallet_type", "yes_no_type")
 // 定义变量内容
@@ -131,7 +141,9 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
+	queryForm: {
+		walletRecordMonth: formatDate(new Date(), "YYYY-mm"),
+	},
 	pageList: fetchListJoin,
 })
 
@@ -206,3 +218,39 @@ const handleDelete = async (ids: string[]) => {
 	}
 }
 </script>
+
+<!-- <style scoped>
+.cell {
+	height: 30px;
+	padding: 3px 0;
+	box-sizing: border-box;
+}
+
+.cell .text {
+	width: 24px;
+	height: 24px;
+	display: block;
+	margin: 0 auto;
+	line-height: 24px;
+	position: absolute;
+	left: 50%;
+	transform: translateX(-50%);
+	border-radius: 50%;
+}
+
+.cell.current .text {
+	background: #626aef;
+	color: #fff;
+}
+
+.cell .holiday {
+	position: absolute;
+	width: 6px;
+	height: 6px;
+	background: var(--el-color-danger);
+	border-radius: 50%;
+	bottom: 0px;
+	left: 50%;
+	transform: translateX(-50%);
+}
+</style> -->

From 26000e2c5f151eb4d9a13cdbf916e08244b052e0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 28 Feb 2025 10:47:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wallet/wallet-manage.ts      | 12 ++++++++++++
 src/views/wallet/wallet-qb/index.vue |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/api/wallet/wallet-manage.ts b/src/api/wallet/wallet-manage.ts
index 233b274..b5ba012 100644
--- a/src/api/wallet/wallet-manage.ts
+++ b/src/api/wallet/wallet-manage.ts
@@ -8,6 +8,18 @@ export function fetchList(query?: Object) {
 	})
 }
 
+export function fetchListJoinQb(query: any) {
+	return request({
+		url: "/wallet/wallet-manage/page-join-qb",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 export function fetchListJoin(query: any) {
 	return request({
 		url: "/wallet/wallet-manage/page-join",
diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index 8337fa5..d0fff98 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -121,7 +121,7 @@
 
 <script setup lang="ts" name="systemWalletManage">
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchListJoin, delObjs } from "/@/api/wallet/wallet-manage"
+import { fetchListJoinQb, delObjs } from "/@/api/wallet/wallet-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
@@ -138,7 +138,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
-	pageList: fetchListJoin,
+	pageList: fetchListJoinQb,
 })
 
 //  table hook