From 0a1d2fe85a280f5543b9b3241aaf8d8a39a32f8c Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 27 十月 2022 18:26:40 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui
---
src/views/systemSetting/baseSetting/user/components/main/index.vue | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index 0b3024f..755ab53 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -8,7 +8,7 @@
@selection-change="tableChange">
<el-table-column type="selection" min-width="5">
</el-table-column>
- <el-table-column label="鐢ㄦ埛ID" min-width="4">
+ <el-table-column label="鐢ㄦ埛ID" min-width="6">
<template slot-scope="scope">{{ scope.row.id }}</template>
</el-table-column>
<el-table-column prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="10">
@@ -39,7 +39,7 @@
</el-switch>
</template>
</el-table-column>
- <el-table-column prop="operation" label="鎿嶄綔" min-width="22">
+ <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
<template slot-scope="scope">
<div class="operation">
<span @click="handleChangeRole(scope.row,'role')">淇敼瑙掕壊</span>
@@ -55,9 +55,14 @@
</template>
</el-table-column>
</el-table>
- <!-- 鏌ョ湅淇敼椤甸潰 -->
+ <!-- 鏌ョ湅椤甸潰 -->
+ <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
+ title="鏌ョ湅鐢ㄦ埛淇℃伅">
+ <MyView :userInfo=userInfo></MyView>
+ </el-dialog>
+ <!-- 淇敼椤甸潰 -->
<el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
- :title="updateFlag ? flag.role ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅' : flag.depart ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅': '淇敼鐢ㄦ埛瀵嗙爜' :'鏌ョ湅鐢ㄦ埛淇℃伅'"
+ :title="updateFlag ? flag.role ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅' : flag.depart ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅': '淇敼鐢ㄦ埛瀵嗙爜' :''"
:before-close="handleClose">
<updateUser :updateFlag="updateFlag" :userInfo=userInfo :flag=flag @closeDialog="closeDialog"
:getUserList="getUserList" v-if="!flag.password" />
@@ -94,15 +99,17 @@
import helper from '@/utils/mydate'
import updateUser from '../updateUser';
import MyPwd from '../password'
+import MyView from '../myView'
export default {
components: {
- updateUser, MyPwd
+ updateUser, MyPwd,MyView
},
data() {
return {
tableData: [],
search: "",
dialogUpdate: false,
+ dialogView:false,
updateFlag: false,
userInfo: '',
totalNum: 200,
@@ -327,13 +334,8 @@
},
// 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
handleFind(rowData) {
- this.dialogUpdate = true;
- this.updateFlag = false;
+ this.dialogView = true;
this.userInfo = rowData;
- const { flag } = this;
- for (let key in flag) {
- flag[key] = false;
- }
},
// 璁剧疆琛ㄦ牸鏂戦┈绾�
tableRowClassName({ row, rowIndex }) {
@@ -464,9 +466,9 @@
font-size: 10px;
.operation {
display: flex;
-
+ font-size: 10px;
.line {
- padding: 0 5px;
+ padding: 0 1px;
}
span:hover {
--
Gitblit v1.8.0