角色管理的添加、修改模块由弹出层改为跳转页面

guns-sys/src/main/webapp/assets/modular/system/role/role.js

@@ -72,15 +72,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
      * @param data 点击按钮时候的行数据
      */
     Role.onEditRole = function (data) {
-        admin.putTempData('formOk', false);
-        top.layui.admin.open({
-            type: 2,
-            title: '修改角色',
-            content: Feng.ctxPath + '/role/role_edit?roleId=' + data.roleId,
-            end: function () {
-                admin.getTempData('formOk') && table.reload(Role.tableId);
-            }
-        });
+        window.location.href = Feng.ctxPath + "/role/role_edit?roleId="+ data.roleId;
     };
 
     /**
@@ -138,7 +130,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
 
     // 添加按钮点击事件
     $('#btnAdd').click(function () {
-        Role.openAddRole();
+        window.location.href = Feng.ctxPath + "/role/role_add";
     });
 
     // 导出excel

guns-sys/src/main/webapp/assets/modular/system/role/role_add.js

@@ -41,15 +41,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
         var ajax = new $ax(Feng.ctxPath + "/role/add", function (data) {
             Feng.success("添加成功！");
 
-            //传给上个页面，刷新table用
-            admin.putTempData('formOk', true);
-
-            //关掉对话框
-            admin.closeThisDialog();
+            //跳转列表页面并刷新
+            window.location.href = Feng.ctxPath + "/role";
         }, function (data) {
             Feng.error("添加失败！" + data.responseJSON.message)
         });
         ajax.set(data.field);
         ajax.start();
+        //添加 return false 可成功跳转页面
+        return false;
+    });
+
+    //返回按钮
+    $("#backupPage").click(function () {
+        window.location.href = Feng.ctxPath + "/role";
     });
 });
\ No newline at end of file

guns-sys/src/main/webapp/assets/modular/system/role/role_edit.js

@@ -46,15 +46,19 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
         var ajax = new $ax(Feng.ctxPath + "/role/edit", function (data) {
             Feng.success("修改成功!");
 
-            //传给上个页面，刷新table用
-            admin.putTempData('formOk', true);
-
-            //关掉对话框
-            admin.closeThisDialog();
+            //跳转列表页面并刷新
+            window.location.href = Feng.ctxPath + "/role";
         }, function (data) {
             Feng.error("修改失败!" + data.responseJSON.message + "!");
         });
         ajax.set(data.field);
         ajax.start();
+        //添加 return false 可成功跳转页面
+        return false;
+    });
+
+    //返回按钮
+    $("#backupPage").click(function () {
+        window.location.href = Feng.ctxPath + "/role";
     });
 });
\ No newline at end of file

guns-sys/src/main/webapp/pages/modular/system/role/role_add.html

-@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/role/role_add.js"]}){
-<form id="userForm" lay-filter="roleForm" class="layui-form model-form">
+@layout("/common/_container.html",{js:["/assets/modular/system/role/role_add.js"]}){
+<div class="layui-body-header">
+    <span class="layui-body-header-title">角色管理-添加</span>
+</div>
+
+<div class="layui-fluid " style="">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <form id="userForm" lay-filter="roleForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
                 <input name="roleId" type="hidden"/>
                 <div class="layui-form-item">
                     <label class="layui-form-label">角色名称<span style="color: red;">*</span></label>
@@ -27,8 +34,11 @@
                     </div>
                 </div>
                 <div class="layui-form-item text-right">
-        <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
                     <button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
+                    <button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
                 </div>
-</form>
+            </form>
+        </div>
+    </div>
+</div>
 @}

guns-sys/src/main/webapp/pages/modular/system/role/role_edit.html

-@layout("/common/_container.html",{bg:"bg-white",js:["/assets/modular/system/role/role_edit.js"]}){
-<form id="roleForm" lay-filter="roleForm" class="layui-form model-form">
+@layout("/common/_container.html",{js:["/assets/modular/system/role/role_edit.js"]}){
+<div class="layui-body-header">
+    <span class="layui-body-header-title">角色管理-修改</span>
+</div>
+
+<div class="layui-fluid " style="">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <form id="roleForm" lay-filter="roleForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
                 <input name="roleId" type="hidden"/>
                 <div class="layui-form-item">
                     <label class="layui-form-label">角色名称<span style="color: red;">*</span></label>
@@ -27,8 +34,12 @@
                     </div>
                 </div>
                 <div class="layui-form-item text-right">
-        <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
                     <button class="layui-btn" lay-filter="btnSubmit" lay-submit>保存</button>
+                    <button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
+
                 </div>
-</form>
+            </form>
+        </div>
+    </div>
+</div>
 @}