From e87af49e817e243e464270e41881667f012a0734 Mon Sep 17 00:00:00 2001 From: xuyiming Date: Fri, 19 Jun 2020 14:24:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=BB=84=E7=BB=87=E3=80=81=E6=96=B0=E5=BB=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E3=80=81=E6=96=B0=E5=BB=BA=E8=A7=92=E8=89=B2=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/organizationedit.vue | 38 +-- src/pages/authority/role/addroles.vue | 7 +- src/pages/authority/user/organizationuser.vue | 228 ++++++++++-------- src/pages/workbench/app_build.vue | 21 +- 4 files changed, 172 insertions(+), 122 deletions(-) diff --git a/src/pages/authority/organization/organizationedit.vue b/src/pages/authority/organization/organizationedit.vue index 2671132..c6643b8 100644 --- a/src/pages/authority/organization/organizationedit.vue +++ b/src/pages/authority/organization/organizationedit.vue @@ -124,13 +124,15 @@ export default { rules: { name: [ { required: true, message: "请输入组织机构名称", trigger: "blur" }, + { max: 10, message: "长度小于10个字符", trigger: "blur" }, ], shortname: [ // { required: true, message: '请输入组织机构简称', trigger: 'blur' }, + { max: 10, message: "长度小于10个字符", trigger: "blur" }, ], desc: [ // { required: true, message: '请输入组织说明', trigger: 'blur' }, - { max: 200, message: "长度小于200个字符", trigger: "blur" }, + { max: 500, message: "长度小于500个字符", trigger: "blur" }, ], fileList: [ // {required: true, message: '请上传图片', trigger: 'change'} @@ -179,10 +181,10 @@ export default { ) .then((response) => { console.log(response); - if(!response.data.success){ - this.$message.error(response.data.errMsg) - return - } + if (!response.data.success) { + this.$message.error(response.data.errMsg); + return; + } let data = response.data.data; this.form = { name: data.department_name, @@ -209,10 +211,10 @@ export default { .put("/apaas/backmgt/department", temp) .then((response) => { console.log(response); - if(!response.data.success){ - this.$message.error(response.data.errMsg) - return - } + if (!response.data.success) { + this.$message.error(response.data.errMsg); + return; + } this.$message.success("保存成功"); this.$router.back(-1); }) @@ -234,10 +236,10 @@ export default { .post("/apaas/backmgt/department", temp) .then((response) => { console.log(response); - if(!response.data.success){ - this.$message.error(response.data.errMsg) - return - } + if (!response.data.success) { + this.$message.error(response.data.errMsg); + return; + } this.$message.success("保存成功"); this.$router.back(-1); }) @@ -249,12 +251,12 @@ export default { this.$http .get("/apaas/backmgt/department/list") .then((response) => { - if(!response.data.success){ - this.$message.error(response.data.errMsg) - return - } + if (!response.data.success) { + this.$message.error(response.data.errMsg); + return; + } let data = response.data.data; - this.origin_arr = data + this.origin_arr = data; }) .catch(function(response) {}); }, diff --git a/src/pages/authority/role/addroles.vue b/src/pages/authority/role/addroles.vue index 8706077..854af73 100644 --- a/src/pages/authority/role/addroles.vue +++ b/src/pages/authority/role/addroles.vue @@ -82,10 +82,13 @@ export default { now_user: 2, //0：普通用户，1：组织管理员，2：超级管理员 permissionData: [], rules: { - name: [{ required: true, message: "请输入角色名称", trigger: "blur" }], + name: [ + { required: true, message: "请输入角色名称", trigger: "blur" }, + { max: 8, message: "长度小于8个字符", trigger: "blur" }, + ], desc: [ { required: true, message: "请输入角色描述", trigger: "blur" }, - { max: 200, message: "长度小于200个字符", trigger: "blur" }, + { max: 500, message: "长度小于500个字符", trigger: "blur" }, ], }, edit_flag: 0, diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index 98771ca..3be743b 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -18,7 +18,10 @@

用户账号：

- +

登录密码：

@@ -36,7 +39,11 @@

用户类型：

- + - +

业务系统名称：

 - +

域名：

 - +

IP白名单：

-
+
- {{tag}} + @close="handleClose(tag)" + > + {{ tag }} - 新增 + 新增
@@ -92,7 +108,7 @@

邮箱：

 - +

用户组织机构：

{ - var phone_ruler=/^(?:(?:\+|00)86)?1[3-9]\d{9}$/ - setTimeout(() => { - if (!phone_ruler.test(value)) { - callback(new Error('请输入正确电话号码')); - } else { - callback(); - } - }); - }; + var phone_ruler = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/; + setTimeout(() => { + if (!phone_ruler.test(value)) { + callback(new Error("请输入正确电话号码")); + } else { + callback(); + } + }); + }; + var check_email = (rule, value, callback) => { + var email_ruler = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + setTimeout(() => { + if (value && !email_ruler.test(value)) { + callback(new Error("请输入正确邮箱地址")); + } else { + callback(); + } + }); + }; var checkip = (rule, value, callback) => { var reg = /(((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3});/g; setTimeout(() => { @@ -196,10 +222,10 @@ export default { ip: [], domain: "", }, - dynamicTags: ['标签一', '标签二', '标签三'], + dynamicTags: ["标签一", "标签二", "标签三"], inputVisible: false, - inputValue: '', - ip_arr:[], + inputValue: "", + ip_arr: [], now_user: 0, //0：普通用户，1：组织管理员，2：超级管理员 typeoptions: [ { @@ -234,38 +260,47 @@ export default { rules: { account: [ { required: true, message: "请输入账号", trigger: "blur" }, + { max: 8, message: "长度小于8个字符", trigger: "blur" }, ], password: [ { required: true, message: "请输入密码", trigger: "blur" }, + { max: 20, message: "长度小于20个字符", trigger: "blur" }, ], nickname: [ { required: true, message: "请输入昵称", trigger: "blur" }, + { max: 8, message: "长度小于8个字符", trigger: "blur" }, ], type: [ { required: true, message: "请选择用户类型", trigger: "change" }, ], systemname: [ { required: true, message: "请输入系统名称", trigger: "blur" }, + { max: 16, message: "长度小于16个字符", trigger: "blur" }, ], contact: [ { required: true, message: "请输入联系人", trigger: "blur" }, + { max: 6, message: "长度小于6个字符", trigger: "blur" }, ], phone: [ { required: true, message: "请输入电话号码", trigger: "blur" }, - { validator: check_phone, trigger: "blur" }, + { validator: check_phone, trigger: "blur" }, + ], + email: [ + // { required: true, message: "请输入邮箱地址", trigger: "blur" }, + { validator: check_email, trigger: "blur" }, ], able: [ { required: true, message: "请选择是否禁用", trigger: "change" }, ], + desc: [ + // { required: true, message: "请输入描述", trigger: "blur" }, + { max: 500, message: "长度小于500个字符", trigger: "blur" }, + ], origin: [ { required: true, message: "请选择组织机构", trigger: "change" }, ], - domain:[ - { required: true, message: '请输入域名', trigger: 'blur' } - ], - ip: [ - { required: true, message: '请输入ip地址', trigger: 'blur' } - ], + domain: [{ required: true, message: "请输入域名", trigger: "blur" }], + ip: [{ required: true, message: "请输入ip地址", trigger: "blur" }], }, edit_flag: 0, baseinfo: {}, @@ -279,31 +314,31 @@ export default { }, mounted() {}, methods: { - change_type(){ - this.form.systemname = '' - this.form.domain = '' - this.form.ip = [] - this.form.origin = '' + change_type() { + this.form.systemname = ""; + this.form.domain = ""; + this.form.ip = []; + this.form.origin = ""; }, handleClose(tag) { - this.form.ip.splice(this.form.ip.indexOf(tag), 1); - }, + this.form.ip.splice(this.form.ip.indexOf(tag), 1); + }, - showInput() { - this.inputVisible = true; - this.$nextTick(_ => { - this.$refs.saveTagInput.$refs.input.focus(); - }); - }, + showInput() { + this.inputVisible = true; + this.$nextTick((_) => { + this.$refs.saveTagInput.$refs.input.focus(); + }); + }, - handleInputConfirm() { - let inputValue = this.inputValue; - if (inputValue) { - this.form.ip.push(inputValue); - } - this.inputVisible = false; - this.inputValue = ''; - }, + handleInputConfirm() { + let inputValue = this.inputValue; + if (inputValue) { + this.form.ip.push(inputValue); + } + this.inputVisible = false; + this.inputValue = ""; + }, get_now_page() { console.log(this.$route); if (this.$route.path.indexOf("add") !== -1) { @@ -326,9 +361,9 @@ export default { .put(`/apaas/backmgt/user/initalPasswd/${this.$route.params.id}`) .then((response) => { console.log(response); - if(response.data.success){ + if (response.data.success) { this.$message.success("修改成默认密码成功 默认密码：123456"); - }else{ + } else { this.$message.error("修改密码失败"); } }) @@ -341,7 +376,7 @@ export default { .get(`/apaas/backmgt/user/detail/${this.$route.params.id}`) .then((response) => { console.log(response); - if(response.data.success){ + if (response.data.success) { let data = response.data.data; this.form = { account: data.user_id, @@ -360,10 +395,9 @@ export default { ip: data.ip_whitelist, domain: data.domain_name, }; - }else{ + } else { this.$message.error("获取数据失败"); } - }) .catch((response) => { this.$message.error("获取数据失败"); @@ -381,7 +415,7 @@ export default { this.$http .get("/apaas/backmgt/department/list") .then((response) => { - if(response.data.success){ + if (response.data.success) { let data = response.data.data; // this.originoptions = data data.forEach((e) => { @@ -390,13 +424,12 @@ export default { value: e.department_id, }); }); - }else{ + } else { this.$message.error("获取组织失败"); } - }) .catch(function(response) { - this.$message.error("获取组织失败"); + this.$message.error("获取组织失败"); }); }, removepic() { @@ -408,7 +441,7 @@ export default { add_user() { var temp = { user_id: this.form.account, // 用户名 - password:this.form.password, + password: this.form.password, user_name: this.form.nickname, // 昵称 system_name: this.form.systemname, //系统名称 phone: this.form.phone + "", // 电话号 @@ -425,12 +458,12 @@ export default { .post(`/apaas/backmgt/user/add`, temp) .then((response) => { console.log(response); - if(response.data.success){ + if (response.data.success) { this.backPage(); this.$message.success("新增成功"); - }else{ + } else { this.$message.error("新增失败"); - } + } }) .catch((response) => { this.$message.error("新增失败"); @@ -447,18 +480,17 @@ export default { is_admin: this.form.type, state: this.form.able, // 用户状态，1——启用，0 禁用 domain_name: this.form.domain, // - ip_whitelist: - this.form.ip && this.form.ip.length ? this.form.ip : [], // + ip_whitelist: this.form.ip && this.form.ip.length ? this.form.ip : [], // description: this.form.desc, //描述 link_man: this.form.contact, }; this.$http .put(`/apaas/backmgt/user/put`, temp) .then((response) => { - if(response.data.success){ + if (response.data.success) { this.backPage(); this.$message.success("修改成功"); - }else{ + } else { this.$message.error("修改失败"); } }) @@ -466,23 +498,24 @@ export default { this.$message.error("修改失败"); }); }, - check_user(){ - return this.$http - .get(`/apaas/backmgt/user/checkUserId?user_id=${this.form.account}`) + check_user() { + return this.$http.get( + `/apaas/backmgt/user/checkUserId?user_id=${this.form.account}` + ); }, onSubmit(formName) { console.log("submit!"); this.$refs[formName].validate((valid) => { if (valid) { if (this.edit_flag == 0) { - this.check_user().then((res)=>{ + this.check_user().then((res) => { console.log(res); - if(res.data.success){ + if (res.data.success) { this.add_user(); - }else{ - this.$message.error(res.data.errMsg) + } else { + this.$message.error(res.data.errMsg); } - }) + }); } else { this.set_user(); } @@ -491,11 +524,8 @@ export default { return false; } }); - - }, - check_account(){ - }, + check_account() {}, resetForm(formName) { this.$refs[formName].resetFields(); this.form = { @@ -549,26 +579,26 @@ export default { .info_contain .el-input.is-disabled .el-input__inner { background-color: #e3e4e6; } - .el-tag + .el-tag { - margin-left: 10px; - } - .button-new-tag { - margin-left: 10px; - height: 32px; - line-height: 30px; - padding-top: 0; - padding-bottom: 0; - } - .info_contain .input-new-tag { - width: 90px; - margin-left: 10px; - vertical-align: bottom; - } - .info_contain .input-new-tag .el-input__inner { - width: 90px; - margin-left: 10px; - vertical-align: bottom; - } +.el-tag + .el-tag { + margin-left: 10px; +} +.button-new-tag { + margin-left: 10px; + height: 32px; + line-height: 30px; + padding-top: 0; + padding-bottom: 0; +} +.info_contain .input-new-tag { + width: 90px; + margin-left: 10px; + vertical-align: bottom; +} +.info_contain .input-new-tag .el-input__inner { + width: 90px; + margin-left: 10px; + vertical-align: bottom; +}