Skip to content

B
bpm
Commit 6a312b1f by Java-曹文达
Options

页面优化 按钮添加提示

parent 1c2ccc2d
Showing with 56 additions and 63 deletions
src/main/java/com/bbd/bpm/controller/user/UserWebController.java
...@@ -85,7 +85,7 @@ public class UserWebController { ...@@ -85,7 +85,7 @@ public class UserWebController {
* @Param: * @Param:
* @return * @return
**/ **/
@PostMapping(value = "addUser") @GetMapping(value = "addUser")
public String toRegister(){ public String toRegister(){
return "user/addUser"; return "user/addUser";
} }
......
src/main/resources/templates/deployment/deplymentList.html
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
content += '<td class="product_num">'+data[i].metaInfo+'</td><td class="product_num">'+data[i].version+'</td>'; content += '<td class="product_num">'+data[i].metaInfo+'</td><td class="product_num">'+data[i].version+'</td>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span></span><span onclick="deploymentModel('+data[i].id+')">部署流程</span><span onclick="deleteDeployMent('+data[i].id+')">删除</span></td></tr>'; content += '<td class="cao_zuo"><span onclick="toActivityDetail('+data[i].id+')">查看</span></span><span onclick="deploymentModel('+data[i].id+',\''+data[i].name+'\')">部署流程</span><span onclick="deleteDeployMent('+data[i].id+',\''+data[i].name+'\')">删除</span></td></tr>';
} }
$('#pages').text(pages); $('#pages').text(pages);
$('#total').text(total); $('#total').text(total);
...@@ -169,7 +169,17 @@ ...@@ -169,7 +169,17 @@
//部署流程 //部署流程
function deploymentModel(id){ function deploymentModel(id,name){
layer.open({
id:1,
type: 1,
title:'确认部署',
skin:'layui-layer-rim',
area:['300px', '165px'],
content: '<div style="margin-top: 22px;margin-left: 8px;">您确定部署'+name+"流程吗？</div>"
,
btn:['保存','取消'],
btn1: function (index,layero) {
$.post("/api/bpm/model/deploymentModel", $.post("/api/bpm/model/deploymentModel",
{ {
modelId:id modelId:id
...@@ -184,11 +194,31 @@ ...@@ -184,11 +194,31 @@
}); });
} }
},'json') },'json')
},
btn2:function (index,layero) {
layer.close(index);
} }
});
/*跳转活动人员列表 */
function deleteDeployMent(id) {
}
/*删除流程 */
function deleteDeployMent(id,name) {
layer.open({
id:1,
type: 1,
title:'确认删除吗',
skin:'layui-layer-rim',
area:['300px', '165px'],
content: '<div style="margin-top: 22px;margin-left: 8px;">您确定删除'+name+"流程吗？</div>"
,
btn:['保存','取消'],
btn1: function (index,layero) {
$.post("/api/bpm/model/deleteModel", $.post("/api/bpm/model/deleteModel",
{ {
modelId:id modelId:id
...@@ -203,5 +233,10 @@ ...@@ -203,5 +233,10 @@
}); });
} }
},'json') },'json')
},
btn2:function (index,layero) {
layer.close(index);
}
});
} }
</script> </script>
\ No newline at end of file
src/main/resources/templates/user/organizationList.html
...@@ -18,16 +18,6 @@ ...@@ -18,16 +18,6 @@
float: left; float: left;
margin-top: 10px; margin-top: 10px;
} }
/*.ztree li span{*/
/*height: 20px!important;*/
/*line-height: 20px!important;*/
/*font-size: 13px;*/
/*}*/
/*.ztree li a{*/
/*height: 20px!important;*/
/*line-height: 20px!important;*/
/*font-size: 13px;*/
/*}*/
.ztree * {font-size: 10pt;font-family:"Microsoft Yahei",Verdana,Simsun,"Segoe UI Web Light","Segoe UI Light","Segoe UI Web Regular","Segoe UI","Segoe UI Symbol","Helvetica Neue",Arial} .ztree * {font-size: 10pt;font-family:"Microsoft Yahei",Verdana,Simsun,"Segoe UI Web Light","Segoe UI Light","Segoe UI Web Regular","Segoe UI","Segoe UI Symbol","Helvetica Neue",Arial}
.ztree li ul{ margin:0; padding:0} .ztree li ul{ margin:0; padding:0}
.ztree li {line-height:30px;} .ztree li {line-height:30px;}
...@@ -219,13 +209,6 @@ ...@@ -219,13 +209,6 @@
function beforeClick(treeId, treeNode) { function beforeClick(treeId, treeNode) {
$("#pid").val(treeNode.pId); $("#pid").val(treeNode.pId);
$("#id").val(treeNode.id); $("#id").val(treeNode.id);
// if (treeNode.pId==null){
// $("#add").show();
// }else if (treeNode.pId==1){
// $("#add").show();
// }else {
// $("#add").hide();
// }
$.post( $.post(
"/bpm/user/getOrganization", "/bpm/user/getOrganization",
{ {
...@@ -429,7 +412,7 @@ ...@@ -429,7 +412,7 @@
layer.msg("组织简写不可为空"); layer.msg("组织简写不可为空");
}else { }else {
$.post( $.post(
"editOrganization", "/bpm/user/editOrganization",
{ {
"name":name, "name":name,
"abbreviationName":abbreviationName, "abbreviationName":abbreviationName,
...@@ -473,30 +456,18 @@ ...@@ -473,30 +456,18 @@
btn:['保存','取消'], btn:['保存','取消'],
btn1: function (index,layero) { btn1: function (index,layero) {
var name = $("[name='oName']").val(); var name = $("[name='oName']").val();
var memberName = $("[name='memberName']").val(); var abbreviationName = $("[name='abbreviationName']").val();
var code = $("[name='code']").val();
var phone = $("[name='phone']").val();
var areaId = $("[name='areaId']").val();
if (name==''){ if (name==''){
layer.msg("组织名称不能为空"); layer.msg("组织名称不能为空");
}else if (memberName==''){ }else if (abbreviationName==''){
layer.msg("联系人姓名不能为空"); layer.msg("组织简写不可为空");
}else if (code==''){
layer.msg("统一社会信用代码不能为空");
}else if (phone==''){
layer.msg("联系人手机号不能为空");
}else if(!tel.test(phone)&& !phones.test(phone)){
layer.msg("手机号格式错误");
}else { }else {
$.post( $.post(
"editOrganization", "bpm/user/editOrganization",
{ {
"name":name, "name":name,
"memberName":memberName, "abbreviationName":abbreviationName,
"code":code, "id":id
"phone":phone,
"id":id,
"areaId":areaId
}, },
function (data) { function (data) {
if (data.code==200){ if (data.code==200){
......
src/main/resources/templates/user/userList.html
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
content += '<td class="product_num">'+data[i].username+'</td>'; content += '<td class="product_num">'+data[i].username+'</td>';
content += '<td class="product_num">'+data[i].email+'</td><td class="product_num">'+data[i].content+'</td><td class="product_num">'+data[i].telephone+'</td>'; content += '<td class="product_num">'+data[i].email+'</td><td class="product_num">'+data[i].content+'</td><td class="product_num">'+data[i].telephone+'</td>';
content += '<td class="product_num">'+data[i].createTime+'</td>'; content += '<td class="product_num">'+data[i].createTime+'</td>';
content += '<td class="cao_zuo"><span onclick="toActivityDetail(\''+data[i].username+'\',\''+data[i].email+'\',\''+data[i].telephone+'\',\''+data[i].lastTime+'\',\''+data[i].content+'\')">查看</span><span onclick="deleteUser('+data[i].id+',\''+data[i].username+'\')">删除</span></td></tr>'; content += '<td class="cao_zuo"><span onclick="toActivityDetail(\''+data[i].username+'\',\''+data[i].email+'\',\''+data[i].telephone+'\',\''+data[i].createTime+'\',\''+data[i].content+'\')">查看</span><span onclick="deleteUser('+data[i].id+',\''+data[i].username+'\')">删除</span></td></tr>';
} }
$('#pages').text(pages); $('#pages').text(pages);
$('#total').text(total); $('#total').text(total);
...@@ -162,22 +162,14 @@ ...@@ -162,22 +162,14 @@
},'json') },'json')
} }
/*跳转活动详情页 */ /*查看用户 */
function toActivityDetail(username,email,telephone,lastTime,content) { function toActivityDetail(username,email,telephone,createTime,content) {
var content = '<div class="add"><span>用户名称：<span>'+username+'</span></span></div>' + var content = '<div class="add"><span>用户名称：<span>'+username+'</span></span></div>' +
'<div class="add"><span>邮箱：<span>'+email+'</span></div>' + '<div class="add"><span>用户邮箱：<span>'+email+'</span></div>' +
'<div class="add"><span>用户描述：<span>'+content+'</span></span></div>' + '<div class="add"><span>用户描述：<span>'+content+'</span></span></div>' +
'<div class="add"><span>手机号：<span>'+telephone+'</span></span></div>' + '<div class="add"><span>用户手机：<span>'+telephone+'</span></span></div>' +
'<div class="add"><span>创建时间：<span>'+lastTime+'</span></span></div>'; '<div class="add"><span>创建时间：<span>'+createTime+'</span></span></div>';
layer.open({ layer.alert(content)
id:1,
type: 1,
title:'用户详情',
skin:'layui-layer-rim',
area:['300px', '200px'],
tipsMore: true,
content: content
});
} }
...@@ -193,12 +185,6 @@ ...@@ -193,12 +185,6 @@
}); });
} }
/*删除用户 */ /*删除用户 */
function deleteUser(id ,name) { function deleteUser(id ,name) {
layer.open({ layer.open({
...@@ -207,7 +193,7 @@ ...@@ -207,7 +193,7 @@
title:'确认删除吗', title:'确认删除吗',
skin:'layui-layer-rim', skin:'layui-layer-rim',
area:['300px', '165px'], area:['300px', '165px'],
content: '<div style="margin-top: 22px;margin-left: 8px;">您确定删除'+name+"吗？</div>" content: '<div style="margin-top: 22px;margin-left: 8px;">您确定删除用户'+name+"吗？</div>"
, ,
btn:['保存','取消'], btn:['保存','取消'],
btn1: function (index,layero) { btn1: function (index,layero) {
......
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