Merge remote-tracking branch 'origin/branch_20190822' into branch_20190822

console-web/src/views/modules/pub/role.vue

@@ -5,7 +5,7 @@
         <el-input v-model="dataForm.roleName" placeholder="角色名称" clearable></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="text" size="small" @click="queryHandle(scope.row.id)">查看</el-button>
+        <el-button @click="getDataList()">查询</el-button>
         <el-button v-if="isAuth('sys:role:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
         <el-button v-if="isAuth('sys:role:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
       </el-form-item>