From e7fa84c772ce2a3cc8b3aa85e7a305300568cc10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 11 May 2022 14:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/UserInfo.vue | 20 ++++++++++++++++++--
 src/views/mdp/sys/branch/BranchEdit.vue  |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/views/layout/components/UserInfo.vue b/src/views/layout/components/UserInfo.vue
index ecbff8f7..60c98465 100644
--- a/src/views/layout/components/UserInfo.vue
+++ b/src/views/layout/components/UserInfo.vue
@@ -50,7 +50,23 @@
                     <div class="middleBox_role">
                         <span>会员等级：</span>
                         <span class="middleBox_role_name">
-                            <a> {{userInfo.ilvlName?userInfo.ilvlName:'普通会员'}} </a>
+                            <a v-if="!userInfo.ilvlId || userInfo.ilvlId=='1'"> {{userInfo.ilvlName?userInfo.ilvlName:'普通会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='2'"> {{userInfo.ilvlName?userInfo.ilvlName:'青铜会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='3'"> {{userInfo.ilvlName?userInfo.ilvlName:'白银会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='4'"> {{userInfo.ilvlName?userInfo.ilvlName:'黄金会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='5'"> {{userInfo.ilvlName?userInfo.ilvlName:'紫金会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='6'"> {{userInfo.ilvlName?userInfo.ilvlName:'皇冠会员'}} </a> 
+                        </span>
+                    </div>
+                    <div class="middleBox_role">
+                        <span>能力等级：</span>
+                        <span class="middleBox_role_name">
+                            <a v-if="!userInfo.gradeId || userInfo.gradeId=='1'"> {{userInfo.ilvlName?userInfo.ilvlName:'普通会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='2'"> {{userInfo.ilvlName?userInfo.ilvlName:'青铜会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='3'"> {{userInfo.ilvlName?userInfo.ilvlName:'白银会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='4'"> {{userInfo.ilvlName?userInfo.ilvlName:'黄金会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='5'"> {{userInfo.ilvlName?userInfo.ilvlName:'紫金会员'}} </a>
+                            <a v-else-if="userInfo.ilvlId=='6'"> {{userInfo.ilvlName?userInfo.ilvlName:'皇冠会员'}} </a> 
                         </span>
                     </div>
                 </div>
@@ -152,7 +168,7 @@ export default {
     
     methods: {
         calcBranchUsers(){
-            calcBranchUsers().then(res=>this.branchUsersCount=res.data.data)
+            calcBranchUsers().then(res=>this.branchUsersCount=res.data.data||this.branchUsersCount)
         },
         getMyRoleNames(){
             if(this.roles && this.roles.length>0){
diff --git a/src/views/mdp/sys/branch/BranchEdit.vue b/src/views/mdp/sys/branch/BranchEdit.vue
index b6e03c69..e1bd4995 100644
--- a/src/views/mdp/sys/branch/BranchEdit.vue
+++ b/src/views/mdp/sys/branch/BranchEdit.vue
@@ -4,7 +4,7 @@
 		<!--编辑界面 Branch 管理端机构表（机构下面若干部门）--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef">
 				<el-form-item label="机构编号" prop="id"  v-if="opType==='add'">
-					<el-input v-model="editForm.id" placeholder="机构编号，如果不填写将后台自动生成" :maxlength="50" :disabled="branch.id"></el-input>
+					<el-input v-model="editForm.id" placeholder="机构编号，如果不填写将后台自动生成" :maxlength="50" :disabled="!!branch.id"></el-input>
 					<br><font color="red">机构号将作为该机构的管理员登录账号</font>
 				</el-form-item> 
 				<el-form-item label="机构名称" prop="branchName">