Merge remote-tracking branch 'origin/dev_2nd_period_test' into fix_2nd_period

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

@@ -61,10 +61,8 @@
       </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>
+        <span class="text-field-right" :title="queryForm.brandText"
+        >{{queryForm.brandText}}</span>
       </div>
     </div>
     <div class="content-text">

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

@@ -246,7 +246,7 @@
             align: 'center',
             width: 180,
             ellipsis: true,
-            dataIndex: 'brand'
+            dataIndex: 'brandText'
           },
           {
             title: this.$t('explain'),

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

@@ -85,7 +85,7 @@
 <!--                              :placeholder="$t('PleaseSelect')+$t('brand')"-->
 <!--                              :type="'select'"-->
 <!--                              :triggerChange="false" :dictCode="'brand'"/>-->
-          <a-select allowClear :placeholder="$t('PleaseSelect')+$t('engineeringInterfacePerson')"
+          <a-select allowClear mode="multiple" :getPopupContainer="triggerNode => triggerNode.parentNode" :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 ">
@@ -413,7 +413,7 @@
             this.dutyTerritories = res.dutyTerritoryList.join(',')
           }
           if(res.brandList){
-            this.brands = res.brandList.join(',')
+            this.brands = res.brandList
           }
         })
       },
@@ -462,7 +462,7 @@
           ids: this.userId,
           selectedroles: selectedRole.join(','),
           dutyTerritories: dutyTerritorie,
-          brands: brand
+          brands: brand.join(',')
         }
         postAction('/sys/user/setRole', param).then((res) => {
           if (res.success) {