From 0fa67d4d02323411cfbe46cca1f470184068fb5c Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Fri, 17 Jan 2025 15:00:14 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/canteen/canteenCategory.ts           | 60 ++++++++++----------
 src/components/Select/SelectCtcg.vue         |  9 +--
 src/views/canteen/canteenDailyMenu/form.vue  | 10 ++--
 src/views/canteen/canteenDailyMenu/index.vue | 22 ++++---
 src/views/canteen/canteenSpu/index.vue       |  4 +-
 5 files changed, 54 insertions(+), 51 deletions(-)

diff --git a/src/api/canteen/canteenCategory.ts b/src/api/canteen/canteenCategory.ts
index 9b5f113..7a80003 100644
--- a/src/api/canteen/canteenCategory.ts
+++ b/src/api/canteen/canteenCategory.ts
@@ -1,48 +1,48 @@
 import request from "/@/utils/request"
 
 export function fetchList(query?: Object) {
-  return request({
-    url: '/canteen/canteenCategory/page',
-    method: 'get',
-    params: query
-  })
+	return request({
+		url: "/canteen/canteenCategory/page",
+		method: "get",
+		params: query,
+	})
 }
 
 export function addObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenCategory',
-    method: 'post',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenCategory",
+		method: "post",
+		data: obj,
+	})
 }
 
 export function getObj(id?: string) {
-  return request({
-    url: '/canteen/canteenCategory/' + id,
-    method: 'get'
-  })
+	return request({
+		url: "/canteen/canteenCategory/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
-  return request({
-    url: '/canteen/canteenCategory',
-    method: 'delete',
-    data: ids
-  })
+	return request({
+		url: "/canteen/canteenCategory",
+		method: "delete",
+		data: ids,
+	})
 }
 
 export function putObj(obj?: Object) {
-  return request({
-    url: '/canteen/canteenCategory',
-    method: 'put',
-    data: obj
-  })
+	return request({
+		url: "/canteen/canteenCategory",
+		method: "put",
+		data: obj,
+	})
 }
 
-export function getAllSimple() {
-  return request({
-    url: '/canteen/canteenCategory/getAllSimple',
-    method: 'get',
-  })
+export function getAllSimple(query?: any) {
+	return request({
+		url: "/canteen/canteenCategory/getAllSimple",
+		method: "get",
+		params: query,
+	})
 }
-
diff --git a/src/components/Select/SelectCtcg.vue b/src/components/Select/SelectCtcg.vue
index 0ee43f8..432296c 100644
--- a/src/components/Select/SelectCtcg.vue
+++ b/src/components/Select/SelectCtcg.vue
@@ -26,7 +26,7 @@
 
 <script setup lang="ts" name="select-merchant">
 import { reactive } from "vue"
-import { fetchList as getCanteenCategory } from "/@/api/canteen/canteenCategory"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 
 const selectId = defineModel()
 
@@ -37,10 +37,7 @@ const props = withDefaults(defineProps<Props>(), {
 	placeholder: "请选择",
 })
 
-const queryForm = reactive<any>({
-	current: 1,
-	size: 9999,
-})
+const queryForm = reactive<any>({})
 
 const state = reactive<any>({
 	loading: true,
@@ -65,7 +62,7 @@ async function getOptions() {
 			...queryForm,
 		}
 		const { data } = await getCanteenCategory(_pa)
-		state.options = data.records ?? []
+		state.options = data ?? []
 	} finally {
 		setTimeout(() => (state.loading = false), 500)
 	}
diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index bc0677f..96825e9 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -158,7 +158,7 @@ import { useMessage } from "/@/hooks/message"
 import { rule } from "/@/utils/validate"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
-import { fetchList as getCanteenCategory } from "/@/api/canteen/canteenCategory"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 import { getObj, addObj, putObj, getCanteenDailyMenuList } from "/@/api/canteen/canteenDailyMenu"
 
 const emit = defineEmits(["refresh"])
@@ -339,10 +339,12 @@ const handleClickSelect = async () => {
 	selectObjs.value = [...selectedFood.value]
 
 	await getDataListAndSelect() // 获取菜品数据并且勾选表格行
-	// 获取菜品分类数据
+	// 获取菜品分类
 	try {
-		const res = await getCanteenCategory({ current: 1, size: 999999 })
-		categoryOptions.value = res.data.records
+		const res = await getCanteenCategory()
+		if (res.code === 0) {
+			categoryOptions.value = res.data
+		}
 	} catch (error) {
 		categoryOptions.value = []
 	}
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 1983c3a..9454213 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -81,7 +81,7 @@
 <script setup lang="ts" name="systemCanteenDailyMenu">
 import { ElMessageBox } from "element-plus"
 import { delObjs, selectTimeFoodApi, selectWeekInfo } from "/@/api/canteen/canteenDailyMenu"
-import { fetchList } from "/@/api/canteen/canteenCategory"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 import { useMessage } from "/@/hooks/message"
 import { pageJoin } from "/@/api/wallet/mch-manage"
 import { displayPrice } from "/@/utils/formatMoney"
@@ -218,16 +218,20 @@ const merchantInit = async () => {
 	}
 }
 
+// 菜品分类
 const canteenCategoryOption = ref<any>([])
-// 获取菜品分类
-const getCanteenCategory = async () => {
-	const res = await fetchList({ current: 1, size: 9999 })
-	if (res.code === 0) {
-		canteenCategoryOption.value = res.data.records
-	}
-}
+
 onMounted(async () => {
-	await getCanteenCategory()
+	try {
+		// 获取菜品分类
+		const res = await getCanteenCategory()
+		if (res.code === 0) {
+			canteenCategoryOption.value = res.data
+		}
+	} catch (error) {
+		canteenCategoryOption.value = []
+	}
+
 	await merchantInit()
 })
 </script>
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index 99dfb0c..a1c926c 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -127,7 +127,7 @@ import { fetchList, delObjs } from "/@/api/canteen/canteenSpu"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
-import { fetchList as getCanteenCategory } from "/@/api/canteen/canteenCategory"
+import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCategory"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -151,7 +151,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 onMounted(async () => {
 	try {
 		const res = await getCanteenCategory()
-		categoryOptions.value = res.data.records
+		categoryOptions.value = res.data
 	} catch (error) {
 		categoryOptions.value = []
 	}

From ef3dea40fadbbef8e8df93a5ee458bc9834d4be3 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 19 Jan 2025 11:54:56 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   8 +-
 package.json                                  |   2 +-
 src/components/Select/SelectUser.vue          |   2 +-
 src/views/admin/system/user/index.vue         |   6 +
 src/views/hard/components/shop-car.vue        |  93 ++++-----
 .../hard/hard-after-sale/order-refund.vue     |   1 +
 .../hard/hard-after-sale/refund-reject.vue    |  90 ++++-----
 src/views/hard/hard-group/index.vue           |   2 +-
 src/views/hard/hard-invoice/index.vue         |  36 ++--
 src/views/hard/hard-manager/index.vue         |  26 ++-
 src/views/hard/hard-order/index.vue           |  51 +++--
 .../transaction-list.vue                      |   0
 src/views/wallet/wallet-manage/index.vue      |   4 +-
 .../wallet/wallet-recharge-apply/index.vue    |   2 +-
 .../wallet-setting/components/code/index.vue  | 150 ++++++++-------
 .../components/extra-price/index.vue          |   2 +-
 .../components/off-line/index.vue             | 123 ++++++------
 .../components/refund/index.vue               | 180 ++++++++++--------
 src/views/wallet/wallet-setting/index.vue     |  67 ++++---
 19 files changed, 484 insertions(+), 361 deletions(-)
 rename src/views/wallet/{wallet-manage => components}/transaction-list.vue (100%)

diff --git a/.env.development b/.env.development
index 513a670..55b6503 100644
--- a/.env.development
+++ b/.env.development
@@ -10,15 +10,15 @@ ENV = 'development'
 # ADMIN 服务地址
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
-#  VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
+ VITE_ADMIN_PROXY_PATH = http://localhost:9999
+# VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
 # VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
-#  VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
+ VITE_IMAGE_BASE_PATH = http://localhost:9999
+# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
 
 # 代码生成服务地址
diff --git a/package.json b/package.json
index b9cca10..d4a4d7b 100644
--- a/package.json
+++ b/package.json
@@ -108,4 +108,4 @@
 		"type": "git",
 		"url": "https://gitee.com/log4j/pig"
 	}
-}
+}
\ No newline at end of file
diff --git a/src/components/Select/SelectUser.vue b/src/components/Select/SelectUser.vue
index 839ec66..797b477 100644
--- a/src/components/Select/SelectUser.vue
+++ b/src/components/Select/SelectUser.vue
@@ -30,7 +30,7 @@ export type Props = {
 	placeholder?: string
 }
 const props = withDefaults(defineProps<Props>(), {
-	placeholder: "请选择",
+	placeholder: "输入姓名、手机号",
 })
 
 const queryForm = reactive<any>({
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index c3c5d14..c4e0f9d 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -34,6 +34,11 @@
 				<div class="layout-padding-auto layout-padding-view">
 					<el-row v-show="showSearch">
 						<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+							<el-form-item label="用户" prop="userIds">
+								<div style="width: 180px">
+									<select-user v-model="state.queryForm.userIds" clearable />
+								</div>
+							</el-form-item>
 							<el-form-item :label="$t('sysuser.username')" prop="username">
 								<el-input v-model="state.queryForm.username" :placeholder="$t('sysuser.inputUsernameTip')" clearable />
 							</el-form-item>
@@ -46,6 +51,7 @@
 							</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()">
diff --git a/src/views/hard/components/shop-car.vue b/src/views/hard/components/shop-car.vue
index 721d614..714beb8 100644
--- a/src/views/hard/components/shop-car.vue
+++ b/src/views/hard/components/shop-car.vue
@@ -1,62 +1,69 @@
 <template>
-    <el-dialog title="购物车" v-model="visible" :close-on-click-modal="false" draggable>
-        <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-            :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle">
-            <el-table-column label="商品名" align="center" prop="productName" />
-            <el-table-column label="商品图片" align="center" prop="code">
-                <template #default="{ row }">
-                    <preview-image v-if="row.productPic" :src="row.productPic" />
-                </template>
-            </el-table-column>
-            <el-table-column label="商品价格" align="center" prop="ticketId">
-                <template #default="{ row }">
-                    <span>{{ displayPrice(row.productPrice) }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="商品数量" align="center" prop="productCount" />
-            <el-table-column label="商品总额" align="center" prop="totalPrice">
-                <template #default="{ row }">
-                    <span>{{ displayPrice(row.totalPrice) }}</span>
-                </template>
-            </el-table-column>
-        </el-table>
-        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="visible = false">取消</el-button>
-            </span>
-        </template>
-    </el-dialog>
+	<el-dialog title="购物车" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-table
+			:data="state.dataList"
+			v-loading="state.loading"
+			border
+			:cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle"
+			@sort-change="sortChangeHandle"
+		>
+			<el-table-column label="商品名" align="center" prop="productName" />
+			<el-table-column label="商品图片" align="center" prop="code">
+				<template #default="{ row }">
+					<preview-image v-if="row.productPic" :src="row.productPic" />
+				</template>
+			</el-table-column>
+			<el-table-column label="商品价格" align="center" prop="ticketId">
+				<template #default="{ row }">
+					<span>{{ displayPrice(row.productPrice) }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column label="商品数量" align="center" prop="productCount" />
+			<el-table-column label="商品总额" align="center" prop="totalPrice">
+				<template #default="{ row }">
+					<span>{{ displayPrice(row.totalPrice) }}</span>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="shop-car">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import * as hardCar from "/@/api/hard/hard-car";
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as hardCar from "/@/api/hard/hard-car"
 import { displayPrice } from "/@/utils/formatMoney"
 
 // 定义变量内容
 const visible = ref(false)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-    createdIsNeed: false,
-    queryForm: {},
-    pageList: hardCar.getCarByOrderId
+	createdIsNeed: false,
+	queryForm: {},
+	pageList: hardCar.getCarByOrderId,
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 // 打开弹窗
 const openDialog = (id: string) => {
-    visible.value = true
-    if (id) {
-        state.queryForm.orderId = id
-        getDataList()
-    }
-};
+	visible.value = true
+	if (id) {
+		state.queryForm.orderId = id
+		getDataList()
+	}
+}
 
 // 暴露变量
 defineExpose({
-    openDialog
-});
-</script>
\ No newline at end of file
+	openDialog,
+})
+</script>
diff --git a/src/views/hard/hard-after-sale/order-refund.vue b/src/views/hard/hard-after-sale/order-refund.vue
index 75fd603..db6346e 100644
--- a/src/views/hard/hard-after-sale/order-refund.vue
+++ b/src/views/hard/hard-after-sale/order-refund.vue
@@ -78,6 +78,7 @@
 				<el-descriptions-item
 					:column="1"
 					v-if="globalData.type == 'apply' && globalData.afterSaleData.status == 10"
+					v-auth="'hard_hardAfterSale_change'"
 					label="操作: "
 					label-class-name="no-colon"
 				>
diff --git a/src/views/hard/hard-after-sale/refund-reject.vue b/src/views/hard/hard-after-sale/refund-reject.vue
index 2dcc35c..689a81f 100644
--- a/src/views/hard/hard-after-sale/refund-reject.vue
+++ b/src/views/hard/hard-after-sale/refund-reject.vue
@@ -1,70 +1,70 @@
 <template>
-    <el-dialog title="拒绝售后" v-model="visible" width="45%" :close-on-click-modal="false" draggable>
-        <el-form ref="dataFormRef" :model="form" label-width="80px" :rules="dataRules" v-loading="loading">
-            <el-form-item label="审批备注" prop="auditReason">
-                <el-input v-model="form.auditReason" :rows="3" placeholder="请输入审批备注" type="textarea" />
-            </el-form-item>
-        </el-form>
-        <template #footer>
-            <el-button type="primary" @click="onSubmit">确 定</el-button>
-            <el-button @click="visible = false">取 消</el-button>
-        </template>
-    </el-dialog>
+	<el-dialog title="拒绝售后" v-model="visible" width="45%" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" label-width="80px" :rules="dataRules" v-loading="loading">
+			<el-form-item label="审批备注" prop="auditReason">
+				<el-input v-model="form.auditReason" :rows="3" placeholder="请输入审批备注" type="textarea" />
+			</el-form-item>
+		</el-form>
+		<template #footer>
+			<el-button type="primary" @click="onSubmit">确 定</el-button>
+			<el-button @click="visible = false">取 消</el-button>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="refund-reject">
-import { useMessage } from "/@/hooks/message";
-import * as hardAfterSaleApi from '/@/api/hard/hard-after-sale'
+import { useMessage } from "/@/hooks/message"
+import * as hardAfterSaleApi from "/@/api/hard/hard-after-sale"
 
-const emit = defineEmits(['refresh']);
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 
 const form = reactive<any>({
-    id: undefined,
-    auditReason: "",
+	id: undefined,
+	auditReason: "",
 })
 
 // 定义校验规则
 const dataRules = ref({
-    auditReason: [{ required: true, message: '请输入拒绝原因', trigger: 'blur' }],
+	auditReason: [{ required: true, message: "请输入拒绝原因", trigger: "blur" }],
 })
 
 // 打开弹窗
 const openDialog = async (id: string) => {
-    visible.value = true
-    form.id = ''
-    if (!id) return
-    nextTick(() => {
-        dataFormRef.value?.resetFields();
-    });
-    form.id = id
-    const { data } = await hardAfterSaleApi.detailByOrderId({ orderId: id })
-    Object.assign(form, data)
-};
+	visible.value = true
+	form.id = ""
+	if (!id) return
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+	form.id = id
+	const { data } = await hardAfterSaleApi.detailByOrderId({ orderId: id })
+	Object.assign(form, data)
+}
 
 // 提交
 const onSubmit = async () => {
-    const valid = await dataFormRef.value.validate().catch(() => { });
-    if (!valid) return false;
-    try {
-        loading.value = true;
-        await hardAfterSaleApi.disagree(form);
-        useMessage().success(form.id ? '修改成功' : '添加成功');
-        visible.value = false;
-        emit('refresh');
-    } catch (err: any) {
-        useMessage().error(err.msg);
-    } finally {
-        loading.value = false;
-    }
-};
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+	try {
+		loading.value = true
+		await hardAfterSaleApi.disagree(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 暴露变量
 defineExpose({
-    openDialog
-});
-</script>
\ No newline at end of file
+	openDialog,
+})
+</script>
diff --git a/src/views/hard/hard-group/index.vue b/src/views/hard/hard-group/index.vue
index 030e724..0e05534 100644
--- a/src/views/hard/hard-group/index.vue
+++ b/src/views/hard/hard-group/index.vue
@@ -57,7 +57,7 @@
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="id" label="编号" />
 				<el-table-column prop="name" label="分组名" />
-				<el-table-column v-if="false" prop="deptName" label="部门" />
+				<el-table-column prop="deptName" label="部门" />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
 						<el-button
diff --git a/src/views/hard/hard-invoice/index.vue b/src/views/hard/hard-invoice/index.vue
index c775944..f0fd83f 100644
--- a/src/views/hard/hard-invoice/index.vue
+++ b/src/views/hard/hard-invoice/index.vue
@@ -4,13 +4,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="name">
-							<el-input v-model="state.queryForm.name" placeholder="设备名" />
-						</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="hard_type" />
+						<el-form-item class="w100" label="用户" prop="userIdChild">
+							<select-user v-model="state.queryForm.userIdChild" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
@@ -18,6 +13,16 @@
 							<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-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>
@@ -34,8 +39,18 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column label="部门" prop="deptName" />
+				<el-table-column type="index" label="#" width="60" />
+				<el-table-column width="200" label="用户">
+					<template #default="{ row }">
+						<div class="flex flex-row items-center justify-center">
+							<preview-image width="50px" height="50px" :src="row.userAvatar" />
+							<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+								<span> {{ row.username }}</span>
+								<span> {{ row.userMobile }}</span>
+							</div>
+						</div>
+					</template>
+				</el-table-column>
 				<el-table-column width="250px" label="设备信息">
 					<template #default="{ row }">
 						<div class="status">
@@ -184,17 +199,14 @@ const handleDelete = async (ids: string[]) => {
 	display: flex;
 	align-items: center;
 	margin-bottom: 2px;
-
 	span {
 		display: inline-block;
 	}
-
 	span:nth-child(1) {
 		min-width: 60px;
 		max-width: 100px;
 		text-align: left;
 	}
-
 	span:nth-child(2) {
 		flex: 1;
 		min-width: 50px;
diff --git a/src/views/hard/hard-manager/index.vue b/src/views/hard/hard-manager/index.vue
index 878782e..19dfda9 100644
--- a/src/views/hard/hard-manager/index.vue
+++ b/src/views/hard/hard-manager/index.vue
@@ -103,15 +103,33 @@
 							@click="formDialogRef.openDialog(row.id)"
 							>编辑</el-button
 						>
-						<el-button icon="TrendCharts" link type="primary" @click="mqformDialogRef.openDialog(row.id)">
+						<el-button
+							icon="TrendCharts"
+							link
+							type="primary"
+							v-auth="'hard_hardManager_edit'"
+							@click="mqformDialogRef.openDialog(row.id)"
+						>
 							mq设置
 						</el-button>
-						<el-button icon="SetUp" link type="primary" @click="faceFormDialogRef.openDialog(row.id)">
+						<el-button
+							icon="SetUp"
+							link
+							type="primary"
+							v-auth="'hard_hardManager_edit'"
+							@click="faceFormDialogRef.openDialog(row.id)"
+						>
 							人脸sdk设置
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'hard_hardManager_del'" @click="handleDelete([row.id])"
-							>删除</el-button
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'hard_hardManager_del'"
+							@click="handleDelete([row.id])"
 						>
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 66eadc2..7d1e38a 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -13,7 +13,12 @@
 							<select-mch v-model="state.queryForm.mchIds" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
+					<el-col :span="4">
+						<el-form-item class="w100" label="用户部门" prop="deptIdIdDeepen">
+							<select-dept v-model="state.queryForm.deptIdIdDeepen" />
+						</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" type="daterange" />
 						</el-form-item>
@@ -42,13 +47,17 @@
 			>
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="50" />
-				<el-table-column prop="username" width="100" label="用户" />
-				<el-table-column prop="userAvatar" width="100" label="头像">
+				<el-table-column width="200" label="用户">
 					<template #default="{ row }">
-						<preview-image :src="row.userAvatar" />
+						<div class="flex flex-row items-center justify-center">
+							<preview-image width="50px" height="50px" :src="row.userAvatar" />
+							<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+								<span> {{ row.username }}</span>
+								<span> {{ row.userMobile }}</span>
+							</div>
+						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="userMobile" width="120" label="手机号" />
 				<el-table-column width="200px" label="商品简要信息">
 					<template #default="{ row }">
 						<div class="desc">
@@ -167,13 +176,30 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column fixed="right" label="操作" width="250">
+				<el-table-column fixed="right" label="操作" width="200">
 					<template #default="{ row }">
-						<el-button icon="Printer" text type="primary" @click="print(row)"> 打印发票 </el-button>
-						<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)">
-							购物车
-						</el-button>
-						<el-button icon="InfoFilled" link type="primary" @click="doRefund(row)"> 详情 </el-button>
+						<div class="flex justify-between">
+							<el-button icon="Printer" text type="primary" @click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
+								打印发票
+							</el-button>
+							<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)">
+								购物车
+							</el-button>
+						</div>
+						<div class="flex justify-between">
+							<el-button icon="Money" link type="primary" @click="transactionListRef.openDialog(row.walletId)">
+								钱包明细
+							</el-button>
+							<el-button
+								icon="InfoFilled"
+								link
+								type="primary"
+								v-auth="'wallet_walletTransaction_update_balance'"
+								@click="doRefund(row)"
+							>
+								订单详情
+							</el-button>
+						</div>
 						<el-button
 							v-if="false"
 							icon="edit-pen"
@@ -198,6 +224,7 @@
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
 		<!-- 编辑、新增  -->
+		<transaction-list ref="transactionListRef" @refresh="getDataList(false)" />
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 		<shop-car ref="shopCarDialogRef" />
 	</div>
@@ -218,6 +245,7 @@ const { push } = useRouter()
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 const ShopCar = defineAsyncComponent(() => import("../components/shop-car.vue"))
+const TransactionList = defineAsyncComponent(() => import("/@/views/wallet/components/transaction-list.vue"))
 // 定义查询字典
 const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status, daily_menu } = useDict(
 	"hard_pay_type",
@@ -230,6 +258,7 @@ const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refun
 // 定义变量内容
 const formDialogRef = ref()
 const shopCarDialogRef = ref()
+const transactionListRef = ref()
 const tabList = ref<any>([{}])
 const activeName = ref(null)
 // 搜索变量
diff --git a/src/views/wallet/wallet-manage/transaction-list.vue b/src/views/wallet/components/transaction-list.vue
similarity index 100%
rename from src/views/wallet/wallet-manage/transaction-list.vue
rename to src/views/wallet/components/transaction-list.vue
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 6fa86a0..18b2ab1 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -107,7 +107,7 @@
 							icon="Money"
 							text
 							type="primary"
-							v-auth="'wallet_walletManage_edit'"
+							v-auth="'wallet_walletTransaction_update_balance'"
 							@click="changeBalanceRef.openDialog(row.userId, row.id)"
 							>充值/扣款</el-button
 						>
@@ -129,7 +129,7 @@ import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
-const TransactionList = defineAsyncComponent(() => import("./transaction-list.vue"))
+const TransactionList = defineAsyncComponent(() => import("../components/transaction-list.vue"))
 const ChangeBalance = defineAsyncComponent(() => import("./change-balance.vue"))
 // 定义查询字典
 const { wallet_type, yes_no_type } = useDict("wallet_type", "yes_no_type")
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index f34da42..9a83604 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -100,7 +100,7 @@
 							icon="Connection"
 							text
 							type="primary"
-							v-auth="'wallet_walletRechargeApply_edit'"
+							v-auth="'wallet_walletRechargeApply_apply'"
 							@click="doApply(row)"
 							>申请</el-button
 						>
diff --git a/src/views/wallet/wallet-setting/components/code/index.vue b/src/views/wallet/wallet-setting/components/code/index.vue
index 9365732..fc216df 100644
--- a/src/views/wallet/wallet-setting/components/code/index.vue
+++ b/src/views/wallet/wallet-setting/components/code/index.vue
@@ -1,91 +1,107 @@
 <template>
-    <div class="w100">
-        <div class="layout-padding-auto layout-padding-view">
-            <div class="flex justify-center flex-col">
-                <div>
-                    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="180px"
-                        v-loading="loading">
-                        <el-row :gutter="24">
-                            <el-col :span="24" class="mb20">
-                                <el-form-item label="钱包二维码自动刷新" prop="refreshQrCodeEnable">
-                                    <el-switch active-value="1" inactive-value="0" v-model="form.refreshQrCodeEnable"
-                                        active-text="开启" inactive-text="关闭" inline-prompt />
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="24" class="mb20">
-                                <el-form-item label="钱包二维码自动刷新间隔" prop="refreshQrCodeFre">
-                                    <el-input style="width: 300px;" type="number" v-model="form.refreshQrCodeFre"
-                                        placeholder="请输入钱包二维码自动刷新间隔">
-                                        <template #append>秒</template>
-                                    </el-input>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                </div>
-            </div>
-            <div class="flex items-center">
-                <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-            </div>
-        </div>
-    </div>
+	<div class="w100">
+		<div class="layout-padding-auto layout-padding-view">
+			<div class="flex justify-center flex-col">
+				<div>
+					<el-form
+						ref="dataFormRef"
+						:model="form"
+						:rules="dataRules"
+						formDialogRef
+						label-width="180px"
+						v-loading="loading"
+					>
+						<el-row :gutter="24">
+							<el-col :span="24" class="mb20">
+								<el-form-item label="钱包二维码自动刷新" prop="refreshQrCodeEnable">
+									<el-switch
+										active-value="1"
+										inactive-value="0"
+										v-model="form.refreshQrCodeEnable"
+										active-text="开启"
+										inactive-text="关闭"
+										inline-prompt
+									/>
+								</el-form-item>
+							</el-col>
+							<el-col :span="24" class="mb20">
+								<el-form-item label="钱包二维码自动刷新间隔" prop="refreshQrCodeFre">
+									<el-input
+										style="width: 300px"
+										type="number"
+										v-model="form.refreshQrCodeFre"
+										placeholder="请输入钱包二维码自动刷新间隔"
+									>
+										<template #append>秒</template>
+									</el-input>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+			</div>
+			<div class="flex items-center" v-auth="'wallet_setting_edit'">
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script setup lang="ts" name="code">
-import { useDict } from '/@/hooks/dict'
+import { useDict } from "/@/hooks/dict"
 import { storePrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const loading = ref(false)
 // 提交表单数据
 const form = reactive({
-    id: undefined,
-    refreshQrCodeEnable: undefined,
-    refreshQrCodeFre: undefined,
-});
+	id: undefined,
+	refreshQrCodeEnable: undefined,
+	refreshQrCodeFre: undefined,
+})
 // 定义校验规则
 const dataRules = ref({
-    refreshQrCodeEnable: [{ required: true, message: '是否开启钱包二维码自动刷新', trigger: 'change' }],
-    refreshQrCodeFre: [{ required: true, message: '钱包二维码自动刷新间隔', trigger: 'blur' }],
+	refreshQrCodeEnable: [{ required: true, message: "是否开启钱包二维码自动刷新", trigger: "change" }],
+	refreshQrCodeFre: [{ required: true, message: "钱包二维码自动刷新间隔", trigger: "blur" }],
 })
 
 onMounted(() => {
-    getwalletRechargePackageData('1')
+	getwalletRechargePackageData("1")
 })
 
 // 提交
 const onSubmit = async () => {
-    const valid = await dataFormRef.value.validate().catch(() => { });
-    if (!valid) return false;
-
-    try {
-        loading.value = true;
-        const pa = {
-            ...form,
-            payPrice: storePrice(form.payPrice),
-            bonusPrice: storePrice(form.bonusPrice),
-        }
-        await putObj(pa)
-        useMessage().success('修改成功');
-    } catch (err: any) {
-        useMessage().error(err.msg);
-    } finally {
-        loading.value = false;
-    }
-};
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
+	try {
+		loading.value = true
+		const pa = {
+			...form,
+			payPrice: storePrice(form.payPrice),
+			bonusPrice: storePrice(form.bonusPrice),
+		}
+		await putObj(pa)
+		useMessage().success("修改成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getwalletRechargePackageData = (id: string) => {
-    // 获取数据
-    loading.value = true
-    getObj(id).then((res: any) => {
-        Object.assign(form, res.data)
-    }).finally(() => {
-        loading.value = false
-    })
-};
-
-</script>
\ No newline at end of file
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/src/views/wallet/wallet-setting/components/extra-price/index.vue b/src/views/wallet/wallet-setting/components/extra-price/index.vue
index 85cecca..ef5b259 100644
--- a/src/views/wallet/wallet-setting/components/extra-price/index.vue
+++ b/src/views/wallet/wallet-setting/components/extra-price/index.vue
@@ -50,7 +50,7 @@
 							</el-col>
 						</el-row>
 					</el-form>
-					<div class="flex items-center">
+					<div class="flex items-center" v-auth="'wallet_setting_edit'">
 						<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
 					</div>
 				</div>
diff --git a/src/views/wallet/wallet-setting/components/off-line/index.vue b/src/views/wallet/wallet-setting/components/off-line/index.vue
index 3f9804c..5abfd92 100644
--- a/src/views/wallet/wallet-setting/components/off-line/index.vue
+++ b/src/views/wallet/wallet-setting/components/off-line/index.vue
@@ -1,80 +1,91 @@
 <template>
-    <div class="w100">
-        <div class="layout-padding-auto layout-padding-view">
-            <div class="flex justify-center flex-col">
-                <div>
-                    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="180px"
-                        v-loading="loading">
-                        <el-row :gutter="24">
-                            <el-col :span="24" class="mb20">
-                                <el-form-item label="离线订单是否需要审批" prop="offLineOrderApplyEnable">
-                                    <el-switch active-value="1" inactive-value="0"
-                                        v-model="form.offLineOrderApplyEnable" active-text="开启" inactive-text="关闭"
-                                        inline-prompt />
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                </div>
-                <div class="flex items-center">
-                    <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-                </div>
-            </div>
-        </div>
-    </div>
+	<div class="w100">
+		<div class="layout-padding-auto layout-padding-view">
+			<div class="flex justify-center flex-col">
+				<div>
+					<el-form
+						ref="dataFormRef"
+						:model="form"
+						:rules="dataRules"
+						formDialogRef
+						label-width="180px"
+						v-loading="loading"
+					>
+						<el-row :gutter="24">
+							<el-col :span="24" class="mb20">
+								<el-form-item label="离线订单是否需要审批" prop="offLineOrderApplyEnable">
+									<el-switch
+										active-value="1"
+										inactive-value="0"
+										v-model="form.offLineOrderApplyEnable"
+										active-text="开启"
+										inactive-text="关闭"
+										inline-prompt
+									/>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+				</div>
+				<div class="flex items-center" v-auth="'wallet_setting_edit'">
+					<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script setup lang="ts" name="code">
-import { useDict } from '/@/hooks/dict'
+import { useDict } from "/@/hooks/dict"
 import { storePrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const loading = ref(false)
 // 提交表单数据
 const form = reactive({
-    id: '',
-    offLineOrderApplyEnable: '',
-});
+	id: "",
+	offLineOrderApplyEnable: "",
+})
 // 定义校验规则
 const dataRules = ref({
-    offLineOrderApplyEnable: [{ required: true, message: '离线订单是否需要审批', trigger: 'change' }],
+	offLineOrderApplyEnable: [{ required: true, message: "离线订单是否需要审批", trigger: "change" }],
 })
 
 onMounted(() => {
-    getwalletRechargePackageData('1')
+	getwalletRechargePackageData("1")
 })
 
 // 提交
 const onSubmit = async () => {
-    const valid = await dataFormRef.value.validate().catch(() => { });
-    if (!valid) return false;
-
-    try {
-        loading.value = true;
-        const pa = {
-            ...form,
-        }
-        await putObj(pa)
-        useMessage().success('修改成功');
-    } catch (err: any) {
-        useMessage().error(err.msg);
-    } finally {
-        loading.value = false;
-    }
-};
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
+	try {
+		loading.value = true
+		const pa = {
+			...form,
+		}
+		await putObj(pa)
+		useMessage().success("修改成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getwalletRechargePackageData = (id: string) => {
-    // 获取数据
-    loading.value = true
-    getObj(id).then((res: any) => {
-        Object.assign(form, res.data)
-    }).finally(() => {
-        loading.value = false
-    })
-};
-
-</script>
\ No newline at end of file
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/src/views/wallet/wallet-setting/components/refund/index.vue b/src/views/wallet/wallet-setting/components/refund/index.vue
index 82ffb9e..3b5ba4c 100644
--- a/src/views/wallet/wallet-setting/components/refund/index.vue
+++ b/src/views/wallet/wallet-setting/components/refund/index.vue
@@ -1,38 +1,64 @@
 <template>
-    <div class="w100">
-        <div class="layout-padding-auto layout-padding-view">
-            <div class="flex justify-center flex-col">
-                <div>
-                    <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="退款理由" prop="afterSaleRefundReasons">
-                                    <el-select style="width: 500px;" v-model="form.afterSaleRefundReasons" allow-create
-                                        filterable multiple placeholder="请输入退款理由">
-                                        <el-option v-for="reason in form.afterSaleRefundReasons" :key="reason"
-                                            :label="reason" :value="reason" />
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="24" class="mb20">
-                                <el-form-item label="退货理由" prop="afterSaleReturnReasons">
-                                    <el-select style="width: 500px;" v-model="form.afterSaleReturnReasons" allow-create
-                                        filterable multiple placeholder="请输入退货理由">
-                                        <el-option v-for="reason in form.afterSaleReturnReasons" :key="reason"
-                                            :label="reason" :value="reason" />
-                                    </el-select>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
-                    </el-form>
-                    <div class="flex items-center">
-                        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+	<div class="w100">
+		<div class="layout-padding-auto layout-padding-view">
+			<div class="flex justify-center flex-col">
+				<div>
+					<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="退款理由" prop="afterSaleRefundReasons">
+									<el-select
+										style="width: 500px"
+										v-model="form.afterSaleRefundReasons"
+										allow-create
+										filterable
+										multiple
+										placeholder="请输入退款理由"
+									>
+										<el-option
+											v-for="reason in form.afterSaleRefundReasons"
+											:key="reason"
+											:label="reason"
+											:value="reason"
+										/>
+									</el-select>
+								</el-form-item>
+							</el-col>
+							<el-col :span="24" class="mb20">
+								<el-form-item label="退货理由" prop="afterSaleReturnReasons">
+									<el-select
+										style="width: 500px"
+										v-model="form.afterSaleReturnReasons"
+										allow-create
+										filterable
+										multiple
+										placeholder="请输入退货理由"
+									>
+										<el-option
+											v-for="reason in form.afterSaleReturnReasons"
+											:key="reason"
+											:label="reason"
+											:value="reason"
+										/>
+									</el-select>
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</el-form>
+					<div class="flex items-center" v-auth="'wallet_setting_edit'">
+						<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script setup lang="ts" name="refund">
@@ -40,61 +66,61 @@ import { storePrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const loading = ref(false)
 // 提交表单数据
 const form = reactive<any>({
-    id: undefined,
-    afterSaleRefundReasons: undefined,
-    afterSaleReturnReasons: undefined,
-});
+	id: undefined,
+	afterSaleRefundReasons: undefined,
+	afterSaleReturnReasons: undefined,
+})
 // 定义校验规则
 const dataRules = ref({
-    afterSaleRefundReasons: [{ required: true, message: '请输入退款理由', trigger: 'blur' }],
-    afterSaleReturnReasons: [{ required: true, message: '请输入退货理由', trigger: 'blur' }],
+	afterSaleRefundReasons: [{ required: true, message: "请输入退款理由", trigger: "blur" }],
+	afterSaleReturnReasons: [{ required: true, message: "请输入退货理由", trigger: "blur" }],
 })
 
 onMounted(() => {
-    getwalletRechargePackageData('1')
+	getwalletRechargePackageData("1")
 })
 
 // 提交
 const onSubmit = async () => {
-    const valid = await dataFormRef.value.validate().catch(() => { });
-    if (!valid) return false;
-    try {
-        loading.value = true;
-        const pa = {
-            ...form,
-            afterSaleRefundReasons: form.afterSaleRefundReasons?.join(","),
-            afterSaleReturnReasons: form.afterSaleReturnReasons?.join(",")
-        }
-        await putObj(pa)
-        useMessage().success('修改成功');
-    } catch (err: any) {
-        useMessage().error(err.msg);
-    } finally {
-        loading.value = false;
-    }
-};
-
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+	try {
+		loading.value = true
+		const pa = {
+			...form,
+			afterSaleRefundReasons: form.afterSaleRefundReasons?.join(","),
+			afterSaleReturnReasons: form.afterSaleReturnReasons?.join(","),
+		}
+		await putObj(pa)
+		useMessage().success("修改成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const getwalletRechargePackageData = (id: string) => {
-    // 获取数据
-    loading.value = true
-    getObj(id).then((res: any) => {
-        const data: any = res.data;
-        if (data.afterSaleRefundReasons) {
-            data.afterSaleRefundReasons = data.afterSaleRefundReasons?.split(",")
-        }
-        if (data.afterSaleReturnReasons) {
-            data.afterSaleReturnReasons = data.afterSaleReturnReasons?.split(",")
-        }
-        Object.assign(form, data)
-    }).finally(() => {
-        loading.value = false
-    })
-};
-
-</script>
\ No newline at end of file
+	// 获取数据
+	loading.value = true
+	getObj(id)
+		.then((res: any) => {
+			const data: any = res.data
+			if (data.afterSaleRefundReasons) {
+				data.afterSaleRefundReasons = data.afterSaleRefundReasons?.split(",")
+			}
+			if (data.afterSaleReturnReasons) {
+				data.afterSaleReturnReasons = data.afterSaleReturnReasons?.split(",")
+			}
+			Object.assign(form, data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
+</script>
diff --git a/src/views/wallet/wallet-setting/index.vue b/src/views/wallet/wallet-setting/index.vue
index f159c64..2d83fa9 100644
--- a/src/views/wallet/wallet-setting/index.vue
+++ b/src/views/wallet/wallet-setting/index.vue
@@ -1,45 +1,42 @@
 <template>
-    <div class="layout-padding">
-        <div class="layout-padding-auto layout-padding-view">
-            <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
-                <div v-for="(v) in data.tabList" :key="v.id">
-                    <el-tab-pane :label="v.label" :name="v.id">
-                        <div></div>
-                    </el-tab-pane>
-                </div>
-            </el-tabs>
-            <div class="flex justify-center">
-                <recharge-package v-if="activeName == 10" />
-                <extra-price v-if="activeName == 20" />
-                <refund v-if="activeName == 30" />
-                <Code v-if="activeName == 40" />
-                <off-line v-if="activeName == 50" />
-            </div>
-        </div>
-    </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+				<div v-for="v in data.tabList" :key="v.id">
+					<el-tab-pane :label="v.label" :name="v.id">
+						<div></div>
+					</el-tab-pane>
+				</div>
+			</el-tabs>
+			<div class="flex justify-center">
+				<recharge-package v-if="activeName == 10" />
+				<extra-price v-if="activeName == 20" />
+				<refund v-if="activeName == 30" />
+				<Code v-if="activeName == 40" />
+				<off-line v-if="activeName == 50" />
+			</div>
+		</div>
+	</div>
 </template>
 
 <script setup lang="ts">
-
-const RechargePackage = defineAsyncComponent(() => import('./components/recharge-package/index.vue'));
-const Code = defineAsyncComponent(() => import('./components/code/index.vue'));
-const Refund = defineAsyncComponent(() => import('./components/refund/index.vue'));
-const OffLine = defineAsyncComponent(() => import('./components/off-line/index.vue'));
-const ExtraPrice = defineAsyncComponent(() => import('./components/extra-price/index.vue'));
+const RechargePackage = defineAsyncComponent(() => import("./components/recharge-package/index.vue"))
+const Code = defineAsyncComponent(() => import("./components/code/index.vue"))
+const Refund = defineAsyncComponent(() => import("./components/refund/index.vue"))
+const OffLine = defineAsyncComponent(() => import("./components/off-line/index.vue"))
+const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/index.vue"))
 
 const data = {
-    tabList: [
-        { id: 10, label: "充值套餐" },
-        { id: 20, label: "每餐额定金额配置" },
-        { id: 30, label: "退款配置" },
-        { id: 40, label: "二维码配置" },
-        { id: 50, label: "离线配置" },
-    ]
+	tabList: [
+		{ id: 10, label: "充值套餐" },
+		{ id: 20, label: "每餐额定金额配置" },
+		{ id: 30, label: "退款配置" },
+		{ id: 40, label: "二维码配置" },
+		{ id: 50, label: "离线配置" },
+	],
 }
 
 const activeName = ref(data.tabList[0].id)
 
-const handleClick = (e: any) => {
-}
-
-</script>
\ No newline at end of file
+const handleClick = (e: any) => {}
+</script>

From 1beb70d4aa069cdb6b547a3902a2681bf45ad2ec Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Sun, 19 Jan 2025 13:37:13 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .gitignore                                    |   3 +
 src/views/admin/system/menu/index.vue         | 164 +++++++++++-------
 src/views/admin/system/user/form.vue          |   2 +-
 src/views/canteen/canteenCategory/index.vue   | 106 +++++++----
 src/views/canteen/canteenDailyMenu/index.vue  |   3 +
 .../canteen/canteenOnlineCategory/index.vue   |  83 +++++----
 src/views/canteen/canteenOnlineSpu/index.vue  |   8 +-
 src/views/canteen/canteenSpu/index.vue        |   9 +-
 9 files changed, 239 insertions(+), 143 deletions(-)

diff --git a/.env.development b/.env.development
index 2e10aaf..22e3399 100644
--- a/.env.development
+++ b/.env.development
@@ -18,8 +18,8 @@ VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 #  VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
-# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
+# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
+VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/.gitignore b/.gitignore
index 4a204e5..2554c2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@ docker/dist
 
 
 # local env files
+.env
+.env.development
+.env.prod
 .env.local
 .env.*.local
 
diff --git a/src/views/admin/system/menu/index.vue b/src/views/admin/system/menu/index.vue
index f0755ad..f35e42c 100644
--- a/src/views/admin/system/menu/index.vue
+++ b/src/views/admin/system/menu/index.vue
@@ -4,20 +4,25 @@
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
 				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
 					<el-form-item :label="$t('sysmenu.name')" prop="menuName">
-						<el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px" v-model="state.queryForm.menuName" />
+						<el-input
+							:placeholder="$t('sysmenu.inputNameTip')"
+							clearable
+							style="max-width: 180px"
+							v-model="state.queryForm.menuName"
+						/>
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="query" class="ml10" icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button @click="onOpenAddMenu" class="ml10" icon="folder-add" type="primary" v-auth="'sys_menu_add'">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<right-toolbar
 						v-model:showSearch="showSearch"
@@ -37,41 +42,68 @@
 				style="width: 100%"
 				v-loading="state.loading"
 				border
-				:cell-style="tableStyle.cellStyle"
 				:header-cell-style="tableStyle?.headerCellStyle"
 			>
-				<el-table-column :label="$t('sysmenu.name')" fixed prop="name" show-overflow-tooltip></el-table-column>
-				<el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder" show-overflow-tooltip></el-table-column>
-				<el-table-column :label="$t('sysmenu.icon')" prop="icon" show-overflow-tooltip>
+				<el-table-column
+					:label="$t('sysmenu.name')"
+					fixed
+					prop="name"
+					align="left"
+					show-overflow-tooltip
+					min-width="200"
+				/>
+				<el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder" align="center" show-overflow-tooltip />
+				<el-table-column :label="$t('sysmenu.icon')" prop="icon" show-overflow-tooltip align="center">
 					<template #default="scope">
 						<SvgIcon :name="scope.row.meta.icon" />
 					</template>
 				</el-table-column>
-				<el-table-column :label="$t('sysmenu.path')" prop="path" show-overflow-tooltip></el-table-column>
-				<el-table-column :label="$t('sysmenu.menuType')" show-overflow-tooltip>
+				<el-table-column :label="$t('sysmenu.path')" prop="path" show-overflow-tooltip align="center" />
+				<el-table-column :label="$t('sysmenu.menuType')" show-overflow-tooltip align="center">
 					<template #default="scope">
 						<el-tag v-if="scope.row.menuType === '0'">左菜单</el-tag>
 						<el-tag v-if="scope.row.menuType === '2'">顶菜单</el-tag>
 						<el-tag type="success" v-if="scope.row.menuType === '1'">按钮</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column :label="$t('sysmenu.keepAlive')" show-overflow-tooltip>
+				<el-table-column :label="$t('sysmenu.keepAlive')" show-overflow-tooltip align="center">
 					<template #default="scope">
 						<el-tag v-if="scope.row.meta.isKeepAlive">开启</el-tag>
 						<el-tag type="info" v-else>关闭</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column :label="$t('sysmenu.permission')" :show-overflow-tooltip="true" prop="permission"></el-table-column>
-				<el-table-column :label="$t('common.action')" show-overflow-tooltip width="250">
+				<el-table-column
+					:label="$t('sysmenu.permission')"
+					:show-overflow-tooltip="true"
+					prop="permission"
+					align="center"
+				/>
+				<el-table-column :label="$t('common.action')" show-overflow-tooltip width="250" align="center">
 					<template #default="scope">
-						<el-button icon="folder-add" @click="onOpenAddMenu('add', scope.row)" text type="primary" v-auth="'sys_menu_add'">
-							{{ $t('common.addBtn') }}
+						<el-button
+							icon="folder-add"
+							@click="onOpenAddMenu('add', scope.row)"
+							text
+							type="primary"
+							v-auth="'sys_menu_add'"
+						>
+							{{ $t("common.addBtn") }}
 						</el-button>
-						<el-button icon="edit-pen" @click="onOpenEditMenu('edit', scope.row)" text type="primary" v-auth="'sys_menu_edit'"
-							>{{ $t('common.editBtn') }}
+						<el-button
+							icon="edit-pen"
+							@click="onOpenEditMenu('edit', scope.row)"
+							text
+							type="primary"
+							v-auth="'sys_menu_edit'"
+							>{{ $t("common.editBtn") }}
 						</el-button>
 
-						<el-tooltip icon="delete" :content="$t('sysmenu.deleteDisabledTip')" :disabled="!deleteMenuDisabled(scope.row)" placement="top">
+						<el-tooltip
+							icon="delete"
+							:content="$t('sysmenu.deleteDisabledTip')"
+							:disabled="!deleteMenuDisabled(scope.row)"
+							placement="top"
+						>
 							<span style="margin-left: 12px">
 								<el-button
 									icon="delete"
@@ -81,7 +113,7 @@
 									type="primary"
 									v-auth="'sys_menu_del'"
 								>
-									{{ $t('common.delBtn') }}
+									{{ $t("common.delBtn") }}
 								</el-button>
 							</span>
 						</el-tooltip>
@@ -94,99 +126,99 @@
 </template>
 
 <script lang="ts" name="systemMenu" setup>
-import { delObj, pageList } from '/@/api/admin/menu';
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
+import { delObj, pageList } from "/@/api/admin/menu"
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 // 引入组件
-const MenuDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const MenuDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义变量内容
-const tableRef = ref();
-const menuDialogRef = ref();
-const showSearch = ref(true);
-const queryRef = ref();
+const tableRef = ref()
+const menuDialogRef = ref()
+const showSearch = ref(true)
+const queryRef = ref()
 const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: pageList, // H
 	queryForm: {
 		parentId: -1,
-		menuName: '',
+		menuName: "",
 	},
 	isPage: false,
-});
+})
 
-const { getDataList, tableStyle } = useTable(state);
+const { getDataList, tableStyle } = useTable(state)
 
 // 根据类型判断是否有子节点
 const setHasChildren = (arr: any[]) => {
 	arr.forEach((item) => {
 		// 添加 hasChildren 属性
-		item.hasChildren = item.menuType !== '1';
-	});
-};
+		item.hasChildren = item.menuType !== "1"
+	})
+}
 const tableList = computed(() => {
-	const list = state.dataList;
+	const list = state.dataList
 	if (Array.isArray(list)) {
-		setHasChildren(list);
+		setHasChildren(list)
 	}
-	return list;
-});
+	return list
+})
 
 // 打开新增菜单弹窗
 const onOpenAddMenu = (type?: string, row?: any) => {
-	menuDialogRef.value.openDialog(type, row);
-};
+	menuDialogRef.value.openDialog(type, row)
+}
 // 打开编辑菜单弹窗
 const onOpenEditMenu = (type: string, row: any) => {
-	menuDialogRef.value.openDialog(type, row);
-};
+	menuDialogRef.value.openDialog(type, row)
+}
 
 //是否禁用删除
 const deleteMenuDisabled = (row: any) => {
-	return (row.children || []).length > 0;
-};
+	return (row.children || []).length > 0
+}
 
 // 搜索事件
 const query = () => {
-	state.dataList = [];
-	state.queryForm.parentId = undefined;
-	getDataList();
-};
+	state.dataList = []
+	state.queryForm.parentId = undefined
+	getDataList()
+}
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	state.dataList = [];
-	getDataList();
-};
+	queryRef.value.resetFields()
+	state.dataList = []
+	getDataList()
+}
 
 const load = (row: any, treeNode: unknown, resolve: (date: any[]) => void) => {
 	const param = {
 		parentId: row.id,
-	};
+	}
 	pageList(param).then((res) => {
-		const childrenList = res.data;
+		const childrenList = res.data
 		if (Array.isArray(childrenList)) {
-			setHasChildren(childrenList);
+			setHasChildren(childrenList)
 		}
-		resolve(childrenList);
-	});
-};
+		resolve(childrenList)
+	})
+}
 
 // 删除操作
 const handleDelete = async (row: any) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(row.id);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(row.id)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index 63122a2..e8aa791 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -187,7 +187,7 @@ const dataRules = ref({
 		},
 	],
 	email: [
-		{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] },
+		{ required: true, message: "请输入正确的邮箱地址", trigger: ["blur", "change"] },
 		{ validator: rule.overLength, trigger: "blur" },
 	],
 	lockFlag: [{ required: true, message: "状态不能为空", trigger: "blur" }],
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index 8641c10..ad45669 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -7,17 +7,32 @@
 						<el-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
-						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenCategory_view'">
+							查询
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenCategory_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'canteen_canteenCategory_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'canteen_canteenCategory_add'"
+					>
 						新 增
 					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'canteen_canteenCategory_del'" @click="handleDelete(selectObjs)">
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'canteen_canteenCategory_del'"
+						@click="handleDelete(selectObjs)"
+					>
 						删 除
 					</el-button>
 					<right-toolbar
@@ -27,7 +42,7 @@
 						class="ml10 mr20"
 						style="float: right"
 						@queryTable="getDataList"
-					></right-toolbar>
+					/>
 				</div>
 			</el-row>
 			<el-table
@@ -57,10 +72,24 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenCategory_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'canteen_canteenCategory_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenCategory_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'canteen_canteenCategory_del'"
+							@click="handleDelete([scope.row.id])"
+						>
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -73,66 +102,71 @@
 </template>
 
 <script setup lang="ts" name="systemCanteenCategory">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/canteen/canteenCategory';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/canteenCategory"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
-const { daily_menu } = useDict('daily_menu');
+const { daily_menu } = useDict("daily_menu")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/canteen/canteenCategory/export', Object.assign(state.queryForm, { ids: selectObjs }), 'canteenCategory.xlsx');
-};
+	downBlobFile(
+		"/canteen/canteenCategory/export",
+		Object.assign(state.queryForm, { ids: selectObjs }),
+		"canteenCategory.xlsx",
+	)
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index 9454213..b98eb1a 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -85,6 +85,7 @@ import { getAllSimple as getCanteenCategory } from "/@/api/canteen/canteenCatego
 import { useMessage } from "/@/hooks/message"
 import { pageJoin } from "/@/api/wallet/mch-manage"
 import { displayPrice } from "/@/utils/formatMoney"
+import { auth } from "/@/utils/authFunction"
 
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH
@@ -110,6 +111,7 @@ const merchantId = ref() // 商户Id
 const merchantInfo = ref<any>([])
 
 const addFood = async (hourType: number) => {
+	if (!auth("canteen_canteenDailyMenu_add")) return
 	if (!merchantId.value) {
 		useMessage().error("请选择商户再进行新增")
 		return
@@ -182,6 +184,7 @@ const selectTimeFood = async () => {
 
 // 删除菜品
 const delteData = async (tid: number) => {
+	if (!auth("canteen_canteenDailyMenu_del")) return
 	ElMessageBox.confirm("确定删除菜品吗？", "删除菜品", {
 		confirmButtonText: "确定",
 		cancelButtonText: "取消",
diff --git a/src/views/canteen/canteenOnlineCategory/index.vue b/src/views/canteen/canteenOnlineCategory/index.vue
index 9c04360..50c8e93 100644
--- a/src/views/canteen/canteenOnlineCategory/index.vue
+++ b/src/views/canteen/canteenOnlineCategory/index.vue
@@ -7,14 +7,22 @@
 						<el-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
-						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenOnlineCategory_view'">
+							查询
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenOnlineCategory_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'canteen_canteenOnlineCategory_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'canteen_canteenOnlineCategory_add'"
+					>
 						新 增
 					</el-button>
 					<el-button
@@ -34,7 +42,7 @@
 						class="ml10 mr20"
 						style="float: right"
 						@queryTable="getDataList"
-					></right-toolbar>
+					/>
 				</div>
 			</el-row>
 			<el-table
@@ -67,7 +75,13 @@
 						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenOnlineCategory_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'canteen_canteenOnlineCategory_del'"
+							@click="handleDelete([scope.row.id])"
+						>
 							删除
 						</el-button>
 					</template>
@@ -82,64 +96,69 @@
 </template>
 
 <script setup lang="ts" name="systemCanteenOnlineCategory">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/canteen/canteenOnlineCategory';
-import { useMessage, useMessageBox } from '/@/hooks/message';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/canteenOnlineCategory"
+import { useMessage, useMessageBox } from "/@/hooks/message"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/canteen/canteenOnlineCategory/export', Object.assign(state.queryForm, { ids: selectObjs }), 'canteenOnlineCategory.xlsx');
-};
+	downBlobFile(
+		"/canteen/canteenOnlineCategory/export",
+		Object.assign(state.queryForm, { ids: selectObjs }),
+		"canteenOnlineCategory.xlsx",
+	)
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue
index 7248262..2dfede9 100644
--- a/src/views/canteen/canteenOnlineSpu/index.vue
+++ b/src/views/canteen/canteenOnlineSpu/index.vue
@@ -10,8 +10,10 @@
 						<select-ctcgol v-model="state.queryForm.categoryId" style="width: 200px" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
-						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenOnlineSpu_view'">
+							查询
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenOnlineSpu_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
@@ -43,7 +45,7 @@
 						class="ml10 mr20"
 						style="float: right"
 						@queryTable="getDataList"
-					></right-toolbar>
+					/>
 				</div>
 			</el-row>
 			<el-table
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index a1c926c..4f36d18 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -10,8 +10,10 @@
 						<select-ctcg v-model="state.queryForm.categoryId" style="width: 200px" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList">查询</el-button>
-						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenSpu_view'">
+							查询
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenSpu_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
@@ -108,8 +110,9 @@
 							type="primary"
 							v-auth="'canteen_canteenSpu_del'"
 							@click="handleDelete([scope.row.id])"
-							>删除</el-button
 						>
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>

From c4f10ac9febbc39d804b6ae45247f454b481a2f7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 19 Jan 2025 15:34:30 +0800
Subject: [PATCH 04/11] =?UTF-8?q?feat:=E9=85=8D=E7=BD=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-order/index.vue           | 19 ++++++++++++-------
 .../wallet-setting/components/code/index.vue  |  4 ++++
 .../components/extra-price/index.vue          |  5 +++++
 .../components/off-line/index.vue             |  3 +++
 .../components/refund/index.vue               |  4 ++++
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 7d1e38a..69b0e56 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -58,13 +58,13 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column width="200px" label="商品简要信息">
+				<el-table-column width="200px" label="商品">
 					<template #default="{ row }">
 						<div class="desc">
 							<span>商品</span>
-							<span>
-								{{ row.productDesc }}
-							</span>
+							<el-tooltip :content="row.productDesc" placement="top-start">
+								<span class="text-line">{{ row.productDesc }}</span>
+							</el-tooltip>
 						</div>
 						<div class="status" v-if="row.hourType">
 							<span>用餐时间段</span>
@@ -178,15 +178,13 @@
 				</el-table-column>
 				<el-table-column fixed="right" label="操作" width="200">
 					<template #default="{ row }">
-						<div class="flex justify-between">
+						<div class="grid grid-cols-2">
 							<el-button icon="Printer" text type="primary" @click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
 								打印发票
 							</el-button>
 							<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)">
 								购物车
 							</el-button>
-						</div>
-						<div class="flex justify-between">
 							<el-button icon="Money" link type="primary" @click="transactionListRef.openDialog(row.walletId)">
 								钱包明细
 							</el-button>
@@ -347,6 +345,13 @@ const handleDelete = async (ids: string[]) => {
 </script>
 
 <style scoped lang="scss">
+.text-line {
+	display: inline-block;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
 .desc {
 	display: flex;
 	align-items: center;
diff --git a/src/views/wallet/wallet-setting/components/code/index.vue b/src/views/wallet/wallet-setting/components/code/index.vue
index fc216df..3e3f89e 100644
--- a/src/views/wallet/wallet-setting/components/code/index.vue
+++ b/src/views/wallet/wallet-setting/components/code/index.vue
@@ -15,6 +15,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="钱包二维码自动刷新" prop="refreshQrCodeEnable">
 									<el-switch
+										:disabled="!auth('wallet_setting_edit')"
 										active-value="1"
 										inactive-value="0"
 										v-model="form.refreshQrCodeEnable"
@@ -27,6 +28,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="钱包二维码自动刷新间隔" prop="refreshQrCodeFre">
 									<el-input
+										:disabled="!auth('wallet_setting_edit')"
 										style="width: 300px"
 										type="number"
 										v-model="form.refreshQrCodeFre"
@@ -52,6 +54,8 @@ import { useDict } from "/@/hooks/dict"
 import { storePrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+import { auth } from "/@/utils/authFunction"
+
 // 定义变量内容
 const dataFormRef = ref()
 const loading = ref(false)
diff --git a/src/views/wallet/wallet-setting/components/extra-price/index.vue b/src/views/wallet/wallet-setting/components/extra-price/index.vue
index ef5b259..2c5ff65 100644
--- a/src/views/wallet/wallet-setting/components/extra-price/index.vue
+++ b/src/views/wallet/wallet-setting/components/extra-price/index.vue
@@ -15,6 +15,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="每一餐的上限" prop="payAmountEnable">
 									<el-switch
+										:disabled="!auth('wallet_setting_edit')"
 										active-value="1"
 										inactive-value="0"
 										v-model="form.payAmountEnable"
@@ -27,6 +28,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="每一餐的上限" prop="payAmountMealLimit">
 									<el-input
+										:disabled="!auth('wallet_setting_edit')"
 										style="width: 300px"
 										type="number"
 										v-model="form.payAmountMealLimit"
@@ -39,6 +41,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="倍数" prop="payAmountMealTimes">
 									<el-input
+										:disabled="!auth('wallet_setting_edit')"
 										style="width: 300px"
 										type="number"
 										v-model="form.payAmountMealTimes"
@@ -63,6 +66,8 @@
 import { storePrice, displayPrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+import { auth } from "/@/utils/authFunction"
+
 // 定义变量内容
 const dataFormRef = ref()
 const loading = ref(false)
diff --git a/src/views/wallet/wallet-setting/components/off-line/index.vue b/src/views/wallet/wallet-setting/components/off-line/index.vue
index 5abfd92..11763d5 100644
--- a/src/views/wallet/wallet-setting/components/off-line/index.vue
+++ b/src/views/wallet/wallet-setting/components/off-line/index.vue
@@ -15,6 +15,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="离线订单是否需要审批" prop="offLineOrderApplyEnable">
 									<el-switch
+										:disabled="!auth('wallet_setting_edit')"
 										active-value="1"
 										inactive-value="0"
 										v-model="form.offLineOrderApplyEnable"
@@ -40,6 +41,8 @@ import { useDict } from "/@/hooks/dict"
 import { storePrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+import { auth } from "/@/utils/authFunction"
+
 // 定义变量内容
 const dataFormRef = ref()
 const loading = ref(false)
diff --git a/src/views/wallet/wallet-setting/components/refund/index.vue b/src/views/wallet/wallet-setting/components/refund/index.vue
index 3b5ba4c..663689d 100644
--- a/src/views/wallet/wallet-setting/components/refund/index.vue
+++ b/src/views/wallet/wallet-setting/components/refund/index.vue
@@ -15,6 +15,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="退款理由" prop="afterSaleRefundReasons">
 									<el-select
+										:disabled="!auth('wallet_setting_edit')"
 										style="width: 500px"
 										v-model="form.afterSaleRefundReasons"
 										allow-create
@@ -34,6 +35,7 @@
 							<el-col :span="24" class="mb20">
 								<el-form-item label="退货理由" prop="afterSaleReturnReasons">
 									<el-select
+										:disabled="!auth('wallet_setting_edit')"
 										style="width: 500px"
 										v-model="form.afterSaleReturnReasons"
 										allow-create
@@ -65,6 +67,8 @@
 import { storePrice } from "/@/utils/formatMoney"
 import { useMessage } from "/@/hooks/message"
 import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+import { auth } from "/@/utils/authFunction"
+
 // 定义变量内容
 const dataFormRef = ref()
 const loading = ref(false)

From 7f48dbbc1c332cba7ce40b7d9e07e8fb02855068 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Sun, 19 Jan 2025 15:34:44 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index c4e0f9d..d7e017d 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -4,6 +4,7 @@
 			<pane size="15">
 				<div class="layout-padding-auto layout-padding-view">
 					<el-scrollbar>
+						<el-switch v-model="isQueryAll" inactive-text="查当前" active-text="查全部" />
 						<query-tree
 							:placeholder="$t('common.queryDeptTip')"
 							:query="deptData.queryList"
@@ -232,6 +233,7 @@ const excelUploadRef = ref()
 const queryRef = ref()
 const showSearch = ref(true)
 const inputPassword = ref()
+const isQueryAll = ref(false) // 是否查全部
 
 // 多选rows
 const selectObjs = ref([]) as any
@@ -245,7 +247,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 		username: "",
 		phone: "",
 	},
-	pageList: pageList,
+	pageList: async () => await pageList(isQueryAll.value ? { ...state.queryForm, deptId: "" } : state.queryForm),
 })
 const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 

From 238776cd2c813409e87cc4b2967574799690dce0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 19 Jan 2025 15:50:26 +0800
Subject: [PATCH 06/11] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E9=83=A8=E9=97=A8=E5=92=8C=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8F=8A=E5=85=B6=E5=AD=90=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/index.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index d7e017d..314e2f9 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -4,7 +4,6 @@
 			<pane size="15">
 				<div class="layout-padding-auto layout-padding-view">
 					<el-scrollbar>
-						<el-switch v-model="isQueryAll" inactive-text="查当前" active-text="查全部" />
 						<query-tree
 							:placeholder="$t('common.queryDeptTip')"
 							:query="deptData.queryList"
@@ -29,6 +28,14 @@
 							</template>
 						</query-tree>
 					</el-scrollbar>
+					<div class="flex justify-center items-center pt-2">
+						<el-switch
+							v-model="state.queryForm.isDeepDept"
+							@change="isDeepDeptChange"
+							inactive-text="当前部门"
+							active-text="当前部门及子部门"
+						/>
+					</div>
 				</div>
 			</pane>
 			<pane class="ml8">
@@ -260,6 +267,10 @@ const deptData = reactive({
 	},
 })
 
+const isDeepDeptChange = () => {
+	getDataList()
+}
+
 // 清空搜索条件
 const resetQuery = () => {
 	queryRef.value?.resetFields()

From c0d9b6a7b122cbf89a71ac8383a3b8ec2b49af17 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 19 Jan 2025 16:18:27 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2b?=
 =?UTF-8?q?ug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 314e2f9..94c5dfb 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -253,6 +253,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 		deptId: "",
 		username: "",
 		phone: "",
+		isDeepDept: false,
 	},
 	pageList: async () => await pageList(isQueryAll.value ? { ...state.queryForm, deptId: "" } : state.queryForm),
 })

From e2988f7354d3b8872ac9d1d586b46c3fc3557aa1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 19 Jan 2025 16:43:12 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/form.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index e8aa791..14e71ca 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -186,10 +186,7 @@ const dataRules = ref({
 			trigger: "blur",
 		},
 	],
-	email: [
-		{ required: true, message: "请输入正确的邮箱地址", trigger: ["blur", "change"] },
-		{ validator: rule.overLength, trigger: "blur" },
-	],
+	email: [{ validator: rule.overLength, trigger: "blur" }],
 	lockFlag: [{ required: true, message: "状态不能为空", trigger: "blur" }],
 })
 

From 6dfeb5a9e276e80819445229f126d572c16101e1 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Sun, 19 Jan 2025 17:41:56 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=AF=8F=E6=AC=A1=E8=8F=9C=E5=93=81?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E8=A1=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/user/index.vue       |  3 +--
 src/views/canteen/canteenDailyMenu/form.vue | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index 314e2f9..be71f33 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -240,7 +240,6 @@ const excelUploadRef = ref()
 const queryRef = ref()
 const showSearch = ref(true)
 const inputPassword = ref()
-const isQueryAll = ref(false) // 是否查全部
 
 // 多选rows
 const selectObjs = ref([]) as any
@@ -254,7 +253,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 		username: "",
 		phone: "",
 	},
-	pageList: async () => await pageList(isQueryAll.value ? { ...state.queryForm, deptId: "" } : state.queryForm),
+	pageList: pageList,
 })
 const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 96825e9..17e878e 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -101,6 +101,8 @@
 			@selection-change="selectionChangeHandle"
 			:row-key="(row:any) => row.id"
 			:reserve-selection="true"
+			@row-click="rowClick"
+			:row-style="{ cursor: 'pointer' }"
 		>
 			<el-table-column type="selection" width="40" align="center" />
 			<el-table-column type="index" label="#" width="50" align="center" />
@@ -112,7 +114,7 @@
 			</el-table-column>
 			<el-table-column prop="picUrl" label="商品封面图" align="center" show-overflow-tooltip>
 				<template #default="scope">
-					<preview-image :src="scope.row.picUrl" />
+					<preview-image @click.stop :src="scope.row.picUrl" />
 				</template>
 			</el-table-column>
 			<el-table-column prop="sort" label="排序字段" align="center" show-overflow-tooltip />
@@ -234,6 +236,20 @@ const selectionChangeHandle = (objs: any) => {
 	// selectObjs.value = objs
 }
 
+// 点击表格行
+const rowClick = (row: any) => {
+	selectObjs.value.findIndex((item: any) => item.id === row.id) === -1
+		? // selectObjs.value.indexOf(row) === -1
+		  selectObjs.value.push(row)
+		: selectObjs.value.splice(
+				// selectObjs.value.indexOf(row)
+				selectObjs.value.findIndex((item: any) => item.id === row.id),
+				1,
+		  )
+	console.log(selectObjs.value)
+	foodMultipleTableRef.value.toggleRowSelection(row)
+}
+
 // 清空搜索条件
 const resetQuery = () => {
 	queryRef.value?.resetFields()

From ebff17f4ab31c069f60230de0893e37d2450e72b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 19 Jan 2025 21:19:24 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-manager/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/hard/hard-manager/index.vue b/src/views/hard/hard-manager/index.vue
index 19dfda9..276368b 100644
--- a/src/views/hard/hard-manager/index.vue
+++ b/src/views/hard/hard-manager/index.vue
@@ -135,7 +135,6 @@
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
-
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 		<face-form-dialog ref="faceFormDialogRef" @refresh="getDataList(false)" />

From fad6c2a6d31ab2afe96ec5272f87a907baf40137 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Mon, 20 Jan 2025 10:29:47 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E9=92=B1=E5=8C=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E8=A1=8C=E5=B0=BE=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet-recharge-apply/preview-excel.vue   | 93 +++++++++++++++++--
 1 file changed, 83 insertions(+), 10 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/preview-excel.vue b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
index a8a3b02..07be34a 100644
--- a/src/views/wallet/wallet-recharge-apply/preview-excel.vue
+++ b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
@@ -6,7 +6,14 @@
 					<right-toolbar class="ml10 mr20" style="float: right" :search="false" @queryTable="getList" />
 				</div>
 			</el-row>
-			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle">
+			<el-table
+				:data="data.list"
+				v-loading="state.loading"
+				border
+				:header-cell-style="tableStyle.headerCellStyle"
+				show-summary
+				:summary-method="getSummaries"
+			>
 				<el-table-column type="index" label="#" align="center" width="60" />
 				<el-table-column prop="username" label="用户" align="center" />
 				<el-table-column prop="userAvatar" label="头像" align="center">
@@ -15,13 +22,13 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="userMobile" label="手机号" align="center" />
-				<el-table-column prop="username" label="操作金额" align="center">
+				<el-table-column prop="currentImport_price" label="操作金额" align="center">
 					<template #default="{ row }">
 						<div class="color-success">{{ displayPrice(row.currentImport_price) }}</div>
 					</template>
 				</el-table-column>
 				<slot v-if="data.tableList && data.tableList.length">
-					<el-table-column v-for="(v, i) in data.tableList" :key="i" align="center">
+					<el-table-column :prop="`${'aaa' + i}`" v-for="(v, i) in data.tableList" :key="i" align="center">
 						<template #header>
 							<div>
 								{{ data.tableListStr[i] }}
@@ -30,21 +37,21 @@
 						<template #default="{ row }">
 							<div class="change">
 								<div v-if="row[`${v}_price`] >= 0" class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div>
-								<div class="change_text">
-									<div v-if="row[`${v}_transaction_price`]">
+								<!-- <div v-else class="change_price">{{ displayPrice(row[`${v}_price`]) }}</div> -->
+								<!-- <div class="change_text"> -->
+								<!-- <div v-if="row[`${v}_transaction_price`]">
 										<span>对比上月</span>
 										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']" style="margin-left: 5px">
 											{{ displayPrice(row[`${v}_transaction_price`]) }}
 										</span>
-									</div>
-									<div v-if="row[`${v}_transaction_percent`]">
+									</div> -->
+								<!-- <div v-if="row[`${v}_transaction_percent`]">
 										<span>对比上月</span>
 										<span :class="[row[`${v}_transaction_price`] >= 0 ? 'success' : 'error']" style="margin-left: 5px">
 											{{ row[`${v}_transaction_percent`] }}%
 										</span>
-									</div>
-								</div>
+									</div> -->
+								<!-- </div> -->
 							</div>
 						</template>
 					</el-table-column>
@@ -56,10 +63,19 @@
 </template>
 
 <script setup lang="ts" name="preview-excel">
+import { computed } from "vue"
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { useDict } from "/@/hooks/dict"
 import { displayPrice } from "/@/utils/formatMoney"
 import * as walletRechargeApplyApi from "/@/api/wallet/wallet-recharge-apply"
+import type { VNode } from "vue"
+import type { TableColumnCtx } from "element-plus"
+import { h } from "vue"
+
+interface SummaryMethodProps<T = any> {
+	columns: TableColumnCtx<T>[]
+	data: T[]
+}
 
 const { query } = useRoute()
 
@@ -115,10 +131,67 @@ const getList = async () => {
 		data.list = pageData.page.records
 		data.total = pageData.page.total
 		data.tableList = pageData.tableList
+		console.log(pageData.tableList)
 		data.tableListStr = pageData.tableListStr
 		state.pagination.total = pageData.page.total
 	} finally {
 		state.loading = false
 	}
 }
+
+// 表格行尾合计
+const getSummaries = (param: SummaryMethodProps) => {
+	const { columns, data: data1 } = param
+	const sums: (string | VNode | number)[] = []
+	columns.forEach((column, index) => {
+		if (index === 0) {
+			sums[index] = "合计"
+			return
+		}
+		if (column.property === "currentImport_price") {
+			const values = data1.map((item) => Number(item[column.property]))
+			if (!values.every((value) => Number.isNaN(value))) {
+				sums[index] = h("span", { style: { color: "#67C260" } }, [
+					displayPrice(
+						values.reduce((prev, curr) => {
+							const value = Number(curr)
+							if (!Number.isNaN(value)) {
+								return prev + curr
+							} else {
+								return prev
+							}
+						}, 0),
+					),
+				])
+			} else {
+				sums[index] = "NaN"
+			}
+		} else if (column.property === "aaa0") {
+			const str = data.tableList[0] + "_price"
+			sums[index] = displayPrice(
+				data.list.reduce((prev, curr) => {
+					return prev + curr[str]
+				}, 0),
+			)
+		} else if (column.property === "aaa1") {
+			const str = data.tableList[1] + "_price"
+			sums[index] = displayPrice(
+				data.list.reduce((prev, curr) => {
+					return prev + curr[str]
+				}, 0),
+			)
+		} else if (column.property === "aaa2") {
+			const str = data.tableList[2] + "_price"
+			sums[index] = displayPrice(
+				data.list.reduce((prev, curr) => {
+					return prev + curr[str]
+				}, 0),
+			)
+		} else {
+			sums[index] = ""
+		}
+	})
+
+	return sums
+}
 </script>