|  | @@ -1,6 +1,9 @@
 | 
											
												
													
														|  |  <template>
 |  |  <template>
 | 
											
												
													
														|  |    <div class="app-container">
 |  |    <div class="app-container">
 | 
											
												
													
														|  | -    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 |  | 
 | 
											
												
													
														|  | 
 |  | +    <div class="main-right-box">
 | 
											
												
													
														|  | 
 |  | +           <!--    搜索条件    -->
 | 
											
												
													
														|  | 
 |  | +           <div class="main-search-box">
 | 
											
												
													
														|  | 
 |  | +            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 | 
											
												
													
														|  |        <el-form-item label="角色名称" prop="roleName">
 |  |        <el-form-item label="角色名称" prop="roleName">
 | 
											
												
													
														|  |          <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
 |  |          <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable style="width: 240px"
 | 
											
												
													
														|  |            @keyup.enter.native="handleQuery" />
 |  |            @keyup.enter.native="handleQuery" />
 | 
											
										
											
												
													
														|  | @@ -12,14 +15,7 @@
 | 
											
												
													
														|  |              :value="dict.value" />
 |  |              :value="dict.value" />
 | 
											
												
													
														|  |          </el-select>
 |  |          </el-select>
 | 
											
												
													
														|  |        </el-form-item>
 |  |        </el-form-item>
 | 
											
												
													
														|  | -      <!-- <el-form-item label="创建时间">
 |  | 
 | 
											
												
													
														|  | -        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
 |  | 
 | 
											
												
													
														|  | -          range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 |  | 
 | 
											
												
													
														|  | -      </el-form-item> -->
 |  | 
 | 
											
												
													
														|  | -      <!-- <el-form-item>
 |  | 
 | 
											
												
													
														|  | -        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
 |  | 
 | 
											
												
													
														|  | -        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 |  | 
 | 
											
												
													
														|  | -      </el-form-item> -->
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |      </el-form>
 |  |      </el-form>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      <el-row :gutter="10" class="mb8">
 |  |      <el-row :gutter="10" class="mb8">
 | 
											
										
											
												
													
														|  | @@ -36,34 +32,18 @@
 | 
											
												
													
														|  |          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
 |  |          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
 | 
											
												
													
														|  |            v-hasPermi="['system:role:add']">新增</el-button>
 |  |            v-hasPermi="['system:role:add']">新增</el-button>
 | 
											
												
													
														|  |        </el-col>
 |  |        </el-col>
 | 
											
												
													
														|  | -      <!-- <el-col :span="1.5">
 |  | 
 | 
											
												
													
														|  | -        <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
 |  | 
 | 
											
												
													
														|  | -          v-hasPermi="['system:role:edit']">修改</el-button>
 |  | 
 | 
											
												
													
														|  | -      </el-col>
 |  | 
 | 
											
												
													
														|  | -      <el-col :span="1.5">
 |  | 
 | 
											
												
													
														|  | -        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
 |  | 
 | 
											
												
													
														|  | -          v-hasPermi="['system:role:remove']">删除</el-button>
 |  | 
 | 
											
												
													
														|  | -      </el-col> -->
 |  | 
 | 
											
												
													
														|  | -      <!--      <el-col :span="1.5">-->
 |  | 
 | 
											
												
													
														|  | -      <!--        <el-button-->
 |  | 
 | 
											
												
													
														|  | -      <!--          type="warning"-->
 |  | 
 | 
											
												
													
														|  | -      <!--          plain-->
 |  | 
 | 
											
												
													
														|  | -      <!--          icon="el-icon-download"-->
 |  | 
 | 
											
												
													
														|  | -      <!--          size="mini"-->
 |  | 
 | 
											
												
													
														|  | -      <!--          @click="handleExport"-->
 |  | 
 | 
											
												
													
														|  | -      <!--          v-hasPermi="['system:role:export']"-->
 |  | 
 | 
											
												
													
														|  | -      <!--        >导出</el-button>-->
 |  | 
 | 
											
												
													
														|  | -      <!--      </el-col>-->
 |  | 
 | 
											
												
													
														|  | 
 |  | +  
 | 
											
												
													
														|  |        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 |  |        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 | 
											
												
													
														|  |      </el-row>
 |  |      </el-row>
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -    <el-table
 |  | 
 | 
											
												
													
														|  | 
 |  | +           </div>
 | 
											
												
													
														|  | 
 |  | + 
 | 
											
												
													
														|  | 
 |  | +           <el-table
 | 
											
												
													
														|  |            border
 |  |            border
 | 
											
												
													
														|  |            height="650"
 |  |            height="650"
 | 
											
												
													
														|  |            size="small"
 |  |            size="small"
 | 
											
												
													
														|  |      v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
 |  |      v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
 | 
											
												
													
														|  |        <!-- <el-table-column type="selection" width="50" align="center" /> -->
 |  |        <!-- <el-table-column type="selection" width="50" align="center" /> -->
 | 
											
												
													
														|  | -      <el-table-column label="序号" align="center" width="50">
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <el-table-column label="序号" align="center" width="100">
 | 
											
												
													
														|  |          <template v-slot:default="scope">
 |  |          <template v-slot:default="scope">
 | 
											
												
													
														|  |            <span v-text="getPageIndex(scope.$index)"> </span>
 |  |            <span v-text="getPageIndex(scope.$index)"> </span>
 | 
											
												
													
														|  |          </template>
 |  |          </template>
 | 
											
										
											
												
													
														|  | @@ -75,16 +55,14 @@
 | 
											
												
													
														|  |              </template>
 |  |              </template>
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  |            <el-table-column label="更新人" prop="createBy" :show-overflow-tooltip="true"  />
 |  |            <el-table-column label="更新人" prop="createBy" :show-overflow-tooltip="true"  />
 | 
											
												
													
														|  | -<!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"  />-->
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |        <el-table-column label="状态" align="center" >
 |  |        <el-table-column label="状态" align="center" >
 | 
											
												
													
														|  |          <template slot-scope="scope">
 |  |          <template slot-scope="scope">
 | 
											
												
													
														|  | -<!--          <el-switch v-model="scope.row.status" active-text inactive-text active-value="0" inactive-value="1"
 |  | 
 | 
											
												
													
														|  | -            @change="handleStatusChange(scope.row)">
 |  | 
 | 
											
												
													
														|  | -          </el-switch>-->
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
 |  |              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
 | 
											
												
													
														|  |          </template>
 |  |          </template>
 | 
											
												
													
														|  |        </el-table-column>
 |  |        </el-table-column>
 | 
											
												
													
														|  | -      <el-table-column label="创建时间" align="center" prop="createTime" width="150">
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
 | 
											
												
													
														|  |        </el-table-column>
 |  |        </el-table-column>
 | 
											
												
													
														|  |        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 |  |        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 | 
											
												
													
														|  |          <template slot-scope="scope" v-if="scope.row.id !== 1">
 |  |          <template slot-scope="scope" v-if="scope.row.id !== 1">
 | 
											
										
											
												
													
														|  | @@ -92,16 +70,6 @@
 | 
											
												
													
														|  |              v-hasPermi="['system:role:edit']">编辑</el-button>
 |  |              v-hasPermi="['system:role:edit']">编辑</el-button>
 | 
											
												
													
														|  |            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
 |  |            <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
 | 
											
												
													
														|  |              v-hasPermi="['system:role:remove']">删除</el-button>
 |  |              v-hasPermi="['system:role:remove']">删除</el-button>
 | 
											
												
													
														|  | -          <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
 |  | 
 | 
											
												
													
														|  | -            v-hasPermi="['system:role:edit']">
 |  | 
 | 
											
												
													
														|  | -            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
 |  | 
 | 
											
												
													
														|  | -            <el-dropdown-menu slot="dropdown">
 |  | 
 | 
											
												
													
														|  | -              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
 |  | 
 | 
											
												
													
														|  | -                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
 |  | 
 | 
											
												
													
														|  | -              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
 |  | 
 | 
											
												
													
														|  | -                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
 |  | 
 | 
											
												
													
														|  | -            </el-dropdown-menu>
 |  | 
 | 
											
												
													
														|  | -          </el-dropdown> -->
 |  | 
 | 
											
												
													
														|  |          </template>
 |  |          </template>
 | 
											
												
													
														|  |        </el-table-column>
 |  |        </el-table-column>
 | 
											
												
													
														|  |      </el-table>
 |  |      </el-table>
 | 
											
										
											
												
													
														|  | @@ -109,6 +77,9 @@
 | 
											
												
													
														|  |      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
 |  |      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
 | 
											
												
													
														|  |        @pagination="getList" />
 |  |        @pagination="getList" />
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +          </div>
 | 
											
												
													
														|  | 
 |  | +   
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |      <!-- 添加或修改角色配置对话框 -->
 |  |      <!-- 添加或修改角色配置对话框 -->
 | 
											
												
													
														|  |      <DialogCom :title="title" :visible.sync="open" width="750px" append-to-body>
 |  |      <DialogCom :title="title" :visible.sync="open" width="750px" append-to-body>
 | 
											
												
													
														|  |        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 |  |        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 | 
											
										
											
												
													
														|  | @@ -153,19 +124,6 @@
 | 
											
												
													
														|  |            </el-col>
 |  |            </el-col>
 | 
											
												
													
														|  |          </el-row>
 |  |          </el-row>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -<!--        <el-form-item prop="roleKey">
 |  | 
 | 
											
												
													
														|  | -          <span slot="label">
 |  | 
 | 
											
												
													
														|  | -            <el-tooltip content="控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
 |  | 
 | 
											
												
													
														|  | -              <i class="el-icon-question"></i>
 |  | 
 | 
											
												
													
														|  | -            </el-tooltip>
 |  | 
 | 
											
												
													
														|  | -            权限字符
 |  | 
 | 
											
												
													
														|  | -          </span>
 |  | 
 | 
											
												
													
														|  | -          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
 |  | 
 | 
											
												
													
														|  | -        </el-form-item>-->
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  |          <el-form-item label="菜单权限">
 |  |          <el-form-item label="菜单权限">
 | 
											
												
													
														|  |            <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
 |  |            <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
 | 
											
												
													
														|  |            <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
 |  |            <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
 |