jinx пре 3 година
родитељ
комит
bf26eff932

+ 4 - 1
platform-admin/src/main/webapp/WEB-INF/page/sys/user.html

@@ -95,7 +95,10 @@
               <!-- <Checkbox-group v-model="user.roleIdList">
                         <Checkbox :label="role.roleId" v-for="role in roleList">{{role.roleName}}</Checkbox>
                     </Checkbox-group> -->
-              <Radio-group v-model="user.roleIdList" @on-change="change_role">
+              <Radio-group
+                v-model="user.roleIdList[0]"
+                @on-change="change_role"
+              >
                 <Radio :label="role.roleId" v-for="role in roleList"
                   >{{role.roleName}}
                 </Radio>

+ 22 - 5
platform-admin/src/main/webapp/js/sys/user.js

@@ -128,7 +128,7 @@ var vm = new Vue({
     },
     showList: true,
     title: null,
-    roleList: {},
+    roleList: [],
     user: {
       status: 1,
       deptName: '',
@@ -217,7 +217,7 @@ var vm = new Vue({
     add: function () {
       vm.showList = false
       vm.title = '新增(默认密码为 注册的账号密码)'
-      vm.roleList = {}
+      vm.roleList = []
       vm.user = {
         status: 1,
         roleIdList: [6],
@@ -228,7 +228,7 @@ var vm = new Vue({
       vm.deptExpirationDate = 0
 
       //获取角色信息
-      this.getRoleList()
+      this.getRoleList(1)
       vm.getDept()
     },
     getDept: function () {
@@ -313,8 +313,10 @@ var vm = new Vue({
           if (r.user.roleIdList[0] == 8 && r.user.isPlatformStreamer) {
             vm.user.roleIdList[0] = 9
           }
+          vm.$forceUpdate()
+
           //获取角色信息
-          vm.getRoleList()
+          vm.getRoleList(2)
           vm.getDept()
           // window.localStorage.setItem('deptExpirationDate',vm.deptExpirationDate)
         },
@@ -453,15 +455,30 @@ var vm = new Vue({
         },
       })
     },
-    getRoleList: function () {
+    getRoleList: function (type) {
+      vm.roleList = []
       Ajax.request({
         url: '../sys/role/select',
         async: true,
         successCallback: function (r) {
           vm.roleList = r.list
+          if (type == 1) {
+            vm.roleList = r.list
+          } else {
+            if (vm.user.isPlatformStreamer) {
+              vm.roleList = r.list.filter((i) => {
+                return i.roleId == 9
+              })
+            } else {
+              vm.roleList = r.list.filter((i) => {
+                return i.roleId != 9
+              })
+            }
+          }
         },
       })
     },
+
     reload: function (event) {
       vm.showList = true
       var page = $('#jqGrid').jqGrid('getGridParam', 'page')