品牌管理员权限相关问题

jero-web/src/views/projectManagement/components/ProjectDetails.vue

@@ -59,6 +59,13 @@
               @click="urlClick(queryForm.ipdInfo)"
         >{{queryForm.ipdInfo}}</span>
       </div>
+      <div class="text-field">
+        <span class="text-field-left" :title="$t('brand')">{{$t('brand')}}</span>
+        <span class="text-field-right text-field-right-color"
+              :title="queryForm.brand"
+              @click="urlClick(queryForm.brand)"
+        >{{queryForm.brand}}</span>
+      </div>
     </div>
     <div class="content-text">
       <div class="text-field">

jero-web/src/views/projectManagement/components/addModel.vue

@@ -224,6 +224,20 @@
               </a-form-model-item>
             </div>
           </a-col>
+          <a-col :span="12">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('brand')">{{$t('brand')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'brand'">
+                <j-multi-select-tag  v-model="formInline.brands"
+                                     :placeholder="$t('PleaseSelect')+$t('brand')"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'brand'"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="24">

jero-web/src/views/projectManagement/projectLibrary/index.vue

@@ -88,6 +88,17 @@
                 <!--                                 :triggerChange="false" :dictCode="'digital_platform'"/>-->
               </div>
             </a-col>
+            <a-col :md="6" :sm="8">
+              <div class="box-title-text">
+                <div class="title-text" :title="$t('brand')">
+                  <span>{{$t('brand')}}</span>
+                </div>
+                <j-dict-select-tag class="box-input" v-model="queryParam.brand"
+                                   :placeholder="$t('PleaseSelect')+$t('brand')"
+                                   :type="'select'"
+                                   :triggerChange="false" :dictCode="'brand'"/>
+              </div>
+            </a-col>
           </template>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
@@ -230,6 +241,13 @@
             ellipsis: true,
             dataIndex: 'studioEngineerName'
           },
+          {
+            title: this.$t('brand'),
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            dataIndex: 'brand'
+          },
           {
             title: this.$t('explain'),
             align: 'center',

jero-web/src/views/projectManagement/projectStatusBoard/index.vue

@@ -23,6 +23,17 @@
                                  :triggerChange="false" :dictCode="'region'"/>
             </div>
           </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('brand')">
+                <span>{{$t('brand')}}</span>
+              </div>
+              <j-dict-select-tag class="box-input" v-model="queryParam.brand"
+                                 :placeholder="$t('PleaseSelect')+$t('brand')"
+                                 :type="'select'"
+                                 :triggerChange="false" :dictCode="'brand'"/>
+            </div>
+          </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>

jero-web/src/views/system/modules/UserModal.vue

@@ -80,11 +80,19 @@
                              :type="'select'"
                              :triggerChange="false" :dictCode="'duty_territory'"/>
       </a-form-item>
-        <a-form-item v-if='viewshow' :label="$t('brand')" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item v-if='viewshowbrand' :label="$t('brand')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-multi-select-tag  v-model="brands"
+<!--          <j-multi-select-tag  v-model="brands"-->
-                              :placeholder="$t('PleaseSelect')+$t('brand')"
+<!--                              :placeholder="$t('PleaseSelect')+$t('brand')"-->
-                              :type="'select'"
+<!--                              :type="'select'"-->
-                              :triggerChange="false" :dictCode="'brand'"/>
+<!--                              :triggerChange="false" :dictCode="'brand'"/>-->
+          <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+                    v-model="brands">
+            <a-select-option v-for="(item, key) in brandsList" :key="key" :value="item.value">
+                    <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+                      {{ item.text || item.label }}
+                    </span>
+            </a-select-option>
+          </a-select>
         </a-form-item>
 
 
@@ -230,7 +238,9 @@
         modaltoggleFlag: true,
         confirmDirty: false,
         viewshow: false,
+        viewshowbrand: false,
         selectedDepartKeys: [], //保存用户选择部门id
+        brandsList: [], //保存用户选择部门id
         checkedDepartKeys: [],
         checkedDepartNames: [], // 保存部门的名称 =>title
         checkedDepartNameString: '', // 保存部门的名称 =>title
@@ -360,8 +370,16 @@
           }
         })
       },
+      barndslist(){
+        getAction('/sys/dict/getBrandDict', {}).then((res) => {
+          if (res.success) {
+            this.brandsList = res.result
+          } else {
+            this.brandsList = []
+          }
+        })
+      },
       loadUserRoles(userid) {
-        console.log(11)
         queryUserRole({ userid: userid }).then((res) => {
           if (res.success) {
             this.selectedRole = res.result
@@ -370,10 +388,17 @@
                 if(val.roleCode == 'Viewer' && item == val.id){
                   this.$nextTick(() => {
                     this.viewshow = true
+                    this.viewshowbrand = true
+                  })
+                  return
+                } else if(val.roleCode == 'BrandAdministrator' && item == val.id) {
+                  this.$nextTick(() => {
+                    this.viewshowbrand = true
                   })
                   return
                 }else{
                   this.viewshow = false
+                  this.viewshowbrand = false
                 }
               })
             })
@@ -398,10 +423,17 @@
             if(val.roleCode == 'Viewer' && item == val.id){
               this.$nextTick(() => {
                 this.viewshow = true
+                this.viewshowbrand = true
+              })
+              return
+            } else if(val.roleCode == 'BrandAdministrator' && item == val.id) {
+              this.$nextTick(() => {
+                this.viewshowbrand = true
               })
               return
             }else{
               this.viewshow = false
+              this.viewshowbrand = false
             }
           })
         })
@@ -465,6 +497,7 @@
         let that = this
         this.disabled = false
         that.initialRoleList()
+        that.barndslist()
         if (record.activitiSync) {
           this.disabled = true
         }