页面优化 按钮添加提示

src/main/java/com/bbd/bpm/controller/user/UserWebController.java

@@ -85,7 +85,7 @@ public class UserWebController {
      * @Param:
      * @return
      **/
-    @PostMapping(value = "addUser")
+    @GetMapping(value = "addUser")
     public String toRegister(){
         return "user/addUser";
     }

src/main/resources/templates/deployment/deplymentList.html

@@ -123,7 +123,7 @@
                 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);
             $('#total').text(total);
@@ -169,39 +169,74 @@
 
 
     //部署流程
-	function deploymentModel(id){
-        $.post("/api/bpm/model/deploymentModel",
-            {
-                modelId:id
-            },function (data) {
-            	if(data.code==200){
-                    layer.msg('部署成功',{time:1000},function () {
-						location.reload();
-                    });
-				}else {
-                    layer.msg('部署失败',{time:1000},function () {
-						location.reload();
-                    });
-				}
-            },'json')
+	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",
+                    {
+                        modelId:id
+                    },function (data) {
+                        if(data.code==200){
+                            layer.msg('部署成功',{time:1000},function () {
+                                location.reload();
+                            });
+                        }else {
+                            layer.msg('部署失败',{time:1000},function () {
+                                location.reload();
+                            });
+                        }
+                    },'json')
+            },
+            btn2:function (index,layero) {
+                layer.close(index);
+            }
+        });
+
+
+
+
+
 	}
 
 
-    /*跳转活动人员列表 */
-    function deleteDeployMent(id) {
-        $.post("/api/bpm/model/deleteModel",
-            {
-                modelId:id
-            },function (data) {
-                if(data.code==200){
-                    layer.msg('删除成功',{time:1000},function () {
-                        location.reload();
-                    });
-                }else {
-                    layer.msg('删除失败',{time:1000},function () {
-                        location.reload();
-                    });
-                }
-            },'json')
+    /*删除流程 */
+    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",
+                    {
+                        modelId:id
+                    },function (data) {
+                        if(data.code==200){
+                            layer.msg('删除成功',{time:1000},function () {
+                                location.reload();
+                            });
+                        }else {
+                            layer.msg('删除失败',{time:1000},function () {
+                                location.reload();
+                            });
+                        }
+                    },'json')
+            },
+            btn2:function (index,layero) {
+                layer.close(index);
+            }
+        });
     }
 </script>
\ No newline at end of file

src/main/resources/templates/user/organizationList.html

@@ -18,16 +18,6 @@
 			float: left;
 			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 li ul{ margin:0; padding:0}
 		.ztree li {line-height:30px;}
@@ -219,13 +209,6 @@
             function beforeClick(treeId, treeNode) {
                 $("#pid").val(treeNode.pId);
                 $("#id").val(treeNode.id);
-//                if (treeNode.pId==null){
-//                    $("#add").show();
-//				}else if (treeNode.pId==1){
-//                    $("#add").show();
-//				}else {
-//                    $("#add").hide();
-//				}
                 $.post(
                     "/bpm/user/getOrganization",
                     {
@@ -429,7 +412,7 @@
                             layer.msg("组织简写不可为空");
                         }else {
                             $.post(
-                                "editOrganization",
+                                "/bpm/user/editOrganization",
                                 {
                                     "name":name,
                                     "abbreviationName":abbreviationName,
@@ -473,30 +456,18 @@
                     btn:['保存','取消'],
                     btn1: function (index,layero) {
                         var name = $("[name='oName']").val();
-                        var memberName = $("[name='memberName']").val();
-                        var code = $("[name='code']").val();
-                        var phone = $("[name='phone']").val();
-                        var areaId = $("[name='areaId']").val();
+                        var abbreviationName = $("[name='abbreviationName']").val();
                         if (name==''){
                             layer.msg("组织名称不能为空");
-                        }else if (memberName==''){
-                            layer.msg("联系人姓名不能为空");
-                        }else if (code==''){
-                            layer.msg("统一社会信用代码不能为空");
-                        }else if (phone==''){
-                            layer.msg("联系人手机号不能为空");
-                        }else if(!tel.test(phone)&& !phones.test(phone)){
-                            layer.msg("手机号格式错误");
+                        }else if (abbreviationName==''){
+                            layer.msg("组织简写不可为空");
                         }else {
                             $.post(
-                                "editOrganization",
+                                "bpm/user/editOrganization",
                                 {
                                     "name":name,
-                                    "memberName":memberName,
-                                    "code":code,
-                                    "phone":phone,
-                                    "id":id,
-                                    "areaId":areaId
+                                    "abbreviationName":abbreviationName,
+                                    "id":id
                                 },
                                 function (data) {
                                     if (data.code==200){

src/main/resources/templates/user/userList.html

@@ -123,7 +123,7 @@
                 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].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);
             $('#total').text(total);
@@ -162,22 +162,14 @@
             },'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>' +
-			'<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>'+telephone+'</span></span></div>' +
-			'<div class="add"><span>创建时间：<span>'+lastTime+'</span></span></div>';
-        layer.open({
-            id:1,
-            type: 1,
-            title:'用户详情',
-            skin:'layui-layer-rim',
-            area:['300px', '200px'],
-            tipsMore: true,
-            content: content
-        });
+			'<div class="add"><span>用户手机：<span>'+telephone+'</span></span></div>' +
+			'<div class="add"><span>创建时间：<span>'+createTime+'</span></span></div>';
+        layer.alert(content)
     }
 
 
@@ -193,12 +185,6 @@
         });
 	}
 
-
-
-
-
-
-
     /*删除用户 */
     function deleteUser(id ,name) {
         layer.open({
@@ -207,7 +193,7 @@
             title:'确认删除吗',
             skin:'layui-layer-rim',
             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:['保存','取消'],
             btn1: function (index,layero) {