From aedca7f6272a2520952ae8a090cb1824918d23c1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Apr 2025 10:32:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E9=A2=86=E5=AF=BC=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-after-sale/index.vue         |  4 +++-
 src/views/hard/hard-manager/index.vue            |  2 ++
 src/views/mch/mch-manage/index.vue               |  8 +++++++-
 src/views/wallet/wallet-recharge-apply/index.vue | 15 +++++++++++++--
 src/views/wallet/wallet-type/index.vue           |  3 ++-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/views/hard/hard-after-sale/index.vue b/src/views/hard/hard-after-sale/index.vue
index fb25434..c0ecf3b 100644
--- a/src/views/hard/hard-after-sale/index.vue
+++ b/src/views/hard/hard-after-sale/index.vue
@@ -59,7 +59,9 @@
 				<el-table-column label="操作" width="200">
 					<template #default="{ row }">
 						<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.orderId)">购物车</el-button>
-						<el-button icon="WalletFilled" link type="primary" @click="doRefund(row)"> 退款 </el-button>
+						<el-button icon="WalletFilled" v-auth="'hard_hardAfterSale_adminRefund'" link type="primary" @click="doRefund(row)">
+							退款
+						</el-button>
 						<el-button
 							v-if="false"
 							icon="edit-pen"
diff --git a/src/views/hard/hard-manager/index.vue b/src/views/hard/hard-manager/index.vue
index 52b0b7e..00fad51 100644
--- a/src/views/hard/hard-manager/index.vue
+++ b/src/views/hard/hard-manager/index.vue
@@ -69,6 +69,7 @@
 					<template #default="{ row }">
 						<el-switch
 							v-if="row.type == 1"
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
 							:loading="switchTakeFoodLoading"
 							active-text="是"
 							inactive-text="否"
@@ -110,6 +111,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as hardManageApi from "/@/api/hard/hard-manager"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { useUserInfo } from "/@/stores/userInfo"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index 295ee8d..e866d83 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -138,7 +138,13 @@
 						/>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" fixed="right" min-width="300" align="center">
+				<el-table-column
+					label="操作"
+					fixed="right"
+					v-auths="['wallet_mchManage_refresh_qrcode', 'wallet_mchManage_setting', 'wallet_mchManage_edit', 'wallet_mchManage_del']"
+					min-width="300"
+					align="center"
+				>
 					<template #default="{ row }">
 						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
 							刷新二维码
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 971286e..f8332a7 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -106,14 +106,25 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column label="操作" width="300" fixed="right">
+				<el-table-column
+					label="操作"
+					v-auths="[
+						'wallet_walletRechargeApply_view',
+						'wallet_walletRechargeApply_apply',
+						'wallet_walletRechargeApply_edit',
+						'wallet_walletRechargeApply_del',
+						'wallet_walletRechargeApply_check',
+					]"
+					width="300"
+					fixed="right"
+				>
 					<template #default="{ row }">
 						<el-button
 							v-if="row.importTime"
 							icon="Document"
 							text
 							type="primary"
-							v-auth="'wallet_walletRechargeApply_edit'"
+							v-auth="'wallet_walletRechargeApply_view'"
 							@click="doInfo(row)"
 							>数据</el-button
 						>
diff --git a/src/views/wallet/wallet-type/index.vue b/src/views/wallet/wallet-type/index.vue
index 299343d..8cf3da4 100644
--- a/src/views/wallet/wallet-type/index.vue
+++ b/src/views/wallet/wallet-type/index.vue
@@ -52,7 +52,7 @@
 				<el-table-column prop="isRule" label="是否启用钱包规则" show-overflow-tooltip>
 					<template #default="{ row }">
 						<el-switch
-							v-auth="'wallet_walletManage_edit'"
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
 							active-value="1"
 							inactive-value="0"
 							v-model="row.isRule"
@@ -97,6 +97,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as walletTypeApi from "/@/api/wallet/wallet-type"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { useUserInfo } from "/@/stores/userInfo"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))

From e40cf86754297beb093c7b7673f34de721a9f0d1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Apr 2025 10:53:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=A1=86=E6=9E=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/system/dept/table-view.vue | 174 ++++++++++-----------
 src/views/admin/system/dept/tree-view.vue  | 147 +++++++++--------
 src/views/hard/hard-after-sale/index.vue   |  10 +-
 3 files changed, 173 insertions(+), 158 deletions(-)

diff --git a/src/views/admin/system/dept/table-view.vue b/src/views/admin/system/dept/table-view.vue
index 73d0d93..6a5a96b 100644
--- a/src/views/admin/system/dept/table-view.vue
+++ b/src/views/admin/system/dept/table-view.vue
@@ -1,56 +1,56 @@
 <template>
-  <el-table
-      ref="tableRef"
-      :data="state.dataList"
-      v-loading="state.loading"
-      style="width: 100%"
-      row-key="id"
-      default-expand-all
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      border
-      :cell-style="tableStyle.cellStyle"
-      :header-cell-style="tableStyle?.headerCellStyle"
-  >
-    <el-table-column :label="$t('sysdept.name')" prop="name" width="400" show-overflow-tooltip></el-table-column>
-    <el-table-column :label="$t('sysdept.weight')" prop="weight" show-overflow-tooltip width="80"></el-table-column>
-    <el-table-column prop="createTime" :label="$t('sysdept.createTime')" show-overflow-tooltip></el-table-column>
-    <el-table-column :label="$t('common.action')" show-overflow-tooltip width="250">
-      <template #default="scope">
-        <el-button text type="primary" icon="folder-add" @click="deptDialogRef.openDialog('add', scope.row?.id)"
-                   v-auth="'sys_dept_add'">
-          {{ $t('common.addBtn') }}
-        </el-button
-        >
-        <el-button text type="primary" icon="edit-pen" @click="deptDialogRef.openDialog('edit', scope.row?.id)"
-                   v-auth="'sys_dept_edit'">{{
-            $t('common.editBtn')
-          }}
-        </el-button>
-        <el-button text type="primary" icon="delete" @click="handleDelete(scope.row)" v-auth="'sys_dept_del'">
-          {{ $t('common.delBtn') }}
-        </el-button
-        >
-      </template>
-    </el-table-column>
-  </el-table>
-  <dept-form ref="deptDialogRef" @refresh="getDataList()"/>
+	<el-table
+		ref="tableRef"
+		:data="state.dataList"
+		v-loading="state.loading"
+		style="width: 100%"
+		row-key="id"
+		default-expand-all
+		:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+		border
+		:cell-style="tableStyle.cellStyle"
+		:header-cell-style="tableStyle?.headerCellStyle"
+	>
+		<el-table-column :label="$t('sysdept.name')" prop="name" width="400" show-overflow-tooltip></el-table-column>
+		<el-table-column :label="$t('sysdept.weight')" prop="weight" show-overflow-tooltip width="80"></el-table-column>
+		<el-table-column prop="createTime" :label="$t('sysdept.createTime')" show-overflow-tooltip></el-table-column>
+		<el-table-column
+			:label="$t('common.action')"
+			v-auths="['sys_dept_add', 'sys_dept_edit', 'sys_dept_del']"
+			show-overflow-tooltip
+			width="250"
+		>
+			<template #default="scope">
+				<el-button text type="primary" icon="folder-add" @click="deptDialogRef.openDialog('add', scope.row?.id)" v-auth="'sys_dept_add'">
+					{{ $t("common.addBtn") }}
+				</el-button>
+				<el-button text type="primary" icon="edit-pen" @click="deptDialogRef.openDialog('edit', scope.row?.id)" v-auth="'sys_dept_edit'"
+					>{{ $t("common.editBtn") }}
+				</el-button>
+				<el-button text type="primary" icon="delete" @click="handleDelete(scope.row)" v-auth="'sys_dept_del'">
+					{{ $t("common.delBtn") }}
+				</el-button>
+			</template>
+		</el-table-column>
+	</el-table>
+	<dept-form ref="deptDialogRef" @refresh="getDataList()" />
 </template>
 
 <script setup lang="ts" name="systemDept">
-import {BasicTableProps, useTable} from '/@/hooks/table';
-import {deptTree, delObj} from '/@/api/admin/dept';
-import {useMessage, useMessageBox} from '/@/hooks/message';
-import {useI18n} from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { deptTree, delObj } from "/@/api/admin/dept"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const DeptForm = defineAsyncComponent(() => import('./form.vue'));
-const {t} = useI18n();
+const DeptForm = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义变量内容
-const tableRef = ref(); // 表格引用
-const deptDialogRef = ref(); // 部门对话框引用
-const excelUploadRef = ref(); // Excel上传引用
-const showSearch = ref(true); // 是否显示搜索栏
-const isExpand = ref(false); // 是否展开
+const tableRef = ref() // 表格引用
+const deptDialogRef = ref() // 部门对话框引用
+const excelUploadRef = ref() // Excel上传引用
+const showSearch = ref(true) // 是否显示搜索栏
+const isExpand = ref(false) // 是否展开
 
 /**
  * 查询部门树方法，返回 Promise 对象
@@ -58,34 +58,34 @@ const isExpand = ref(false); // 是否展开
  * @returns Promise&lt;any&gt;
  */
 const queryDeptTree = (params?: any) => {
-  return deptTree(params);
-};
+	return deptTree(params)
+}
 
 /**
  * 定义响应式表格数据
  */
 const state: BasicTableProps = reactive<BasicTableProps>({
-  pageList: queryDeptTree, // 页面列表数据
-  queryForm: {
-    deptName: '', // 部门名称
-  },
-  isPage: false, // 是否分页
-  descs: ['create_time'], // 排序字段
-});
+	pageList: queryDeptTree, // 页面列表数据
+	queryForm: {
+		deptName: "", // 部门名称
+	},
+	isPage: false, // 是否分页
+	descs: ["create_time"], // 排序字段
+})
 
 /**
  * 使用 useTable 定义表格相关操作
  */
-const {getDataList, tableStyle} = useTable(state);
+const { getDataList, tableStyle } = useTable(state)
 
 /**
  * 展开/折叠部门树方法
  */
 const handleExpand = async () => {
-  isExpand.value = !isExpand.value;
-  const dataList = await deptTree();
-  toggleExpand(dataList.data, isExpand.value);
-};
+	isExpand.value = !isExpand.value
+	const dataList = await deptTree()
+	toggleExpand(dataList.data, isExpand.value)
+}
 
 /**
  * 递归方法，用于展开/折叠部门树
@@ -93,45 +93,45 @@ const handleExpand = async () => {
  * @param unfold - 是否展开
  */
 const toggleExpand = (children: any[], unfold = true) => {
-  for (const key in children) {
-    tableRef.value?.toggleRowExpansion(children[key], unfold);
-    if (children[key].children) {
-      toggleExpand(children[key].children!, unfold);
-    }
-  }
-};
+	for (const key in children) {
+		tableRef.value?.toggleRowExpansion(children[key], unfold)
+		if (children[key].children) {
+			toggleExpand(children[key].children!, unfold)
+		}
+	}
+}
 
 /**
  * 删除当前行
  * @param row - 当前行数据
  */
 const handleDelete = async (row: any) => {
-  try {
-    await useMessageBox().confirm(t('common.delConfirmText'));
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm(t("common.delConfirmText"))
+	} catch {
+		return
+	}
 
-  try {
-    await delObj(row.id);
-    getDataList();
-    useMessage().success(t('common.delSuccessText'));
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObj(row.id)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
-const handleAdd = ()=>{
-  deptDialogRef.value.openDialog('add')
+const handleAdd = () => {
+	deptDialogRef.value.openDialog("add")
 }
 
 /**
  * 暴露组件中的一些方法和变量
  */
 defineExpose({
-  handleAdd, // 新增时间
-  state, // 响应式表格数据
-  getDataList, // 获取列表数据方法
-  handleExpand // 展开/折叠部门树方法
-});
+	handleAdd, // 新增时间
+	state, // 响应式表格数据
+	getDataList, // 获取列表数据方法
+	handleExpand, // 展开/折叠部门树方法
+})
 </script>
diff --git a/src/views/admin/system/dept/tree-view.vue b/src/views/admin/system/dept/tree-view.vue
index 689b3ad..a03849e 100644
--- a/src/views/admin/system/dept/tree-view.vue
+++ b/src/views/admin/system/dept/tree-view.vue
@@ -5,7 +5,7 @@
 			:props="props"
 			:data="data"
 			:label-style="style"
-			:define-menus="defineMenus"
+			:define-menus="getMenus()"
 			:default-expand-level="expandLevel"
 			center
 			:horizontal="horizontal"
@@ -23,53 +23,54 @@
 </template>
 
 <script lang="ts" name="treeView" setup>
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { delObj, deptTree } from '/@/api/admin/dept';
-import { getObj } from '/@/api/admin/tenant';
-import { Session } from '/@/utils/storage';
-import { useI18n } from 'vue-i18n';
-import { storeToRefs } from 'pinia';
-import { useThemeConfig } from '/@/stores/themeConfig';
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { delObj, deptTree } from "/@/api/admin/dept"
+import { getObj } from "/@/api/admin/tenant"
+import { Session } from "/@/utils/storage"
+import { useI18n } from "vue-i18n"
+import { storeToRefs } from "pinia"
+import { useThemeConfig } from "/@/stores/themeConfig"
+import { auth } from "/@/utils/authFunction"
 
-const DeptForm = defineAsyncComponent(() => import('./form.vue'));
+const DeptForm = defineAsyncComponent(() => import("./form.vue"))
 
-const { t } = useI18n();
+const { t } = useI18n()
 
 // 定义org组件key-value定义
-const props = reactive({ id: 'id', pid: 'parentId', label: 'name', expand: 'expand', children: 'children' });
-const data = reactive({});
+const props = reactive({ id: "id", pid: "parentId", label: "name", expand: "expand", children: "children" })
+const data = reactive({})
 
 // 定义org组件右键定义
 const defineMenus = reactive([
-	{ name: t('sysdept.addNodeText'), command: 'add' },
-	{ name: t('sysdept.editNodeText'), command: 'edit' },
-	{ name: t('sysdept.delNodeText'), command: 'delete' },
-]);
+	{ name: t("sysdept.addNodeText"), command: "add" },
+	{ name: t("sysdept.editNodeText"), command: "edit" },
+	{ name: t("sysdept.delNodeText"), command: "delete" },
+])
 
-const cloneNodeDrag = ref(true);
-const collapsable = ref(false);
-const expandLevel = ref(2); //默认展开层级
-const horizontal = ref(false);
-const onlyOneNode = ref(false);
-const treeOrgRef = ref();
-const deptDialogRef = ref();
+const cloneNodeDrag = ref(true)
+const collapsable = ref(false)
+const expandLevel = ref(2) //默认展开层级
+const horizontal = ref(false)
+const onlyOneNode = ref(false)
+const treeOrgRef = ref()
+const deptDialogRef = ref()
 
 // 添加主题配置
-const themeConfig = useThemeConfig();
-const { themeConfig: theme } = storeToRefs(themeConfig);
+const themeConfig = useThemeConfig()
+const { themeConfig: theme } = storeToRefs(themeConfig)
 
 // 添加 style 定义
 const style = computed(() => ({
-	background: theme.value.isDark ? 'var(--el-bg-color-overlay)' : 'var(--el-bg-color-page)',
-	color: theme.value.isDark ? 'var(--el-text-color-primary)' : '#5e6d82',
-}));
+	background: theme.value.isDark ? "var(--el-bg-color-overlay)" : "var(--el-bg-color-page)",
+	color: theme.value.isDark ? "var(--el-text-color-primary)" : "#5e6d82",
+}))
 
 /**
  * 过滤节点
  */
 const filter = (deptName: string) => {
-	treeOrgRef.value.filter(deptName);
-};
+	treeOrgRef.value.filter(deptName)
+}
 
 /**
  * 节点过滤方法
@@ -78,16 +79,30 @@ const filter = (deptName: string) => {
  * @returns {boolean} 返回过滤结果
  */
 const filterNodeMethod = (value, data) => {
-	if (!value) return true;
-	return data.label.indexOf(value) !== -1;
-};
+	if (!value) return true
+	return data.label.indexOf(value) !== -1
+}
+
+const getMenus = () => {
+	const menus = []
+	if (auth("sys_dept_add")) {
+		menus.push({ name: t("sysdept.addNodeText"), command: "add" })
+	}
+	if (auth("sys_dept_edit")) {
+		menus.push({ name: t("sysdept.editNodeText"), command: "edit" })
+	}
+	if (auth("sys_dept_del")) {
+		menus.push({ name: t("sysdept.delNodeText"), command: "delete" })
+	}
+	return menus
+}
 
 /**
  * 处理展开/折叠树
  */
 const handleExpand = async () => {
-	collapsable.value = !collapsable.value;
-};
+	collapsable.value = !collapsable.value
+}
 
 /**
  * 检查节点是否是根租户节点
@@ -95,20 +110,20 @@ const handleExpand = async () => {
  * @returns {boolean} 如果节点是根租户节点，返回true；否则返回false
  */
 const checkNode = (node) => {
-	if (node?.id === '0') {
-		useMessage().error(t('sysdept.tenantNodeErrorText'));
-		return false;
+	if (node?.id === "0") {
+		useMessage().error(t("sysdept.tenantNodeErrorText"))
+		return false
 	}
-	return true;
-};
+	return true
+}
 
 /**
  * 当用户左键点击节点，模拟触发组件的右键事件
  * @param e
  */
 const onNodeClick = (e: any) => {
-	const { clientX, clientY } = e;
-	const rightFun = new MouseEvent('contextmenu', {
+	const { clientX, clientY } = e
+	const rightFun = new MouseEvent("contextmenu", {
 		bubbles: true,
 		cancelable: false,
 		view: window,
@@ -116,17 +131,17 @@ const onNodeClick = (e: any) => {
 		buttons: 0,
 		clientX,
 		clientY,
-	});
-	e.target.dispatchEvent(rightFun);
-};
+	})
+	e.target.dispatchEvent(rightFun)
+}
 
 /**
  * 添加部门
  * @param {object} node 节点对象
  */
 const addNode = (node) => {
-	deptDialogRef.value.openDialog('add', node?.id);
-};
+	deptDialogRef.value.openDialog("add", node?.id)
+}
 
 /**
  * 编辑部门
@@ -134,10 +149,10 @@ const addNode = (node) => {
  */
 const editNode = (node) => {
 	if (!checkNode(node)) {
-		return;
+		return
 	}
-	deptDialogRef.value.openDialog('edit', node?.id);
-};
+	deptDialogRef.value.openDialog("edit", node?.id)
+}
 
 /**
  * 删除部门
@@ -145,46 +160,46 @@ const editNode = (node) => {
  */
 const delNode = async (node) => {
 	if (!checkNode(node)) {
-		return;
+		return
 	}
 
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(node.id);
-		await getOrgData();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(node.id)
+		await getOrgData()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 
 /**
  * 查询部门数据
  */
 const getOrgData = async () => {
 	// 查询当前租户信息
-	const tenant = await getObj(Session.getTenant());
+	const tenant = await getObj(Session.getTenant())
 	deptTree().then((res) => {
-		Object.assign(data, { id: '0', name: tenant.data.name });
-		data.children = res.data;
-	});
-};
+		Object.assign(data, { id: "0", name: tenant.data.name })
+		data.children = res.data
+	})
+}
 
 onMounted(() => {
-	getOrgData();
-});
+	getOrgData()
+})
 
 // 暴露变量
 defineExpose({
 	getOrgData,
 	handleExpand,
 	filter,
-});
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/hard/hard-after-sale/index.vue b/src/views/hard/hard-after-sale/index.vue
index c0ecf3b..c9e0402 100644
--- a/src/views/hard/hard-after-sale/index.vue
+++ b/src/views/hard/hard-after-sale/index.vue
@@ -69,11 +69,11 @@
 							type="primary"
 							v-auth="'hard_hardAfterSale_edit'"
 							@click="formDialogRef.openDialog(row.id)"
-							>编辑</el-button
-						>
-						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardAfterSale_del'" @click="handleDelete([row.id])"
-							>删除</el-button
-						>
+							>编辑
+						</el-button>
+						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardAfterSale_del'" @click="handleDelete([row.id])">
+							删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</el-table>