|
@@ -12,14 +12,17 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="字符标识" prop="roleKey">
|
|
|
- <el-input
|
|
|
- maxlength="50"
|
|
|
+ <el-select
|
|
|
v-model="queryParams.roleKey"
|
|
|
- placeholder="请输入字符标识"
|
|
|
- clearable
|
|
|
- style="width: 240px"
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
+ placeholder="请选择字符标识"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in pcOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
<el-select
|
|
@@ -120,7 +123,19 @@
|
|
|
<el-input v-model="form.roleName" maxlength="15" placeholder="请输入角色名称" :disabled="edit"/>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="字符标识" prop="roleKey">
|
|
|
- <el-input v-model="form.roleKey" maxlength="50" placeholder="请输入字符标识" :disabled="edit"/>
|
|
|
+ <el-select
|
|
|
+ @change="changepc"
|
|
|
+ v-model="form.roleKey"
|
|
|
+ placeholder="请选择字符标识"
|
|
|
+ :disabled="edit"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in pcOptions"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="角色顺序" prop="roleSort">
|
|
|
<el-input-number v-model="form.roleSort" controls-position="right" :min="0" :disabled="edit"/>
|
|
@@ -169,7 +184,7 @@
|
|
|
ref="menu"
|
|
|
node-key="id"
|
|
|
:check-strictly="!form.menuCheckStrictly"
|
|
|
- empty-text="加载中,请稍候"
|
|
|
+ empty-text="无数据,请选择字符标识!"
|
|
|
:props="defaultProps"
|
|
|
></el-tree>
|
|
|
</el-form-item>
|
|
@@ -273,6 +288,15 @@ export default {
|
|
|
menuNodeAll: false,
|
|
|
deptExpand: true,
|
|
|
deptNodeAll: false,
|
|
|
+ pcOptions: [
|
|
|
+ {value: 'XTGL', label: 'XTGL'},
|
|
|
+ {value: 'SJGL', label: 'SJGL'},
|
|
|
+ {value: 'SHGL', label: 'SHGL'},
|
|
|
+ {value: 'YWGL', label: 'YWGL'},
|
|
|
+ {value: 'SJYW', label: 'SJYW'},
|
|
|
+ {value: 'YWPZ', label: 'YWPZ'},
|
|
|
+ {value: 'YWCZ', label: 'YWCZ'}
|
|
|
+ ],
|
|
|
// 日期范围
|
|
|
dateRange: [],
|
|
|
// 数据范围选项
|
|
@@ -332,6 +356,9 @@ export default {
|
|
|
this.getList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ changepc(value){
|
|
|
+ this.getMenuTreeselect(value);
|
|
|
+ },
|
|
|
// 列表状态格式化
|
|
|
typeFormat({cellValue}) {
|
|
|
let belongTo = '未知的类型'
|
|
@@ -396,7 +423,7 @@ export default {
|
|
|
return belongTo
|
|
|
},
|
|
|
/** 查询菜单树结构 */
|
|
|
- async getMenuTreeselect() {
|
|
|
+ async getMenuTreeselect(pc) {
|
|
|
let sysTime
|
|
|
let lk
|
|
|
await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
|
|
@@ -405,6 +432,7 @@ export default {
|
|
|
}).catch((error) => {
|
|
|
})
|
|
|
var searchParams = {
|
|
|
+ pc: pc,
|
|
|
sysTime: sysTime,
|
|
|
lk: lk
|
|
|
}
|
|
@@ -432,7 +460,6 @@ export default {
|
|
|
}
|
|
|
this.$axios.get('/sysMenuController/roleMenuTreeselect',
|
|
|
{params: param}).then((res) => {
|
|
|
- console.log(res.data)
|
|
|
this.menuOptions = res.data.menus;
|
|
|
return res.data
|
|
|
}).catch((error) => {
|
|
@@ -453,11 +480,13 @@ export default {
|
|
|
},
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
+ this.menuOptions=[];
|
|
|
this.open = false;
|
|
|
this.reset();
|
|
|
},
|
|
|
// 取消按钮(数据权限)
|
|
|
cancelDataScope() {
|
|
|
+ this.deptOptions=[];
|
|
|
this.openDataScope = false;
|
|
|
this.reset();
|
|
|
},
|
|
@@ -547,7 +576,7 @@ export default {
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd: debounce(function () {
|
|
|
this.reset();
|
|
|
- this.getMenuTreeselect();
|
|
|
+ // this.getMenuTreeselect();
|
|
|
this.open = true;
|
|
|
this.title = "添加角色";
|
|
|
this.edit = false;
|
|
@@ -564,11 +593,31 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (_selectData.roleKey == 'xtgly' || _selectData.roleKey == 'sjgly') {
|
|
|
+ if (_selectData.roleKey == 'XTGL' || _selectData.roleKey == 'SJGL') {
|
|
|
this.edit=true;
|
|
|
}
|
|
|
const roleId = _selectData.roleId
|
|
|
|
|
|
+ let sysTime
|
|
|
+ let lk
|
|
|
+ await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
|
|
|
+ sysTime = res.data.sysTime
|
|
|
+ lk = res.data.lk
|
|
|
+ }).catch((error) => {
|
|
|
+ })
|
|
|
+
|
|
|
+ var param = {
|
|
|
+ roleId: roleId,
|
|
|
+ sysTime: sysTime,
|
|
|
+ lk: lk
|
|
|
+ }
|
|
|
+ await this.$axios.get('/sysRoleController/getInfo',
|
|
|
+ {params: param}).then((res2) => {
|
|
|
+ this.form = res2.data;
|
|
|
+ this.open = true;
|
|
|
+ })
|
|
|
+ this.title = "修改角色";
|
|
|
+
|
|
|
let sysTime1
|
|
|
let lk1
|
|
|
await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
|
|
@@ -586,32 +635,13 @@ export default {
|
|
|
{params: param1}).then((res) => {
|
|
|
this.menuOptions = res.data.menus;
|
|
|
let checkedKeys = res.data.checkedKeys
|
|
|
+ console.log(checkedKeys)
|
|
|
checkedKeys.forEach((v) => {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.menu.setChecked(v, true, false);
|
|
|
})
|
|
|
})
|
|
|
})
|
|
|
-
|
|
|
- let sysTime
|
|
|
- let lk
|
|
|
- await this.$axios.get('/sysPolicyController/getLicenseKey').then((res) => {
|
|
|
- sysTime = res.data.sysTime
|
|
|
- lk = res.data.lk
|
|
|
- }).catch((error) => {
|
|
|
- })
|
|
|
-
|
|
|
- var param = {
|
|
|
- roleId: roleId,
|
|
|
- sysTime: sysTime,
|
|
|
- lk: lk
|
|
|
- }
|
|
|
- await this.$axios.get('/sysRoleController/getInfo',
|
|
|
- {params: param}).then((res2) => {
|
|
|
- this.form = res2.data;
|
|
|
- this.open = true;
|
|
|
- })
|
|
|
- this.title = "修改角色";
|
|
|
}, 1000),
|
|
|
/** 选择角色权限范围触发 */
|
|
|
dataScopeSelectChange(value) {
|
|
@@ -628,12 +658,12 @@ export default {
|
|
|
submitForm: debounce(function () {
|
|
|
this.$refs["form"].validate(async valid => {
|
|
|
if (valid) {
|
|
|
- if (this.form.roleKey.trim() == 'xtgly' || this.form.roleKey.trim() == 'sjgly') {
|
|
|
+ if (this.form.roleKey.trim() == 'XTGL' || this.form.roleKey.trim() == 'SJGL') {
|
|
|
if (this.form.builtIn != '0') {
|
|
|
// 不是内置用户则拦截
|
|
|
this.$message({
|
|
|
type: 'warning',
|
|
|
- message: '字符标识不能是xtgly或sjgly!'
|
|
|
+ message: '内置角色标识XTGL和SJGL不能再次添加!'
|
|
|
});
|
|
|
return
|
|
|
}
|
|
@@ -658,6 +688,7 @@ export default {
|
|
|
this.open = false;
|
|
|
this.reset();
|
|
|
this.getList();
|
|
|
+ this.menuOptions=[];
|
|
|
}
|
|
|
if (res.code == 1) {
|
|
|
this.$message.error(res.data)
|
|
@@ -674,6 +705,7 @@ export default {
|
|
|
this.open = false;
|
|
|
this.reset();
|
|
|
this.getList();
|
|
|
+ this.menuOptions=[];
|
|
|
}
|
|
|
if (res.code == 1) {
|
|
|
this.$message.error(res.data)
|
|
@@ -708,7 +740,7 @@ export default {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if (_selectData.roleKey == 'xtgly' || _selectData.roleKey == 'sjgly') {
|
|
|
+ if (_selectData.roleKey == 'XTGL' || _selectData.roleKey == 'SJGL') {
|
|
|
this.$message({
|
|
|
type: 'warning',
|
|
|
message: '内置角色不能删除!'
|