权限调整

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -772,6 +772,7 @@
                 searchField:null,
                 keyword:null,
                 user: JSON.parse(sessionStorage.getItem("user")),
+                permissions: JSON.parse(sessionStorage.getItem("permissions")),
                 userDetailVisible: false,
                 userDetail:{},
                 date: new Date(),

fhKeeper/formulahousekeeper/timesheet/src/views/quanx/quanx.vue

@@ -26,7 +26,7 @@
             <template slot-scope="scope">
                 <div>
                     <el-button type="primary" size="small" @click="handleAdd('编辑角色', '立即修改', scope.row)">编辑角色</el-button>
-                    <el-button type="primary" size="small" @click="shisha(scope.row.id)">分配权限</el-button>
+                    <el-button type="primary" size="small" @click="shisha(scope.row.id), roleName = scope.row.rolename">分配权限</el-button>
                     <el-button type="danger" size="small" @click="deteHand(scope.row)">删除</el-button>
                 </div>
             </template>
@@ -45,7 +45,7 @@
             ></el-pagination>
         </el-col> -->
         <!-- 分配权限弹窗 -->
-        <el-dialog title="分配权限" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
+        <el-dialog :title="'分配权限 - '+roleName" :visible.sync="dialogVisible" width="600" :before-close="handleClose">
             <div class="quanxians">
                 <!-- <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input> -->
                 <!-- <el-tree :data="data" show-checkbox node-key="id" :filter-node-method="filterNode" ref="tree" :default-expanded-keys="[2, 3]" :default-checked-keys="[5]" :props="defaultProps"> </el-tree> -->
@@ -146,7 +146,8 @@ export default {
         keyword: '',
         auseList: [],
         defaultRole: false,
-        roleId: ''
+        roleId: '',
+        roleName: ''
     };
   },
   computed: {},

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -195,7 +195,7 @@
         <el-dialog title="批量修改" :visible.sync="handljues" v-if="handljues" width="30%">
             <el-form model="" label-width="20%">
                 <el-form-item label="修改角色">
-                    <el-select v-model="xiuRoleId" placeholder="请选择" style="width: 120px" clearable>
+                    <el-select v-model="xiuRoleId" placeholder="请选择" style="width: 100%">
                         <el-option v-for="(item, index) in acquireRoleLists" :key="index" :label="item.rolename" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
@@ -632,7 +632,11 @@
                     this.$message('请选择');
                     return
                 }
-                this.xiuRoleId = this.acquireRoleList[0].id
+                for(var i in this.acquireRoleList) {
+                    if(this.acquireRoleList[i].isDefault == 1) {
+                        this.xiuRoleId = this.acquireRoleList[i].id
+                    }
+                }
                 this.handljues = true
                 console.log('触发了')
             },