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 | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 8c09e9e..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>
@@ -172,6 +172,7 @@
{
label: '鍚嶇О',
prop: 'name',
+ align:'left'
},
{
label: '缂栧彿',
@@ -213,7 +214,8 @@
leftRoleData: [], // 鍒嗛厤瑙掕壊绌挎妗嗗乏渚у垵濮嬫暟鎹�
rightRoleData: [], // 鍒嗛厤瑙掕壊绌挎妗嗗彸渚у垵濮嬫暟鎹�
transferTitle: ['鐜版湁瑙掕壊', '鎷ユ湁瑙掕壊'],
- tipList:["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」","閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"]
+ tipList:["瀵煎叆妯℃澘涓爣鏄庣孩鑹插瓧浣撶殑涓哄繀杈撻」","閮ㄩ棬鍒椾笂涓嬬骇鍏崇郴蹇呴』鎸夌収鍙嶆枩鏉犻殧寮�(/)"],
+ lastIndex:null,
}
},
created() {
@@ -227,6 +229,7 @@
}
done();
},
+
// 琛ㄦ牸璇锋眰
getTableList() {
this.tableLoading = true;
@@ -235,9 +238,7 @@
this.tableData = data;
this.page.total = res.data.total;
this.tableLoading = false;
- }).catch(err => {
- this.$message.error(err)
- });
+ })
},
// 琛ㄦ牸鍙充晶鍒锋柊鍥炬爣
@@ -310,7 +311,13 @@
// 鐐瑰嚮琛�
rowClickHandler(row) {
- this.$refs.userCrud.toggleRowSelection(row);
+ func.rowClickHandler(
+ row,
+ this.$refs.userCrud,
+ this.lastIndex,
+ (newIndex) => { this.lastIndex = newIndex; },
+ () => { this.selectList = []; }
+ );
},
// 鍒嗛厤瑙掕壊
@@ -401,7 +408,6 @@
}
}).catch(err => {
loading()
- console.log(err);
})
},
@@ -432,7 +438,6 @@
}
}).catch(err => {
loading()
- console.log(err);
});
},
--
Gitblit v1.9.3