WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支 'fix_2nd_20230103' 到 'master'

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

查看合并请求 laws-nio/laws-weilai!275
This commit is contained in:
高嵩
2023-01-09 15:36:13 +08:00
parent 8574bb3849 c2239e216e
commit d3d9e8eb2b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/views/system/modules/RoleAssignment.vue
+2 -2
View File
@@ -39,7 +39,7 @@
<!-- 这个是自定义的一个全选项，展示在所有下拉项的顶部位置 --> <!-- 这个是自定义的一个全选项，展示在所有下拉项的顶部位置 -->
<a-select-option value="0" key="0">{{$t('selectAll')}}</a-select-option> <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 }} {{ item.title }}
</a-select-option> </a-select-option>
</a-select> </a-select>
@@ -224,7 +224,7 @@ export default {
}, },
//保存 //保存
handleSubmit() { 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) => { postAction('/sys/user/setRole', param).then((res) => {
if (res.success) { if (res.success) {
this.$emit('rolevisible', false) this.$emit('rolevisible', false)
jero-web/src/views/system/modules/UserModal.vue
+3 -3
View File
@@ -90,7 +90,7 @@
<!-- 这个是自定义的一个全选项，展示在所有下拉项的顶部位置 --> <!-- 这个是自定义的一个全选项，展示在所有下拉项的顶部位置 -->
<a-select-option value="0" key="0">{{$t('selectAll')}}</a-select-option> <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 }} {{ item.title }}
</a-select-option> </a-select-option>
</a-select> </a-select>
@@ -436,7 +436,7 @@
loadUserduty(userid) { loadUserduty(userid) {
queryViewerInfo({ userId: userid }).then((res) => { queryViewerInfo({ userId: userid }).then((res) => {
if(res.dutyTerritoryList){ if(res.dutyTerritoryList){
this.dutyTerritories = res.dutyTerritoryList.join(',') this.dutyTerritories = res.dutyTerritoryList
} }
if(res.brandList){ if(res.brandList){
this.brands = res.brandList this.brands = res.brandList
@@ -488,7 +488,7 @@
let param = { let param = {
ids: this.userId, ids: this.userId,
selectedroles: selectedRole.join(','), selectedroles: selectedRole.join(','),
dutyTerritories: dutyTerritorie, dutyTerritories: dutyTerritorie.join(','),
brands: brand.join(',') brands: brand.join(',')
} }
postAction('/sys/user/setRole', param).then((res) => { postAction('/sys/user/setRole', param).then((res) => {