Commit a11f3d06 authored by tianhongyang's avatar tianhongyang

企业管理新添账号前端增加验证规则

修复框架自带角色管理模块数据权限取值错误bug
parent 06818197
......@@ -565,6 +565,24 @@ export async function elementMessageSingleton(type = "success", messgage = "") {
}
}
/**
* 检测数组对象中是否有重复数据
* @param {Array} arr
* @param {string | null} mapKey
* @returns
*/
export function hasDuplicates(arr, mapKey = null) {
const map = new Map();
for (const item of arr) {
const key = mapKey ? item[mapKey] : JSON.stringify(item);
if (map.has(key)) {
return { hasRepeat: true, repeatKey: key };
}
map.set(key, true);
}
return { hasRepeat: false, repeatKey: key };
}
// 甲方详情左侧菜单映射
export const detailSideBar = new Map([
// 企业速览
......
......@@ -30,7 +30,7 @@
<!-- 底部提交 取消按钮 -->
<div class="add-account-footer">
<el-button type="primary" size="medium" @click="submitAdd">确定</el-button>
<el-button size="medium" @click="dialogClose">取消</el-button>
<el-button size="medium" @click="dialogStatus = false">取消</el-button>
</div>
</template>
</el-dialog>
......@@ -40,7 +40,7 @@
import { Loading } from 'element-ui';
import { enterpriseAddAccountApi } from "@/api/enterpriseManagement/enterpriseManagement";
import { phoneNumberValidator, requiredStrLengthValidator } from "@/utils/validate";
import { elementMessageSingleton } from "@/utils/";
import { elementMessageSingleton, hasDuplicates } from "@/utils/";
import { v4 } from 'uuid';
export default {
name: "enterpriseAddAccount",
......@@ -111,6 +111,7 @@ export default {
},
addAccount() {
if (this.comAddAccountCount >= 6) return elementMessageSingleton("warning", "该租户下已经添加了五个账号");
if (this.accountForm.accountList?.length >= 5) return elementMessageSingleton("warning", "最多添加五个账号");
const remaining = 6 - this.comAddAccountCount;
const len = this.accountForm?.accountList?.length;
if (len >= remaining) return elementMessageSingleton("warning", `该租户下剩余可添加账号个数为 ${remaining} 个,现已添加 ${len} 个`);
......@@ -123,6 +124,8 @@ export default {
submitAdd() {
this.$refs["accountForm"].validate(async flag => {
if (!flag) return;
const { hasRepeat, repeatKey } = hasDuplicates(JSON.parse(JSON.stringify(this.accountForm.accountList)), "phonenumber");
if (hasRepeat) return elementMessageSingleton("warning", `电话号码 ${repeatKey} 不允许重复创建`);
const loadingService = Loading.service({
target: ".enterprise-add-account-dialog",
lock: true,
......@@ -130,7 +133,6 @@ export default {
});
let successCount = 0;
try {
// 验证通过提交信息
const array = (JSON.parse(JSON.stringify(this.accountForm.accountList))).map(({ nickName, phonenumber }) => ({ nickName, phonenumber }));
let len = array.length;
......@@ -155,7 +157,7 @@ export default {
count++;
}
}
this.dialogClose();
this.dialogStatus = false;
} catch (error) {
console.log(error);
} finally {
......
......@@ -68,7 +68,7 @@
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
......@@ -85,7 +85,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="续约时间" prop="dateRange">
<el-date-picker :disabled="disabled" v-model="form.dateRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker :disabled="disabled" v-model="form.dateRange" style="width: 100%" value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item>
</el-col>
......@@ -98,7 +98,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="企业方案" prop="packageId">
<el-select :disabled="disabled" v-model="form.packageId" placeholder="企业方案" clearable style="width: 240px">
<el-select :disabled="disabled" v-model="form.packageId" placeholder="企业方案" clearable style="width: 100%">
<el-option v-for="dict in packageList" :key="dict.packageId" :label="dict.packageName" :value="dict.packageId" />
</el-select>
</el-form-item>
......@@ -288,8 +288,8 @@ export default {
getList() {
this.loading = true;
getTenantList(this.queryParams).then(response => {
this.tenantList = response.rows;
this.total = response.total;
this.tenantList = response.rows ? response.rows : [];
this.total = response.total ? response.total : 0;
this.loading = false;
}
);
......
......@@ -2,13 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="方案名称" prop="packageName">
<el-input
v-model="queryParams.packageName"
placeholder="请输入方案名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.packageName" placeholder="请输入方案名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -18,52 +12,33 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>批量删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">批量删除</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="packList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" width="60">
<el-table-column label="序号" width="60">
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="方案名称" prop="packageName" :show-overflow-tooltip="true" width="150" />
<el-table-column label="备注" prop="remark" width="400">
<template slot-scope="scope">
<el-popover
title=""
:visible-arrow="false"
width="400"
trigger="hover"
popper-class="popovers"
:content="scope.row.remark">
<div class="over" slot="reference">{{scope.row.remark}}</div>
</el-popover>
<template slot-scope="scope">
<el-popover title="" :visible-arrow="false" width="400" trigger="hover" popper-class="popovers" :content="scope.row.remark">
<div class="over" slot="reference">{{scope.row.remark}}</div>
</el-popover>
</template>
</template>
</el-table-column>
<el-table-column label="方案状态" align="center" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.ent_pro_status" :value="scope.row.status"/>
<dict-tag :options="dict.type.ent_pro_status" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
......@@ -73,41 +48,20 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-zoom-in"
@click="handleLook(scope.row)"
>查看</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-zoom-in" @click="handleLook(scope.row)">查看</el-button>
<!--<el-button-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-upload"-->
<!--@click="handleSave(scope.row.packageId)"-->
<!--size="mini"-->
<!--type="text"-->
<!--icon="el-icon-upload"-->
<!--@click="handleSave(scope.row.packageId)"-->
<!--&gt;同步</el-button>-->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 添加或修改租户套餐配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
......@@ -124,16 +78,8 @@
<el-checkbox :disabled="disabled" v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
<el-checkbox :disabled="disabled" v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
<el-checkbox :disabled="disabled" v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
<el-tree
class="tree-border"
:data="menuOptions"
show-checkbox
ref="menu"
node-key="id"
:check-strictly="!form.menuCheckStrictly"
empty-text="加载中,请稍候"
:props="defaultProps"
></el-tree>
<el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id" :check-strictly="!form.menuCheckStrictly"
empty-text="加载中,请稍候" :props="defaultProps"></el-tree>
</el-form-item>
<el-form-item label="备注">
<el-input :disabled="disabled" v-model="form.remark" maxlength="50" type="textarea" placeholder="请输入文字(50字以内)"></el-input>
......@@ -148,265 +94,265 @@
</template>
<script>
import { qytreeselect} from "@/api/system/menu";
import { qytreeselect } from "@/api/system/menu";
import { addTenantPackage ,getTenantPackage,detailTenantPackage,saveTenantPackage,deleteTenantPackage} from "@/api/enterpriseManagement/enterpriseManagement";
import { addTenantPackage, getTenantPackage, detailTenantPackage, saveTenantPackage, deleteTenantPackage } from "@/api/enterpriseManagement/enterpriseManagement";
export default {
name: "Programme",
dicts: ['ent_pro_status'],
data() {
return {
disabled:false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 方案表格数据
packList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 是否显示弹出层(数据权限)
openDataScope: false,
menuExpand: false,
menuNodeAll: false,
deptExpand: true,
// 日期范围
dateRange: [],
// 菜单列表
menuOptions: [],
// 部门列表
deptOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
packageName:'',
},
// 表单参数
form: {},
defaultProps: {
children: "children",
label: "label",
disabled:this.disabledFn
},
// 表单校验
rules: {
packageName: [
{ required: true, message: "套餐名称不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "blur" }
],
menuIds: [
{ required: true, message: "权限不能为空", trigger: "blur" }
],
}
};
export default {
name: "Programme",
dicts: ['ent_pro_status'],
data() {
return {
disabled: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 方案表格数据
packList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 是否显示弹出层(数据权限)
openDataScope: false,
menuExpand: false,
menuNodeAll: false,
deptExpand: true,
// 日期范围
dateRange: [],
// 菜单列表
menuOptions: [],
// 部门列表
deptOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
packageName: '',
},
// 表单参数
form: {},
defaultProps: {
children: "children",
label: "label",
disabled: this.disabledFn
},
// 表单校验
rules: {
packageName: [
{ required: true, message: "套餐名称不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "状态不能为空", trigger: "blur" }
],
menuIds: [
{ required: true, message: "权限不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getMenuTreeselect();
},
methods: {
disabledFn() {
return this.disabled;
},
/** 查询方案列表 */
getList() {
this.loading = true;
getTenantPackage(this.queryParams).then(response => {
this.packList = response.rows ? response.rows : [];
this.total = response.total ? response.total : 0;
this.loading = false;
}
);
},
/** 查询菜单树结构 */
getMenuTreeselect() {
qytreeselect().then(response => {
this.menuOptions = response.data;
});
},
created() {
// 所有菜单节点数据
getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
let checkedKeys = this.$refs.menu.getCheckedKeys();
// 半选中的菜单节点
let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([]);
}
this.menuExpand = false,
this.menuNodeAll = false,
this.deptExpand = true,
this.form = {
packageId: undefined,
packageName: undefined,
remark: undefined,
menuCheckStrictly: true,
status: "0",
menuIds: [],
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
this.getMenuTreeselect();
},
methods: {
disabledFn(){
return this.disabled
},
/** 查询方案列表 */
getList() {
this.loading = true;
getTenantPackage(this.queryParams).then(response => {
this.packList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
/** 查询菜单树结构 */
getMenuTreeselect() {
qytreeselect().then(response => {
this.menuOptions = response.data;
});
},
// 所有菜单节点数据
getMenuAllCheckedKeys() {
// 目前被选中的菜单节点
let checkedKeys = this.$refs.menu.getCheckedKeys();
// 半选中的菜单节点
let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
return checkedKeys;
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
if (this.$refs.menu != undefined) {
this.$refs.menu.setCheckedKeys([]);
}
this.menuExpand = false,
this.menuNodeAll = false,
this.deptExpand = true,
this.form = {
packageId: undefined,
packageName: undefined,
remark: undefined,
menuCheckStrictly:true,
status: "0",
menuIds: [],
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.packageId)
this.single = selection.length!=1
this.multiple = !selection.length
},
// 树权限(展开/折叠)
handleCheckedTreeExpand(value, type) {
let treeList = this.menuOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
}
},
// 树权限(全选/全不选)
handleCheckedTreeNodeAll(value, type) {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
},
// 树权限(父子联动)
handleCheckedTreeConnect(value, type) {
if (type == 'menu') {
this.form.menuCheckStrictly = value ? true: false;
} else if (type == 'dept') {
this.form.deptCheckStrictly = value ? true: false;
}
},
/** 新增按钮操作 */
handleAdd() {
this.disabled = false
this.reset();
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.packageId);
this.single = selection.length != 1;
this.multiple = !selection.length;
},
// 树权限(展开/折叠)
handleCheckedTreeExpand(value, type) {
let treeList = this.menuOptions;
for (let i = 0; i < treeList.length; i++) {
this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
}
},
// 树权限(全选/全不选)
handleCheckedTreeNodeAll(value, type) {
this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
},
// 树权限(父子联动)
handleCheckedTreeConnect(value, type) {
if (type == 'menu') {
this.form.menuCheckStrictly = value ? true : false;
} else if (type == 'dept') {
this.form.deptCheckStrictly = value ? true : false;
}
},
/** 新增按钮操作 */
handleAdd() {
this.disabled = false;
this.reset();
this.open = true;
this.title = "添加方案";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.disabled = false;
this.reset();
const packageId = row.packageId;
detailTenantPackage(packageId).then(response => {
response.data.menuIds = response.data.menuIds.split(',');
this.form = response.data;
this.open = true;
this.title = "添加方案";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.disabled = false
this.reset();
const packageId = row.packageId
detailTenantPackage(packageId).then(response => {
response.data.menuIds = response.data.menuIds.split(',')
this.form = response.data;
this.open = true;
this.$nextTick(() => {
let checkedKeys = response.data.menuIds
// menuOptions
this.$nextTick(() => {
let checkedKeys = response.data.menuIds;
// menuOptions
checkedKeys.forEach((v) => {
v = v.trim()
let nodes = this.$refs.menu.getNode(v)
if(nodes&&nodes.isLeaf && nodes.isLeaf == true){
this.$refs.menu.setChecked(v,true,true);
}else{
this.$refs.menu.setChecked(v,true,false);
}
})
})
this.title = this.disabled == true?'查看方案':"修改方案";
});
},
//查看
handleLook(row){
this.handleUpdate(row)
this.disabled = true
},
/** 提交按钮 */
submitForm: function() {
this.form.menuIds = this.getMenuAllCheckedKeys();
this.$refs["form"].validate(valid => {
if (valid) {
// return false
if (this.form.packageId != undefined) {
saveTenantPackage(this.form).then(response => {
if(response.code == 200){
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}else{
this.$message.error(response.msg)
}
});
checkedKeys.forEach((v) => {
v = v.trim();
let nodes = this.$refs.menu.getNode(v);
if (nodes && nodes.isLeaf && nodes.isLeaf == true) {
this.$refs.menu.setChecked(v, true, true);
} else {
// this.form.menuIds = this.getMenuAllCheckedKeys();
addTenantPackage(this.form).then(response => {
if(response.code == 200){
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}else{
this.$message.error(response.msg)
}
});
this.$refs.menu.setChecked(v, true, false);
}
});
});
this.title = this.disabled == true ? '查看方案' : "修改方案";
});
},
//查看
handleLook(row) {
this.handleUpdate(row);
this.disabled = true;
},
/** 提交按钮 */
submitForm: function () {
this.form.menuIds = this.getMenuAllCheckedKeys();
this.$refs["form"].validate(valid => {
if (valid) {
// return false
if (this.form.packageId != undefined) {
saveTenantPackage(this.form).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
} else {
this.$message.error(response.msg);
}
});
} else {
// this.form.menuIds = this.getMenuAllCheckedKeys();
addTenantPackage(this.form).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
} else {
this.$message.error(response.msg);
}
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const packageIds = row.packageId || this.ids;
let _this = this;
this.$modal.confirm('是否确认删除选中的方案数据项?').then(function () {
deleteTenantPackage(packageIds).then(res => {
if (res.code == 200) {
_this.getList();
_this.$message.success("删除成功");
} else {
_this.$message.error(res.msg);
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const packageIds = row.packageId || this.ids;
let _this = this
this.$modal.confirm('是否确认删除选中的方案数据项?').then(function() {
deleteTenantPackage(packageIds).then(res=>{
if(res.code == 200){
_this.getList();
_this.$message.success("删除成功");
}else{
_this.$message.error(res.msg);
}
});
}).catch(() => {});
},
}
};
}).catch(() => { });
},
}
};
</script>
<style scoped lang="scss">
.over{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.over {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
</style>
<style lang="scss">
.popovers {
padding: 6px 12px !important;
line-height: 20px;
color: rgba(35, 35, 35, 0.80);
font-size: 12px;
}
.popovers {
padding: 6px 12px !important;
line-height: 20px;
color: rgba(35, 35, 35, 0.8);
font-size: 12px;
}
</style>
......@@ -297,7 +297,7 @@ export default {
/** 根据角色ID查询组织树结构 */
getDeptTree(roleId) {
return deptTreeSelect(roleId).then(response => {
this.deptOptions = response.depts;
this.deptOptions = response.data?.depts ? response.data?.depts : [];
return response;
});
},
......@@ -440,19 +440,19 @@ export default {
}
},
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
const deptTreeSelect = this.getDeptTree(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
async handleDataScope(row) {
try {
this.reset();
const res = await this.getDeptTree(row.roleId);
const result = await getRole(row.roleId);
this.form = result.data;
this.openDataScope = true;
this.$nextTick(() => {
deptTreeSelect.then(res => {
this.$refs.dept.setCheckedKeys(res.checkedKeys);
});
});
this.title = "分配数据权限";
});
await this.$nextTick();
this.$refs.dept.setCheckedKeys(res.checkedKeys ? res.checkedKeys : []);
} catch (error) {
console.log(error);
}
},
/** 分配用户操作 */
handleAuthUser: function (row) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment