合并分支 'fix_2nd_20230103' 到 'master'

用户管理 角色配置 viewer责任领域配置bug

查看合并请求 laws-nio/laws-weilai!275

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

@@ -39,7 +39,7 @@
                 <!-- 这个是自定义的一个全选项，展示在所有下拉项的顶部位置 -->
                 <a-select-option value="0" key="0">{{$t('selectAll')}}</a-select-option>
                 <!-- 下面的是正常要循环渲染的下拉项 -->
-                <a-select-option v-for="item in dutylist" :value="item.title">
+                <a-select-option v-for="item in dutylist" :value="item.value">
                   {{ item.title }}
                 </a-select-option>
               </a-select>
@@ -224,7 +224,7 @@ export default {
     },
     //保存
     handleSubmit() {
-      let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}`, dutyTerritories: `${this.dutyTerritories}`, brands: `${this.brands}` }
+      let param = {ids: this.selectedRowKeysArray.join(','), selectedroles: `${this.selectedRole.join(',')}`, dutyTerritories: `${this.dutyTerritories.join(',')}`, brands: `${this.brands}` }
       postAction('/sys/user/setRole', param).then((res) => {
         if (res.success) {
           this.$emit('rolevisible', false)

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

@@ -90,7 +90,7 @@
             <!-- 这个是自定义的一个全选项，展示在所有下拉项的顶部位置 -->
             <a-select-option value="0" key="0">{{$t('selectAll')}}</a-select-option>
             <!-- 下面的是正常要循环渲染的下拉项 -->
-            <a-select-option v-for="item in dutylist" :value="item.title">
+            <a-select-option v-for="item in dutylist" :value="item.value">
               {{ item.title }}
             </a-select-option>
           </a-select>
@@ -436,7 +436,7 @@
       loadUserduty(userid) {
         queryViewerInfo({ userId: userid }).then((res) => {
           if(res.dutyTerritoryList){
-            this.dutyTerritories = res.dutyTerritoryList.join(',')
+            this.dutyTerritories = res.dutyTerritoryList
           }
           if(res.brandList){
             this.brands = res.brandList
@@ -488,7 +488,7 @@
         let param = {
           ids: this.userId,
           selectedroles: selectedRole.join(','),
-          dutyTerritories: dutyTerritorie,
+          dutyTerritories: dutyTerritorie.join(','),
           brands: brand.join(',')
         }
         postAction('/sys/user/setRole', param).then((res) => {