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/zoningManagement/index.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue
index 400ce59..457c74f 100644
--- a/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue
+++ b/applications/task-work-order/src/views/orderView/organizational/zoningManagement/index.vue
@@ -37,13 +37,13 @@
       </el-form-item>
     </el-form>
 
-    <div class="gd-table-toolbar">
-      <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增区划</el-button>
-      <el-button :icon="Upload" @click="handleImport">区划导入</el-button>
-      <el-button :icon="Download" :loading="exportLoading" :disabled="exportLoading" @click="handleExport">区划导出</el-button>
-    </div>
-
     <div class="gd-table-container" v-loading="loading">
+      <div class="gd-table-toolbar">
+        <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">新增区划</el-button>
+        <el-button :icon="Upload" @click="handleImport">区划导入</el-button>
+        <el-button :icon="Download" :loading="exportLoading" :disabled="exportLoading" @click="handleExport">区划导出</el-button>
+      </div>
+
       <div class="gd-table-content gd-table-content-bg">
         <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="46" />

--
Gitblit v1.9.3