From 12e3a3301ecea615339d67d59b8a411200e21bc8 Mon Sep 17 00:00:00 2001 From: 张含笑 <zhx18749296735@163.com> Date: Thu, 26 Feb 2026 10:57:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- applications/task-work-order/src/views/orderView/organizational/roleMange/RolePermissionDialog.vue | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/applications/task-work-order/src/views/orderView/systemMange/roleMange/RolePermissionDialog.vue b/applications/task-work-order/src/views/orderView/organizational/roleMange/RolePermissionDialog.vue similarity index 90% rename from applications/task-work-order/src/views/orderView/systemMange/roleMange/RolePermissionDialog.vue rename to applications/task-work-order/src/views/orderView/organizational/roleMange/RolePermissionDialog.vue index 3b14f65..e4312df 100644 --- a/applications/task-work-order/src/views/orderView/systemMange/roleMange/RolePermissionDialog.vue +++ b/applications/task-work-order/src/views/orderView/organizational/roleMange/RolePermissionDialog.vue @@ -31,17 +31,17 @@ :props="treeProps" /> </el-tab-pane> -<!-- <el-tab-pane label="移动app">--> -<!-- <el-tree--> -<!-- class="command-tree"--> -<!-- ref="treeMenuApp"--> -<!-- :data="menuGrantListApp"--> -<!-- show-checkbox--> -<!-- node-key="id"--> -<!-- :default-checked-keys="menuTreeObjApp"--> -<!-- :props="treeProps"--> -<!-- />--> -<!-- </el-tab-pane>--> + <el-tab-pane label="移动app"> + <el-tree + class="command-tree" + ref="treeMenuApp" + :data="menuGrantListApp" + show-checkbox + node-key="id" + :default-checked-keys="menuTreeObjApp" + :props="treeProps" + /> + </el-tab-pane> </el-tabs> <template #footer> <el-button color="#F2F3F5" @click="visible = false">取消</el-button> -- Gitblit v1.9.3