From 3cf3cd88a7b7a49e3300e8e8c1e9034eb69a3429 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 27 Feb 2026 08:40:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue b/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue
index d1bad07..d7a4925 100644
--- a/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/roleMange/index.vue
@@ -27,21 +27,21 @@
 			</el-form-item>
 		</el-form>
 
-		<div class="gd-table-toolbar">
-			<el-button :icon="Plus" color="#4C34FF" type="primary" @click="handleAdd">新增</el-button>
-			<el-button :icon="Delete"  :disabled="!selectedIds.length" @click="handleDelete()">
-				删除
-			</el-button>
-			<el-button
-				:disabled="selectedIds.length !== 1"
-				v-if="permission.orderRole_set"
-				@click="handleRole"
-			>
-				权限设置
-			</el-button>
-		</div>
-
 		<div class="gd-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+			<div class="gd-table-toolbar">
+				<el-button :icon="Plus" color="#4C34FF" type="primary" @click="handleAdd">新增</el-button>
+				<el-button :icon="Delete"  :disabled="!selectedIds.length" @click="handleDelete()">
+					删除
+				</el-button>
+				<el-button
+					:disabled="selectedIds.length !== 1"
+					v-if="permission.orderRole_set"
+					@click="handleRole"
+				>
+					权限设置
+				</el-button>
+			</div>
+
 			<div class="gd-table-content gd-table-content-bg">
 				<el-table
 					class="gd-table"

--
Gitblit v1.9.3