From b9f3e4a899013ce21de3fc1ac127d137c7494595 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 九月 2024 15:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/system/user/index.vue |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 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..ee786da 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"
@@ -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"
@@ -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;
@@ -311,7 +313,13 @@
 
     // 鐐瑰嚮琛�
     rowClickHandler(row) {
-      this.$refs.userCrud.toggleRowSelection(row);
+      func.rowClickHandler(
+        row,
+        this.$refs.userCrud,
+        this.lastIndex,
+        (newIndex) => { this.lastIndex = newIndex; },
+        () => { this.selectList = []; }
+      );
     },
 
     // 鍒嗛厤瑙掕壊
@@ -495,7 +503,7 @@
       download().then(res => {
         console.log(res);
         func.downloadFileByBlobHandler(res);
-        this.$message.success('涓嬭浇鎴愬姛')
+        this.$message.success('涓嬭浇鎴愬姛');
       }).catch(err => {
         this.$message.error(err);
       })
@@ -509,7 +517,7 @@
     // 鍒嗛厤閮ㄩ棬
     departmentHandler() {
       if (this.selectList.length <= 0) {
-        this.$message.warning('娓呭厛閫夋嫨浜哄憳鍐嶈繘琛屾搷浣滐紒')
+        this.$message.warning('娓呭厛閫夋嫨浜哄憳鍐嶈繘琛屾搷浣滐紒');
         return;
       }
       this.departStatus = 'default'; // 鍖哄垎涓嶅悓鏂瑰紡鎵撳紑閮ㄩ棬瀵硅瘽妗�

--
Gitblit v1.9.3