From 6c170b6b427f0882da35957e73f385d318970a06 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 25 十月 2024 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/index.vue |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 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 cd91554..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
@@ -77,7 +77,6 @@
     <el-dialog
       v-dialogDrag
       v-loading="pwdLoading"
-      :destroy-on-close="true"
       :visible.sync="pwdVisible"
       append-to-body="true"
       class="avue-dialog"
@@ -94,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>
 
@@ -106,7 +105,6 @@
     <el-dialog
       v-dialogDrag
       v-loading="departLoading"
-      :destroy-on-close="true"
       :visible.sync="departVisible"
       append-to-body="true"
       class="avue-dialog"
@@ -121,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>
@@ -161,6 +159,7 @@
       departCurrenRow: {},
       departOption: {
         ...basicOption,
+        addBtn:false,
         rowKey: 'oid',
         rowParentKey: 'parentId',
         selection: false,
@@ -173,6 +172,7 @@
           {
             label: '鍚嶇О',
             prop: 'name',
+            align:'left'
           },
           {
             label: '缂栧彿',
@@ -214,7 +214,8 @@
       leftRoleData: [],  // 鍒嗛厤瑙掕壊绌挎妗嗗乏渚у垵濮嬫暟鎹�
       rightRoleData: [], // 鍒嗛厤瑙掕壊绌挎妗嗗彸渚у垵濮嬫暟鎹�
       transferTitle: ['鐜版湁瑙掕壊', '鎷ユ湁瑙掕壊'],
-      tipList:["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」","閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"]
+      tipList:["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」","閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"],
+      lastIndex:null,
     }
   },
   created() {
@@ -228,6 +229,7 @@
       }
       done();
     },
+
     // 琛ㄦ牸璇锋眰
     getTableList() {
       this.tableLoading = true;
@@ -236,9 +238,7 @@
         this.tableData = data;
         this.page.total = res.data.total;
         this.tableLoading = false;
-      }).catch(err => {
-        this.$message.error(err)
-      });
+      })
     },
 
     // 琛ㄦ牸鍙充晶鍒锋柊鍥炬爣
@@ -311,7 +311,13 @@
 
     // 鐐瑰嚮琛�
     rowClickHandler(row) {
-      this.$refs.userCrud.toggleRowSelection(row);
+      func.rowClickHandler(
+        row,
+        this.$refs.userCrud,
+        this.lastIndex,
+        (newIndex) => { this.lastIndex = newIndex; },
+        () => { this.selectList = []; }
+      );
     },
 
     // 鍒嗛厤瑙掕壊
@@ -402,7 +408,6 @@
         }
       }).catch(err => {
         loading()
-        console.log(err);
       })
     },
 
@@ -433,7 +438,6 @@
         }
       }).catch(err => {
         loading()
-        console.log(err);
       });
     },
 
@@ -495,7 +499,7 @@
       download().then(res => {
         console.log(res);
         func.downloadFileByBlobHandler(res);
-        this.$message.success('涓嬭浇鎴愬姛')
+        this.$message.success('涓嬭浇鎴愬姛');
       }).catch(err => {
         this.$message.error(err);
       })
@@ -509,7 +513,7 @@
     // 鍒嗛厤閮ㄩ棬
     departmentHandler() {
       if (this.selectList.length <= 0) {
-        this.$message.warning('娓呭厛閫夋嫨浜哄憳鍐嶈繘琛屾搷浣滐紒')
+        this.$message.warning('娓呭厛閫夋嫨浜哄憳鍐嶈繘琛屾搷浣滐紒');
         return;
       }
       this.departStatus = 'default'; // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�

--
Gitblit v1.9.3