From c93ff74fb5a47d38554d40b5ab00cfe07eac1f2a Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 24 十月 2024 17:21:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/index.vue |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
index ee786da..2f6ccea 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/user/index.vue
@@ -93,8 +93,8 @@
       </div>
 
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="pwdVisible = false">鍙� 娑�</el-button>
         <el-button size="small" type="primary" @click="savePwdHandler">纭� 瀹�</el-button>
+        <el-button size="small" @click="pwdVisible = false">鍙� 娑�</el-button>
       </div>
     </el-dialog>
 
@@ -119,8 +119,8 @@
       >
       </avue-crud>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="departVisible = false">鍙� 娑�</el-button>
         <el-button size="small" type="primary" @click="saveDepartHandler">纭� 瀹�</el-button>
+        <el-button size="small" @click="departVisible = false">鍙� 娑�</el-button>
       </div>
     </el-dialog>
   </basic-container>
@@ -238,9 +238,7 @@
         this.tableData = data;
         this.page.total = res.data.total;
         this.tableLoading = false;
-      }).catch(err => {
-        this.$message.error(err)
-      });
+      })
     },
 
     // 琛ㄦ牸鍙充晶鍒锋柊鍥炬爣
@@ -410,7 +408,6 @@
         }
       }).catch(err => {
         loading()
-        console.log(err);
       })
     },
 
@@ -441,7 +438,6 @@
         }
       }).catch(err => {
         loading()
-        console.log(err);
       });
     },
 

--
Gitblit v1.9.3