From f2bc9fde40010ddb6fdbc4c36ee9fc0e83af8f03 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 06 三月 2025 16:45:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/system/role/index.vue | 429 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 296 insertions(+), 133 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0f5f894..0c3b2c2 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -2,7 +2,13 @@
<div class="app-container">
<div class="search">
<div>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ >
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
<el-input
v-model="queryParams.roleName"
@@ -48,21 +54,50 @@
></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-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>
</div>
<div class="addButton mb8">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:role:add']">鏂板</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['system:role:add']"
+ >鏂板</el-button
+ >
</div>
</div>
- <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+ <el-table
+ v-loading="loading"
+ :data="roleList"
+ @selection-change="handleSelectionChange"
+ >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="120" />
- <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" />
- <el-table-column label="鏉冮檺瀛楃" prop="roleKey" :show-overflow-tooltip="true" width="150" />
+ <el-table-column
+ label="瑙掕壊鍚嶇О"
+ prop="roleName"
+ :show-overflow-tooltip="true"
+ width="150"
+ />
+ <el-table-column
+ label="鏉冮檺瀛楃"
+ prop="roleKey"
+ :show-overflow-tooltip="true"
+ width="150"
+ />
<el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="100" />
<el-table-column label="鐘舵��" align="center" width="100">
<template slot-scope="scope">
@@ -74,12 +109,21 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <el-table-column
+ label="鍒涘缓鏃堕棿"
+ align="center"
+ prop="createTime"
+ width="180"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</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.roleId !== 1">
<el-button
size="mini"
@@ -87,35 +131,38 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
+ >淇敼</el-button
+ >
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
+ >鍒犻櫎</el-button
+ >
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row)"
- >璇︾粏</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>-->
+ >璇︾粏</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>
</el-table-column>
</el-table>
<pagination
- v-show="total>0"
+ v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -126,33 +173,68 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
- <el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" :disabled="title === '鏌ョ湅瑙掕壊'"/>
+ <el-input
+ v-model="form.roleName"
+ placeholder="璇疯緭鍏ヨ鑹插悕绉�"
+ :disabled="title === '鏌ョ湅瑙掕壊'"
+ />
</el-form-item>
<el-form-item prop="roleKey">
<span slot="label">
- <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+ <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="璇疯緭鍏ユ潈闄愬瓧绗�" :disabled="title === '鏌ョ湅瑙掕壊'"/>
+ <el-input
+ v-model="form.roleKey"
+ placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
+ :disabled="title === '鏌ョ湅瑙掕壊'"
+ />
</el-form-item>
<el-form-item label="瑙掕壊椤哄簭" prop="roleSort">
- <el-input-number v-model="form.roleSort" controls-position="right" :min="0" :disabled="title === '鏌ョ湅瑙掕壊'"/>
+ <el-input-number
+ v-model="form.roleSort"
+ controls-position="right"
+ :min="0"
+ :disabled="title === '鏌ョ湅瑙掕壊'"
+ />
</el-form-item>
<el-form-item label="鐘舵��">
- <el-radio-group v-model="form.status" :disabled="title === '鏌ョ湅瑙掕壊'">
+ <el-radio-group
+ v-model="form.status"
+ :disabled="title === '鏌ョ湅瑙掕壊'"
+ >
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
- >{{dict.label}}</el-radio>
+ >{{ dict.label }}</el-radio
+ >
</el-radio-group>
</el-form-item>
<el-form-item label="鑿滃崟鏉冮檺">
- <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')" v-if="title !== '鏌ョ湅瑙掕壊'">灞曞紑/鎶樺彔</el-checkbox>
- <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')" v-if="title !== '鏌ョ湅瑙掕壊'">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
- <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')" v-if="title !== '鏌ョ湅瑙掕壊'">鐖跺瓙鑱斿姩</el-checkbox>
+ <el-checkbox
+ v-model="menuExpand"
+ @change="handleCheckedTreeExpand($event, 'menu')"
+ v-if="title !== '鏌ョ湅瑙掕壊'"
+ >灞曞紑/鎶樺彔</el-checkbox
+ >
+ <el-checkbox
+ v-model="menuNodeAll"
+ @change="handleCheckedTreeNodeAll($event, 'menu')"
+ v-if="title !== '鏌ョ湅瑙掕壊'"
+ >鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox
+ >
+ <el-checkbox
+ v-model="form.menuCheckStrictly"
+ @change="handleCheckedTreeConnect($event, 'menu')"
+ v-if="title !== '鏌ョ湅瑙掕壊'"
+ >鐖跺瓙鑱斿姩</el-checkbox
+ >
<el-tree
:disabled="title === '鏌ョ湅瑙掕壊'"
class="tree-border"
@@ -163,23 +245,53 @@
:check-strictly="!form.menuCheckStrictly"
empty-text="鍔犺浇涓紝璇风◢鍊�"
:props="defaultProps"
- ></el-tree>
+ >
+ <span class="custom-tree-node" slot-scope="{ node, data }">
+ <span>{{ node.label }}</span>
+ <span>
+ <el-checkbox
+ v-model="data.isRersonal"
+ :true-label="1"
+ :false-label="0"
+ v-if="data.isRersonalButton == 1"
+ @change="(m) => chooseMe(m, data)"
+ :disabled="title === '鏌ョ湅瑙掕壊'"
+ >鍙湅鎴�</el-checkbox
+ >
+ </span>
+ </span>
+ </el-tree>
</el-form-item>
<el-form-item label="澶囨敞">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :disabled="title === '鏌ョ湅瑙掕壊'"></el-input>
+ <el-input
+ v-model="form.remark"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :disabled="title === '鏌ョ湅瑙掕壊'"
+ ></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitForm" v-if="title !== '鏌ョ湅瑙掕壊'">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ @click="submitForm"
+ v-if="title !== '鏌ョ湅瑙掕壊'"
+ >纭� 瀹�</el-button
+ >
</div>
</el-dialog>
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+ <el-dialog
+ :title="title"
+ :visible.sync="openDataScope"
+ width="500px"
+ append-to-body
+ >
<el-form :model="form" label-width="80px">
<el-form-item label="瑙掕壊鍚嶇О">
- <el-input v-model="form.roleName" :disabled="true"/>
+ <el-input v-model="form.roleName" :disabled="true" />
</el-form-item>
<el-form-item label="鏉冮檺瀛楃">
<el-input v-model="form.roleKey" :disabled="true" />
@@ -195,9 +307,21 @@
</el-select>
</el-form-item>
<el-form-item label="鏁版嵁鏉冮檺" v-show="form.dataScope == 2">
- <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">灞曞紑/鎶樺彔</el-checkbox>
- <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
- <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
+ <el-checkbox
+ v-model="deptExpand"
+ @change="handleCheckedTreeExpand($event, 'dept')"
+ >灞曞紑/鎶樺彔</el-checkbox
+ >
+ <el-checkbox
+ v-model="deptNodeAll"
+ @change="handleCheckedTreeNodeAll($event, 'dept')"
+ >鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox
+ >
+ <el-checkbox
+ v-model="form.deptCheckStrictly"
+ @change="handleCheckedTreeConnect($event, 'dept')"
+ >鐖跺瓙鑱斿姩</el-checkbox
+ >
<el-tree
class="tree-border"
:data="deptOptions"
@@ -220,14 +344,28 @@
</template>
<script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+import {
+ listRole,
+ getRole,
+ delRole,
+ addRole,
+ updateRole,
+ dataScope,
+ changeRoleStatus,
+ deptTreeSelect,
+} from "@/api/system/role";
+import {
+ treeselect as menuTreeselect,
+ roleMenuTreeselect,
+} from "@/api/system/menu";
export default {
name: "Role",
- dicts: ['sys_normal_disable'],
+ dicts: ["sys_normal_disable"],
data() {
return {
+ // 鍙湅鎴戞暟缁�
+ isRersonalMenuIds: [],
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -258,24 +396,24 @@
dataScopeOptions: [
{
value: "1",
- label: "鍏ㄩ儴鏁版嵁鏉冮檺"
+ label: "鍏ㄩ儴鏁版嵁鏉冮檺",
},
{
value: "2",
- label: "鑷畾鏁版嵁鏉冮檺"
+ label: "鑷畾鏁版嵁鏉冮檺",
},
{
value: "3",
- label: "鏈儴闂ㄦ暟鎹潈闄�"
+ label: "鏈儴闂ㄦ暟鎹潈闄�",
},
{
value: "4",
- label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺"
+ label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺",
},
{
value: "5",
- label: "浠呮湰浜烘暟鎹潈闄�"
- }
+ label: "浠呮湰浜烘暟鎹潈闄�",
+ },
],
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -287,36 +425,46 @@
pageSize: 10,
roleName: undefined,
roleKey: undefined,
- status: undefined
+ status: undefined,
},
// 琛ㄥ崟鍙傛暟
form: {},
defaultProps: {
children: "children",
- label: "label"
+ label: "label",
},
// 琛ㄥ崟鏍￠獙
rules: {
roleName: [
- { required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
],
roleKey: [
- { required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" },
],
roleSort: [
- { required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" }
- ]
- }
+ { required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ },
};
},
created() {
this.getList();
},
methods: {
+ // 鍙湅鎴�
+ chooseMe(val, data) {
+ let index = this.isRersonalMenuIds.findIndex((m) => m == data.id);
+ if (index < 0 && val == 1) {
+ this.isRersonalMenuIds.push(data.id);
+ } else if (val == 0 && index > -1) {
+ this.isRersonalMenuIds.splice(index, 1);
+ }
+ },
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
- listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+ listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
+ (response) => {
this.roleList = response.rows;
this.total = response.total;
this.loading = false;
@@ -325,7 +473,7 @@
},
/** 鏌ヨ鑿滃崟鏍戠粨鏋� */
getMenuTreeselect() {
- menuTreeselect().then(response => {
+ menuTreeselect().then((response) => {
this.menuOptions = response.data;
});
},
@@ -349,14 +497,14 @@
},
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
getRoleMenuTreeselect(roleId) {
- return roleMenuTreeselect(roleId).then(response => {
+ return roleMenuTreeselect(roleId).then((response) => {
this.menuOptions = response.menus;
return response;
});
},
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
getDeptTree(roleId) {
- return deptTreeSelect(roleId).then(response => {
+ return deptTreeSelect(roleId).then((response) => {
this.deptOptions = response.depts;
return response;
});
@@ -364,13 +512,17 @@
// 瑙掕壊鐘舵�佷慨鏀�
handleStatusChange(row) {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- this.$modal.confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚楋紵').then(function() {
- return changeRoleStatus(row.roleId, row.status);
- }).then(() => {
- this.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0";
- });
+ this.$modal
+ .confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚楋紵')
+ .then(function () {
+ return changeRoleStatus(row.roleId, row.status);
+ })
+ .then(() => {
+ this.$modal.msgSuccess(text + "鎴愬姛");
+ })
+ .catch(function () {
+ row.status = row.status === "0" ? "1" : "0";
+ });
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -387,22 +539,23 @@
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([]);
}
- this.menuExpand = false,
- this.menuNodeAll = false,
- this.deptExpand = true,
- this.deptNodeAll = false,
- this.form = {
- roleId: undefined,
- roleName: undefined,
- roleKey: undefined,
- roleSort: 0,
- status: "0",
- menuIds: [],
- deptIds: [],
- menuCheckStrictly: true,
- deptCheckStrictly: true,
- remark: undefined
- };
+ (this.menuExpand = false),
+ (this.menuNodeAll = false),
+ (this.deptExpand = true),
+ (this.deptNodeAll = false),
+ (this.form = {
+ roleId: undefined,
+ roleName: undefined,
+ roleKey: undefined,
+ roleSort: 0,
+ status: "0",
+ menuIds: [],
+ deptIds: [],
+ isRersonalMenuIds: [],
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: undefined,
+ });
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -418,9 +571,9 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.roleId)
- this.single = selection.length!=1
- this.multiple = !selection.length
+ this.ids = selection.map((item) => item.roleId);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
},
// 鏇村鎿嶄綔瑙﹀彂
handleCommand(command, row) {
@@ -437,12 +590,12 @@
},
// 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�
handleCheckedTreeExpand(value, type) {
- if (type == 'menu') {
+ if (type == "menu") {
let treeList = this.menuOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
}
- } else if (type == 'dept') {
+ } else if (type == "dept") {
let treeList = this.deptOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
@@ -451,18 +604,18 @@
},
// 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級
handleCheckedTreeNodeAll(value, type) {
- if (type == 'menu') {
- this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
- } else if (type == 'dept') {
- this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
+ if (type == "menu") {
+ this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+ } else if (type == "dept") {
+ this.$refs.dept.setCheckedNodes(value ? this.deptOptions : []);
}
},
// 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛�
handleCheckedTreeConnect(value, type) {
- if (type == 'menu') {
- this.form.menuCheckStrictly = value ? true: false;
- } else if (type == 'dept') {
- this.form.deptCheckStrictly = value ? true: false;
+ if (type == "menu") {
+ this.form.menuCheckStrictly = value ? true : false;
+ } else if (type == "dept") {
+ this.form.deptCheckStrictly = value ? true : false;
}
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -475,48 +628,48 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- const roleId = row.roleId || this.ids
+ const roleId = row.roleId || this.ids;
const roleMenu = this.getRoleMenuTreeselect(roleId);
- getRole(roleId).then(response => {
+ getRole(roleId).then((response) => {
this.form = response.data;
this.open = true;
this.$nextTick(() => {
- roleMenu.then(res => {
- let checkedKeys = res.checkedKeys
+ roleMenu.then((res) => {
+ let checkedKeys = res.checkedKeys;
checkedKeys.forEach((v) => {
- this.$nextTick(()=>{
- this.$refs.menu.setChecked(v, true ,false);
- })
- })
+ this.$nextTick(() => {
+ this.$refs.menu.setChecked(v, true, false);
+ });
+ });
});
});
});
this.title = "淇敼瑙掕壊";
},
// 鏌ョ湅瑙掕壊璇︽儏
- handleView (row) {
+ handleView(row) {
this.title = "鏌ョ湅瑙掕壊";
this.reset();
- const roleId = row.roleId || this.ids
+ const roleId = row.roleId || this.ids;
const roleMenu = this.getRoleMenuTreeselect(roleId);
- getRole(roleId).then(response => {
+ getRole(roleId).then((response) => {
this.form = response.data;
this.open = true;
this.$nextTick(() => {
- roleMenu.then(res => {
- let checkedKeys = res.checkedKeys
+ roleMenu.then((res) => {
+ let checkedKeys = res.checkedKeys;
checkedKeys.forEach((v) => {
- this.$nextTick(()=>{
- this.$refs.menu.setChecked(v, true ,false);
- })
- })
+ this.$nextTick(() => {
+ this.$refs.menu.setChecked(v, true, false);
+ });
+ });
});
});
});
},
/** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
dataScopeSelectChange(value) {
- if(value !== '2') {
+ if (value !== "2") {
this.$refs.dept.setCheckedKeys([]);
}
},
@@ -524,11 +677,11 @@
handleDataScope(row) {
this.reset();
const deptTreeSelect = this.getDeptTree(row.roleId);
- getRole(row.roleId).then(response => {
+ getRole(row.roleId).then((response) => {
this.form = response.data;
this.openDataScope = true;
this.$nextTick(() => {
- deptTreeSelect.then(res => {
+ deptTreeSelect.then((res) => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
});
});
@@ -536,24 +689,26 @@
this.title = "鍒嗛厤鏁版嵁鏉冮檺";
},
/** 鍒嗛厤鐢ㄦ埛鎿嶄綔 */
- handleAuthUser: function(row) {
+ handleAuthUser: function (row) {
const roleId = row.roleId;
this.$router.push("/system/role-auth/user/" + roleId);
},
/** 鎻愪氦鎸夐挳 */
- submitForm: function() {
- this.$refs["form"].validate(valid => {
+ submitForm: function () {
+ this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
- updateRole(this.form).then(response => {
+ this.form.isRersonalMenuIds = this.isRersonalMenuIds;
+ updateRole(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
- addRole(this.form).then(response => {
+ this.form.isRersonalMenuIds = this.isRersonalMenuIds;
+ addRole(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -563,10 +718,10 @@
});
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
- submitDataScope: function() {
+ submitDataScope: function () {
if (this.form.roleId != undefined) {
this.form.deptIds = this.getDeptAllCheckedKeys();
- dataScope(this.form).then(response => {
+ dataScope(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.openDataScope = false;
this.getList();
@@ -576,20 +731,28 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const roleIds = row.roleId || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�"' + roleIds + '"鐨勬暟鎹」锛�').then(function() {
- return delRole(roleIds);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal
+ .confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�"' + roleIds + '"鐨勬暟鎹」锛�')
+ .then(function () {
+ return delRole(roleIds);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('system/role/export', {
- ...this.queryParams
- }, `role_${new Date().getTime()}.xlsx`)
- }
- }
+ this.download(
+ "system/role/export",
+ {
+ ...this.queryParams,
+ },
+ `role_${new Date().getTime()}.xlsx`
+ );
+ },
+ },
};
</script>
--
Gitblit v1.9.3