From a1d261d6c92c38d9e496e11d1bc224ecc1d34798 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 14 十一月 2023 09:14:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/user/user.js | 138 +++++++++++++++------------------------------
1 files changed, 47 insertions(+), 91 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/user/user.js b/cloud-server-management/src/main/webapp/static/modular/system/user/user.js
index d0c1fc7..da1d9f2 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/user/user.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/user/user.js
@@ -23,92 +23,36 @@
return "";
}
},
- {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
- {title: language==1?'账号':(language==2?'Account number':'Nomor akun'), field: 'account', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'姓名':(language==2?'name':'Nama Lengkap'), field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: '序号', field: 'id', visible: false, align: 'center', valign: 'middle'},
+ {title: '姓名', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: '电话', field: 'phone', align: 'center', valign: 'middle', sortable: true},
+ {title: '头像', field: 'avatar', align: 'center', valign: 'middle',
+ formatter: function (value, row, index) {
+ value = typeof value == "undefined" || value == '' ? '/static/img/NoPIC.png' : value;
+ return '<img src="' + value + '" style="height: 100px;"/>'
+ },
+ sortable: true},
+ {title: '生日', field: 'birthday', align: 'center', valign: 'middle', sortable: true},
{title: language==1?'性别':(language==2?'Gender':'Jenis kelamin'), field: 'sexName', align: 'center', valign: 'middle', sortable: true,
formatter:function (data) {
- if(language==1){
if(data==1){
return '男'
}else {
return '女'
}
- }else if(language==2){
+ }
+ },
+ {title: '身份证号', field: 'idCard', align: 'center', valign: 'middle', sortable: true},
+ {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+ {title: '状态', field: 'status', align: 'center', valign: 'middle', sortable: true,
+ formatter:function (data) {
if(data==1){
- return 'man'
+ return '正常'
}else {
- return 'woman'
+ return '冻结'
}
- }else {
- if(data==1){
- return 'laki-laki'
- }else {
- return 'wanita'
- }
- }
-
}
},
- {title: language==1?'角色':(language==2?'role':'peran'), field: 'roleName', visible: true, align: 'center', valign: 'middle', sortable: true,
- formatter: function (value, row) {
- var btn = "";
- if(row.roleName != '' && row.roleName != null) {
- var labelStr = "";
- var labelStrs = "";
- var labelArray = row.roleName.split(",");
- for(var i=0;i<labelArray.length;i++){
- labelStr += labelArray[i] +"<br>";
- labelStrs += labelArray[i] + " ";
- }
- labelStr = labelStr.substring(0,labelStr.length-4);
- labelStrs = labelStrs.substring(0,labelStrs.length-5);
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + labelStrs + '" onfocus="AppCar.tooltip()">' + labelStr + '</p>']
- }
- return btn;
- }
- },
- {title: language==1?'部门':(language==2?'department':'departemen'), field: 'deptName', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'邮箱':(language==2?'email':'email'), field: 'email', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'电话':(language==2?'phone':'Telepon'), field: 'phone', align: 'center', valign: 'middle', sortable: true},
- {title:language==1?'创建时间':(language==2?'Creation time':'Waktu penciptaan'), field: 'createtime', visible: true, align: 'center', valign: 'middle', sortable: true,
- formatter: function (value, row) {
- var btn = "";
- if(row.createtime1 != '' && row.createtime1 != null) {
- var time = row.createtime1.replace(" ",'<br>');
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + row.createtime1 + '" onfocus="AppCar.tooltip()">' + time + '</p>']
- }
- return btn;
- }
- },
- {title: language==1?'状态':(language==2?'State':'Status'), field: 'statusName', visible: true, align: 'center', valign: 'middle',
- formatter: function (value, row) {
- var btn = "";
- if(row.statusName != '' && row.statusName != null) {
- if(language==1){
- if (row.statusName == "2"){
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="' + `冻结` + '" onfocus="AppUserInfo.tooltip()">' + `冻结` + '</p>']
- }else{
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + `启用` + '" onfocus="AppUserInfo.tooltip()">' + `启用` + '</p>']
- }
- }else if(language==2){
- if (row.statusName == "2"){
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="' + `freeze` + '" onfocus="AppUserInfo.tooltip()">' + `freeze` + '</p>']
- }else{
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + `enable` + '" onfocus="AppUserInfo.tooltip()">' + `enable` + '</p>']
- }
- }else {
- if (row.statusName == "2"){
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color: red;" title="' + `Membekukan` + '" onfocus="AppUserInfo.tooltip()">' + 'Membekukan' + '</p>']
- }else{
- btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="' + `aktifkan` + '" onfocus="AppUserInfo.tooltip()">' + 'aktifkan' + '</p>']
- }
- }
-
- }
- return btn;
- }
- }
];
return columns;
};
@@ -154,7 +98,24 @@
area: ['800px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
- content: Feng.ctxPath + '/mgr/user_edit/' + this.seItem.id
+ content: Feng.ctxPath + '/mgr/user_edit/' + this.seItem.id+"/1"
+ });
+ this.layerIndex = index;
+ }
+};
+/**
+ * 点击查看详情按钮时
+ * @param userId 管理员id
+ */
+MgrUser.openChangeUser1 = function () {
+ if (this.check()) {
+ var index = layer.open({
+ type: 2,
+ title: language==1?'编辑':(language==2?'Edit':'Edit'),
+ area: ['800px', '450px'], //宽高
+ fix: false, //不固定
+ maxmin: true,
+ content: Feng.ctxPath + '/mgr/user_edit/' + this.seItem.id+"/2"
});
this.layerIndex = index;
}
@@ -207,15 +168,7 @@
ajax.set("userId", userId);
ajax.start();
};
-
- if(language==1){
- Feng.confirm("是否删除用户" + MgrUser.seItem.account + "?",operation);
- }else if(language==2){
- Feng.confirm("Whether to delete a user" + MgrUser.seItem.account + "?",operation);
- }else {
- Feng.confirm("Apakah menghapus pengguna" + MgrUser.seItem.account + "?",operation);
- }
-
+ Feng.confirm("是否删除员工： " + MgrUser.seItem.name + "?",operation);
}
};
@@ -288,7 +241,7 @@
if (this.check()) {
var userId = this.seItem.id;
if(language==1){
- parent.layer.confirm('是否重置密码为a123456？', {
+ parent.layer.confirm('是否重置密码为<span style="color: red;">a123456</span>？', {
btn: ['确定', '取消'],
shade: false //不显示遮罩
}, function () {
@@ -333,18 +286,21 @@
MgrUser.resetSearch = function () {
$("#name").val("");
- $("#createTime").val("");
+ $("#phone").val("");
+ $("#idCard").val("");
+ $("#isSales").val("");
+ $("#status").val("");
MgrUser.search();
}
MgrUser.search = function () {
var queryData = {};
-
- queryData['deptid'] = MgrUser.deptid;
queryData['name'] = $("#name").val();
- queryData['createTime'] = $("#createTime").val();
-
+ queryData['phone'] = $("#phone").val();
+ queryData['idCard'] = $("#idCard").val();
+ queryData['isSales'] = $("#isSales").val();
+ queryData['state'] = $("#status").val();
MgrUser.table.refresh({query: queryData});
}
@@ -357,7 +313,7 @@
var defaultColunms = MgrUser.initColumn();
var table = new BSTable(MgrUser.id, "/mgr/list", defaultColunms);
// 设置物理分页server（逻辑分页client）
- table.setPaginationType("server");
+ table.setPaginationType("client");
// 表单提交参数
var queryData = {};
queryData['deptid'] = MgrUser.deptid;
--
Gitblit v1.7.1