From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js | 222 ++++++++++++++++++++++++-------------------------------
1 files changed, 97 insertions(+), 125 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 0a0cf46..372195a 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,33 +26,17 @@
}
}
},*/
- password: {
+ birthday: {
validators: {
notEmpty: {
- message: language==1?'密码不能为空':(language==2?"The password cannot be empty.":"Kata sandi tidak bisa kosong.")
- },
- identical: {
- field: 'rePassword',
- message: language==1?'两次密码不一致':(language==2?"The password entered twice are inconsistent.":"Kata sandi yang dimasukkan dua kali tidak konsisten.")
- },
- regexp: {
- regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: language==1?'密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符':(language==2?"The name cannot be empty. The password must contain letters, numbers, and special characters. At least 8 characters and at most 30 characters.":"Namanya tidak bisa kosong. Kata sandi harus mengandung huruf, nomor, dan karakter khusus. Setidaknya 8 karakter dan paling tidak 30 karakter.")
+ message: '生日不能为空'
},
}
},
- rePassword: {
+ idCard: {
validators: {
notEmpty: {
- message: language==1?'密码不能为空':(language==2?"The password cannot be empty.":"Kata sandi tidak bisa kosong.")
- },
- identical: {
- field: 'password',
- message: language==1?'两次密码不一致':(language==2?"The password entered twice are inconsistent.":"Kata sandi yang dimasukkan dua kali tidak konsisten.")
- },
- regexp: {
- regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: language==1?'密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符':(language==2?"The name cannot be empty. The password must contain letters, numbers, and special characters. At least 8 characters and at most 30 characters.":"Namanya tidak bisa kosong. Kata sandi harus mengandung huruf, nomor, dan karakter khusus. Setidaknya 8 karakter dan paling tidak 30 karakter.")
+ message: '身份证号不能为空'
},
}
}
@@ -176,8 +160,8 @@
* 收集数据
*/
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');
+ this.set('id').set('account').set('sex').set('password').set('avatar').set("deptid")
+ .set('email').set('name').set('birthday').set('rePassword').set('roleid').set('phone').set('idCard');
};
/**
@@ -213,67 +197,62 @@
if (!this.validate()) {
return;
}
-
- if (!this.validatePwd()) {
- if(language==1){
- Feng.error("两次密码输入不一致");
- }else if(language==2){
- Feng.error("The two password entries are inconsistent");
- }else {
- Feng.error("Dua entri kata sandi tidak konsisten");
- }
-
+ if($("#name").val()==''){
+ Feng.info("请输入员工姓名")
return;
}
-
- 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 phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test($("#phone").val())) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+ if($("#phone").val()==''){
+ 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!");
- }
-
+ if($("#birthday").val()==''){
+ Feng.info("请选择员工生日")
return;
}
-
+ var avatar = $("#avatar").val();
+ if(avatar==''){
+ Feng.info("请上传照片")
+ return;
+ }
+ var sex = $("#sex").val();
+ if(sex==''){
+ Feng.info("请选择性别")
+ return;
+ }
+ // 当前登陆人类型 如果不是平台 不校验角色选择
+ var role = $("#role").val();
+ if (role==1){
+ var roleid = $("#roleid").val();
+ if(roleid==''){
+ Feng.info("请选择角色")
+ return;
+ }
+ }
+ var dept = $("#deptid").val();
+ if(dept==''){
+ Feng.info("请选择部门")
+ return;
+ }
+ console.log(this.userInfoData)
//提交信息
var ajax = new $ax(Feng.ctxPath + "/mgr/add", function (data) {
- if(language==1){
+ if (data==5001){
+ Feng.error("该手机号已存在！");
+ }else{
Feng.success("添加成功!");
- }else if(language==2){
- Feng.success("Successfully added!");
- }else {
- Feng.success("Sangat berhasil ditambah!");
+ window.parent.MgrUser.table.refresh();
+ UserInfoDlg.close();
+ $(".img-circle").each(function () {
+ $(this).attr("src",Feng.ctxPath+$("#avatar").val());
+ })
}
- window.parent.MgrUser.table.refresh();
- UserInfoDlg.close();
- $(".img-circle").each(function () {
- $(this).attr("src",Feng.ctxPath+$("#avatar").val());
- })
}, function (data) {
- if(language==1){
- Feng.error("添加失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to add!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal menambah!" + data.responseJSON.message + "!");
- }
+ Feng.error("添加失败!" + data.responseJSON.message + "!");
});
ajax.set(this.userInfoData);
ajax.start();
@@ -290,57 +269,61 @@
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!");
- }
+ if($("#name").val()==''){
+ Feng.info("请输入员工姓名")
+ return;
+ }
+ var phonePattern = /^1[3-9]\d{9}$/;
+ if (!phonePattern.test($("#phone").val())) {
+ Feng.info("请输入合法手机号")
+ return ;
+ }
+ if($("#phone").val()==''){
+ Feng.info("请输入员工电话")
+ return;
+ }
+ if($("#birthday").val()==''){
+ 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 role = $("#role").val();
+ if (role==1){
+ var roleid = $("#roleid").val();
+ if(roleid==''){
+ Feng.info("请选择角色")
+ return;
+ }
+ }
+ var dept = $("#deptid").val();
+ if(dept==''){
+ Feng.info("请选择部门")
+ return;
+ }
//提交信息
var ajax = new $ax(Feng.ctxPath + "/mgr/edit", function (data) {
- if(language==1){
+ if (data==5001){
+ Feng.error("该手机号已存在！");
+ }else{
Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
- if (window.parent.MgrUser != undefined) {
window.parent.MgrUser.table.refresh();
UserInfoDlg.close();
+ $(".img-circle").each(function () {
+ $(this).attr("src",Feng.ctxPath+$("#avatar").val());
+ })
}
- window.parent.$(".img-circle").each(function () {
- $(this).attr("src",$("#avatar").val());
- })
window.parent.$("#userNameTab").text($("#name").val());
}, function (data) {
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set(this.userInfoData);
ajax.start();
@@ -376,21 +359,9 @@
return
}
var ajax = new $ax(Feng.ctxPath + "/mgr/changePwd", function (data) {
- if(language==1){
- Feng.success("修改成功!");
- }else if(language==2){
- Feng.success("Modify successfully!");
- }else {
- Feng.success("Mengubah dengan sukses!");
- }
+ Feng.success("修改成功!");
}, function (data) {
- if(language==1){
- Feng.error("修改失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Fail to modify!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Gagal mengubah!" + data.responseJSON.message + "!");;
- }
+ Feng.error("修改失败!" + data.responseJSON.message + "!");
});
ajax.set("oldPwd");
ajax.set("newPwd");
@@ -422,4 +393,5 @@
avatarUp.setUploadBarId("progressBar");
avatarUp.init();
+ document.getElementById('roleid').value = $("#roleid_").val();
});
--
Gitblit v1.7.1