Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2025-10-28 13:35:22 +08:00

View File

@@ -69,7 +69,11 @@ import bindUser from "./bindUser";
import { getTenantUserPage, unbindTenantUser } from "@/api/system/tenant"; import { getTenantUserPage, unbindTenantUser } from "@/api/system/tenant";
// 在 <script setup> 顶部添加导入 // 在 <script setup> 顶部添加导入
import { ref, reactive, onMounted } from "vue"; // 补充 onMounted 导入 import { ref, reactive, onMounted } from "vue"; // 补充 onMounted 导入
import { useRoute, useRouter } from "vue-router"; // 添加 useRouter 导入
const route = useRoute(); const route = useRoute();
const router = useRouter(); // 创建 router 实例
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable"); const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
@@ -100,8 +104,14 @@ function getList() {
} }
// 返回按钮 // 返回按钮
function handleClose() { function handleClose() {
const obj = { path: "/system/basicmanage/tenant" }; /* const obj = { path: "/system/basicmanage/tenant" };
proxy.$tab.closeOpenPage(obj); proxy.$tab.closeOpenPage(obj); 目前先注释掉改成返回上一级页面*/
// 先关闭当前标签页
const obj={ path: "/system/basicmanage/tenant" };
proxy.$tab.closeOpenPage(route).then(() => {
// 然后返回上一个页面
router.go(-1);
});
} }
/** 搜索按钮操作 */ /** 搜索按钮操作 */
function handleQuery() { function handleQuery() {