更新合并的冲突

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

@@ -23,9 +23,9 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
             {type: 'checkbox'},
             {field: 'deptId', hide: true, sort: true, title: 'id'},
             {field: 'simpleName', align: "center", sort: true, title: '部门简称'},
-            {field: 'fullName', align: "center", sort: true, title: '部门全称'},
-            {field: 'sort', align: "center", sort: true, title: '排序'},
-            {field: 'description', align: "center", sort: true, title: '备注'},
+            {field: 'fullName',align: "center", sort: true, title: '部门全称'},
+            {field: 'sort',align: "center", sort: true, title: '排序'},
+            {field: 'description',align: "center", sort: true, title: '备注'},
             {align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 200}
         ]];
     };
@@ -83,15 +83,7 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
      * @param data 点击按钮时候的行数据
      */
     Dept.onEditDept = function (data) {
-        admin.putTempData('formOk', false);
-        top.layui.admin.open({
-            type: 2,
-            title: '修改部门',
-            content: Feng.ctxPath + '/dept/dept_update?deptId=' + data.deptId,
-            end: function () {
-                admin.getTempData('formOk') && table.reload(Dept.tableId);
-            }
-        });
+        window.location.href = Feng.ctxPath + "/dept/dept_update?deptId="+ data.deptId;
     };
 
     /**
@@ -135,7 +127,7 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
 
     // 添加按钮点击事件
     $('#btnAdd').click(function () {
-        Dept.openAddDept();
+        window.location.href = Feng.ctxPath + "/dept/dept_add";
     });
 
     // 导出excel

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

@@ -19,7 +19,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
     Notice.initColumn = function () {
         return [[
             {type: 'checkbox'},
-            {field: 'noticeId', hide: true, sort: true, title: 'id'},
+            {field: 'noticeId', align: "center", hide: true, sort: true, title: 'id'},
             {field: 'title', align: "center", sort: true, title: '标题'},
             {field: 'content', align: "center", sort: true, title: '内容'},
             {field: 'createrName', align: "center", sort: true, title: '发布者'},
@@ -60,15 +60,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
      * @param data 点击按钮时候的行数据
      */
     Notice.onEditNotice = function (data) {
-        admin.putTempData('formOk', false);
-        top.layui.admin.open({
-            type: 2,
-            title: '通知详情',
-            content: Feng.ctxPath + '/notice/notice_update/' + data.noticeId,
-            end: function () {
-                admin.getTempData('formOk') && table.reload(Notice.tableId);
-            }
-        });
+        window.location.href = Feng.ctxPath + "/notice/notice_update/"+ data.noticeId;
     };
 
     /**
@@ -107,7 +99,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
 
     // 添加按钮点击事件
     $('#btnAdd').click(function () {
-        Notice.openAddNotice();
+        window.location.href = Feng.ctxPath + "/notice/notice_add";
     });
 
     // 工具条点击事件

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

@@ -26,15 +26,15 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
         return [[
             {type: 'checkbox'},
             {field: 'userId', hide: true, sort: true, title: '用户id'},
-            {field: 'account',  align: "center", sort: true, title: '账号'},
-            {field: 'name',  align: "center", sort: true, title: '姓名'},
-            {field: 'sexName',  align: "center", sort: true, title: '性别'},
-            {field: 'roleName',  align: "center", sort: true, title: '角色'},
-            {field: 'deptName',  align: "center", sort: true, title: '部门'},
-            {field: 'email',  align: "center", sort: true, title: '邮箱',  minWidth: 122},
-            {field: 'phone',  align: "center", sort: true, title: '电话', minWidth: 117},
-            {field: 'createTime',  align: "center", sort: true, title: '创建时间', minWidth: 160},
-            {field: 'status',  align: "center", sort: true, templet: '#statusTpl', title: '状态'},
+            {field: 'account', align: "center", sort: true, title: '账号'},
+            {field: 'name', align: "center", sort: true, title: '姓名'},
+            {field: 'sexName', align: "center", sort: true,  title: '性别'},
+            {field: 'roleName', align: "center", sort: true,  title: '角色'},
+            {field: 'deptName', align: "center", sort: true,  title: '部门'},
+            {field: 'email', align: "center", sort: true,  title: '邮箱',  minWidth: 122},
+            {field: 'phone', align: "center", sort: true,  title: '电话', minWidth: 117},
+            {field: 'createTime', align: "center", sort: true, title: '创建时间', minWidth: 160},
+            {field: 'status', align: "center", sort: true, templet: '#statusTpl', title: '状态'},
             {align: 'center', toolbar: '#tableBar', title: '操作', minWidth: 280}
         ]];
     };
@@ -93,15 +93,7 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
      * @param data 点击按钮时候的行数据
      */
     MgrUser.onEditUser = function (data) {
-        admin.putTempData('formOk', false);
-        top.layui.admin.open({
-            type: 2,
-            title: '编辑用户',
-            content: Feng.ctxPath + '/mgr/user_edit?userId=' + data.userId,
-            end: function () {
-                admin.getTempData('formOk') && table.reload(MgrUser.tableId);
-            }
-        });
+        window.location.href = Feng.ctxPath + "/mgr/user_edit?userId="+ data.userId;
     };
 
     /**
@@ -214,7 +206,8 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
 
     // 添加按钮点击事件
     $('#btnAdd').click(function () {
-        MgrUser.openAddUser();
+        //MgrUser.openAddUser();
+        window.location.href = Feng.ctxPath + "/mgr/user_add";
     });
 
     // 导出excel