From 904cfe3bad14c27857a062849fc92dd85035c524 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 31 十月 2023 14:09:56 +0800 Subject: [PATCH] 修改bug --- cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js | 83 +++++++++++------------------------------ 1 files changed, 22 insertions(+), 61 deletions(-) diff --git a/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js b/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js index c81798b..4ccc0dd 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js @@ -1,14 +1,14 @@ /** * 用户详情对话框(可用于添加和修改对话框) */ -var language =$("#language").val() +var language =1 var UserInfoDlg = { userInfoData: {}, validateFields: { - account: { + phone: { validators: { notEmpty: { - message: language==1?'账户不能为空':(language==2?"The account cannot be empty":"Akaun tidak dapat kosong") + message: language==1?'联系电话不能为空':(language==2?"The account cannot be empty":"Akaun tidak dapat kosong") } } }, @@ -26,25 +26,17 @@ } } },*/ - password: { + birthday: { validators: { notEmpty: { - message: '密码不能为空' - }, - regexp: { - regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/, - message: '密码中必须包含大小字母、数字、特称字符,至少8个字符,最多30个字符' + message: '生日不能为空' }, } }, - rePassword: { + idCard: { validators: { notEmpty: { - message: '密码不能为空' - }, - regexp: { - regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/, - message: '密码中必须包含大小字母、数字、特称字符,至少8个字符,最多30个字符' + message: '身份证号不能为空' }, } } @@ -169,7 +161,7 @@ */ UserInfoDlg.collectData = function () { this.set('id').set('account').set('sex').set('password').set('avatar') - .set('email').set('name').set('birthday').set('rePassword').set('deptid').set('phone'); + .set('email').set('name').set('birthday').set('rePassword').set('roleid').set('phone').set('idCard'); }; /** @@ -208,32 +200,22 @@ - var birthday = $("#birthday").val(); - if ("" == birthday){ - if(language==1){ - Feng.info("出生日期不能为空!"); - }else if(language==2){ - Feng.info("The date of birth cannot be empty!"); - }else { - Feng.info("Tanggal lahir tidak bisa kosong!"); - } - + var avatar = $("#avatar").val(); + if(avatar==''){ + Feng.info("请上传照片") return; } - - var citySel = $("#citySel").val(); - if ("" == citySel){ - if(language==1){ - Feng.info("部门不能为空!"); - }else if(language==2){ - Feng.info("The department cannot be empty!"); - }else { - Feng.info("Departemen tidak bisa kosong!"); - } - + var sex = $("#sex").val(); + if(sex==''){ + Feng.info("请选择性别") return; } - + var roleid = $("#roleid").val(); + if(roleid==''){ + Feng.info("请选择角色") + return; + } + console.log(this.userInfoData) //提交信息 var ajax = new $ax(Feng.ctxPath + "/mgr/add", function (data) { Feng.success("添加成功!"); @@ -260,30 +242,8 @@ if (!this.validate()) { return; } + console.log(this.userInfoData) - var birthday = $("#birthday").val(); - if ("" == birthday){ - if(language==1){ - Feng.info("出生日期不能为空!"); - }else if(language==2){ - Feng.info("The date of birth cannot be empty!"); - }else { - Feng.info("Tanggal lahir tidak bisa kosong!"); - } - return; - } - - var citySel = $("#citySel").val(); - if ("" == citySel){ - if(language==1){ - Feng.info("部门不能为空!"); - }else if(language==2){ - Feng.info("The department cannot be empty!"); - }else { - Feng.info("Departemen tidak bisa kosong!"); - } - return; - } //提交信息 var ajax = new $ax(Feng.ctxPath + "/mgr/edit", function (data) { @@ -368,4 +328,5 @@ avatarUp.setUploadBarId("progressBar"); avatarUp.init(); + document.getElementById('roleid').value = $("#roleid_").val(); }); -- Gitblit v1.7.1