From a4b91616ceae752e11cb6fc5198ebadf52cd68ed Mon Sep 17 00:00:00 2001 From: jazz <jazzxhunter@163.com> Date: 星期三, 24 八月 2022 16:05:15 +0800 Subject: [PATCH] update_202208241604_下载模板修改链接 --- src/pages/system/admin.vue | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pages/system/admin.vue b/src/pages/system/admin.vue index 322edf3..14a8c68 100644 --- a/src/pages/system/admin.vue +++ b/src/pages/system/admin.vue @@ -5,7 +5,7 @@ <el-form-item label="绠$悊鍛樻悳绱�"> <el-input v-model="keyWord" - placeholder="璇疯緭鍏ョ鐞嗗憳鍚嶇О/璐﹀彿" + placeholder="鎼滅储绠$悊鍛樺悕绉�/璐﹀彿" clearable size="small" style="width: 240px" @@ -41,7 +41,7 @@ <el-table-column label="璐﹀彿" prop="account" align="center" min-width="120" /> <el-table-column label="璐﹀彿绫诲瀷" prop="account" align="center" min-width="120"> <template slot-scope="scope"> - <span v-if="scope.row.type">{{ accountTypeOptions[scope.row.type].name }}</span> + {{ accountTypeOptions.find(item=>item.id == scope.row.type) ? accountTypeOptions.find(item=>item.id == scope.row.type).name : '' }} </template> </el-table-column> <el-table-column label="瑙掕壊" prop="roleName" align="center" min-width="120" /> @@ -49,6 +49,7 @@ <el-table-column label="鐘舵��" align="center" min-width="100"> <template slot-scope="scope"> <el-switch + v-if="scope.row.type!=0" v-model="scope.row.isUse" :active-value="1" :inactive-value="0" @@ -67,7 +68,7 @@ @click="showEditAdminDialog(scope.row)" >缂栬緫</el-button> <el-button - v-if="getAuthValueFN('sys_admin_del')" + v-if="getAuthValueFN('sys_admin_del') && scope.row.type!=0" size="mini" type="text warn" icon="el-icon-delete" @@ -94,10 +95,10 @@ <el-form-item label="璐﹀彿" prop="account"> <el-input v-model="adminDialogData.account" placeholder="璇疯緭鍏ュ笎鍙�" maxlength="20" :disabled="adminDialogData.type!='add'" /> </el-form-item> - <el-form-item label="瀵嗙爜" :prop="adminDialogData.type==='add'?'password':'none'"> + <el-form-item label="瀵嗙爜" :prop="adminDialogData.type==='add'||adminDialogData.password||adminDialogData.passwordSure?'password':'none'"> <el-input v-model="adminDialogData.password" type="password" placeholder="璇疯緭鍏ュ瘑鐮�" maxlength="20" /> </el-form-item> - <el-form-item label="纭瀵嗙爜" :prop="adminDialogData.type==='add'?'passwordSure':'none'"> + <el-form-item label="纭瀵嗙爜" :prop="adminDialogData.type==='add'||adminDialogData.password||adminDialogData.passwordSure?'passwordSure':'none'"> <el-input v-model="adminDialogData.passwordSure" type="password" placeholder="璇疯緭鍏ョ‘璁ゅ瘑鐮�" maxlength="20" /> </el-form-item> <!-- 璐﹀彿绫诲瀷 --> @@ -183,7 +184,8 @@ { required: true, message: '璐﹀彿涓嶈兘涓虹┖', trigger: 'change' } ], password: [ - { required: true, message: '瀵嗙爜涓嶈兘涓虹┖', trigger: 'change' } + { required: true, message: '瀵嗙爜涓嶈兘涓虹┖', trigger: 'change' }, + { min: 5, max: 20, message: '瀵嗙爜鍦�5~20涓瓧涔嬮棿' } ], passwordSure: [ { required: true, message: '纭瀵嗙爜涓嶈兘涓虹┖', trigger: 'change' }, @@ -230,7 +232,7 @@ } } }, (inf) => { - this.roleArr = inf.list || [] + this.roleArr = inf.list && inf.list.filter(item => item.isUse === 1) || [] }) }, @@ -397,7 +399,7 @@ }, () => { this.$messageSuc('淇濆瓨鎴愬姛') this.hideAdminDialog() - this.getList() + isAdd ? this.reGetList() : this.getList() }) } }) -- Gitblit v1.8.0