From 0b1092dde2314d223d90ec27b095b41690eab1bb Mon Sep 17 00:00:00 2001 From: long <515897141@qq.com> Date: 星期五, 17 九月 2021 17:52:27 +0800 Subject: [PATCH] 调整baseconfig代码顺序 --- src/pages/system/admin.vue | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/system/admin.vue b/src/pages/system/admin.vue index 267bedd..2b20b29 100644 --- a/src/pages/system/admin.vue +++ b/src/pages/system/admin.vue @@ -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="accountTypeOptions[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" @@ -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) || [] }) }, -- Gitblit v1.8.0