From 2bee81442387717d425ffde1dea3d2e9c4b7a00e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 五月 2026 16:47:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/views/fileManagement/bookshelf/index.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/fileManagement/bookshelf/index.vue b/src/views/fileManagement/bookshelf/index.vue
index a084900..c73ae1c 100644
--- a/src/views/fileManagement/bookshelf/index.vue
+++ b/src/views/fileManagement/bookshelf/index.vue
@@ -97,8 +97,8 @@
       </el-tree>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="keepVisible = false">鍙� 娑�</el-button>
           <el-button type="primary" @click="keepVisible = false" >纭� 瀹�</el-button>
+          <el-button @click="keepVisible = false">鍙� 娑�</el-button>
         </span>
       </template>
     </el-dialog>
@@ -115,8 +115,8 @@
       </el-row>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="warehouseVisible = false">鍙� 娑�</el-button>
           <el-button type="primary" @click="confirmWarehouse" :loading="upLoadWarehouse">纭� 瀹�</el-button>
+          <el-button @click="warehouseVisible = false">鍙� 娑�</el-button>
         </span>
       </template>
     </el-dialog>
@@ -149,8 +149,8 @@
       </el-row>
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="shelvesVisible = false">鍙� 娑�</el-button>
           <el-button type="primary" @click="confirmShelves" :loading="upLoadShelves">纭� 瀹�</el-button>
+          <el-button @click="shelvesVisible = false">鍙� 娑�</el-button>
         </span>
       </template>
     </el-dialog>

--
Gitblit v1.9.3