From 05426961e47abf4a43587f01dafbd226bf089e91 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Thu, 29 Dec 2022 17:43:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86-=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=80=E4=B8=AA=E4=BA=BA=E5=91=98-=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE-=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=A7=92=E8=89=B2=E4=B8=BA=E5=93=81=E7=89=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=EF=BC=8C=E5=BC=B9=E6=A1=86=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BA=E5=93=81=E7=89=8C=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/modules/RoleAssignment.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/views/system/modules/RoleAssignment.vue b/jero-web/src/views/system/modules/RoleAssignment.vue
index d04a3ac80..27cc27d4c 100644
--- a/jero-web/src/views/system/modules/RoleAssignment.vue
+++ b/jero-web/src/views/system/modules/RoleAssignment.vue
@@ -39,7 +39,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row :gutter='24' v-if='viewshow'>
+        <a-row :gutter='24' v-if='viewshowbrand'>
           <a-col :span='24'>
             <a-form-item :label="$t('brand')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-multi-select-tag class="box-input" v-model:value="brands"
@@ -96,6 +96,7 @@ export default {
       spinLoading: false,
       confirmLoading: false,
       viewshow: false,
+      viewshowbrand: false,
       selectedRowKeys: [],
       roleList: [],
       dictOptions: [],
@@ -150,6 +151,11 @@ export default {
                 this.viewshow = true
               })
               return
+            } else if(val.roleCode == 'BrandAdministrator' && item == val.id) {
+              this.$nextTick(() => {
+                this.viewshowbrand = true
+              })
+              return
             }else{
               this.viewshow = false
             }