From d0013358550585c6d43b8a5a8b60d2a0fd13a56f Mon Sep 17 00:00:00 2001 From: chenjinlong <22208488@qq.com> Date: Wed, 30 Dec 2020 20:36:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ajaxUtil.js=E3=80=91ajax=E5=B7=A5?= =?UTF-8?q?=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PositionViewController.java | 2 +- src/main/webapp/assets/common/js/common.js | 3 +- .../assets/expand/module/ax/ajaxUtil.js | 47 ++++++++++++++++++ .../modular/system/position/position.js | 49 +++---------------- .../modular/system/position/position_add.js | 18 +++---- .../modular/system/position/position_edit.js | 32 ++++++------ .../modular/system/position/position_add.html | 1 + .../system/position/position_edit.html | 7 +-- 8 files changed, 83 insertions(+), 76 deletions(-) rename src/main/java/cn/stylefeng/guns/modular/{login => position}/PositionViewController.java (96%) create mode 100644 src/main/webapp/assets/expand/module/ax/ajaxUtil.js diff --git a/src/main/java/cn/stylefeng/guns/modular/login/PositionViewController.java b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java similarity index 96% rename from src/main/java/cn/stylefeng/guns/modular/login/PositionViewController.java rename to src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java index 347d55f9..20a2b390 100644 --- a/src/main/java/cn/stylefeng/guns/modular/login/PositionViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java @@ -1,4 +1,4 @@ -package cn.stylefeng.guns.modular.controller; +package cn.stylefeng.guns.modular.position; import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; diff --git a/src/main/webapp/assets/common/js/common.js b/src/main/webapp/assets/common/js/common.js index cb8c770a..61cbfeec 100644 --- a/src/main/webapp/assets/common/js/common.js +++ b/src/main/webapp/assets/common/js/common.js @@ -131,7 +131,8 @@ layui.config({ iconPicker: '../../expand/module/iconPicker/iconPicker', ztree: '../../expand/module/ztree/ztree-object', ax: '../../expand/module/ax/ax', - func: '../../expand/module/func/func' + func: '../../expand/module/func/func', + ajaxUtil: '../../expand/module/ax/ajaxUtil' }).use(['layer', 'admin'], function () { var $ = layui.jquery; var layer = layui.layer; diff --git a/src/main/webapp/assets/expand/module/ax/ajaxUtil.js b/src/main/webapp/assets/expand/module/ax/ajaxUtil.js new file mode 100644 index 00000000..090a2131 --- /dev/null +++ b/src/main/webapp/assets/expand/module/ax/ajaxUtil.js @@ -0,0 +1,47 @@ +layui.define(['jquery'], function (exports) { + var $ = layui.$; + + var ajaxUtil = { + post: function (url, params, suc, err, contentType, async) { + ajaxUtil.sendAjax(url, params, 'POST', suc, err, contentType, async); + }, + get: function (url, params, suc, err, contentType, async) { + ajaxUtil.sendAjax(url, params, 'GET', suc, err, contentType, async); + }, + get: function (url, suc, err, contentType, async) { + ajaxUtil.sendAjax(url, '', 'GET', suc, err, contentType, async); + }, + get: function (url, suc, err) { + ajaxUtil.sendAjax(url, '', 'GET', suc, err, null, null); + }, + sendAjax: function (url, params, method, suc, err, contentType, async) { + $.ajax({ + url: url, + cache: false, + async: async == undefined ? false : async, + data: params == undefined ? '' : params, + type: method == undefined ? "POST" : method, + contentType: contentType == undefined ? 'application/json; charset=UTF-8' : contentType, + dataType: "json", + success: function (data) { + if (data.code = '00000') { + if (suc !== undefined && typeof suc == "function") { + suc(data); + } + } else { + if (err !== undefined && typeof err == "function") { + err(data); + } + } + + }, + error: function (data) { + if (err !== undefined && typeof err == "function") { + err(data); + } + } + }); + } + } + exports("ajaxUtil", ajaxUtil); +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modular/system/position/position.js b/src/main/webapp/assets/modular/system/position/position.js index 04e2c228..3b229e2c 100644 --- a/src/main/webapp/assets/modular/system/position/position.js +++ b/src/main/webapp/assets/modular/system/position/position.js @@ -19,47 +19,14 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { Position.initColumn = function () { return [[ {type: 'checkbox'}, - { - field: 'positionId', - hide: true, - title: '主键id' - }, - { - field: 'positionName', - sort: true, - title: '职位名称' - }, - { - field: 'positionCode', - sort: true, - title: '职位编码' - }, - { - field: 'positionRemark', - sort: true, - title: '备注' - }, - { - field: 'createTime', - sort: true, - title: '创建时间' - }, - { - field: 'updateTime', - sort: true, - title: '更新时间' - }, - { - field: 'status', - sort: true, - templet: '#statusTpl', - title: '状态' - }, - { - align: 'center', - toolbar: '#tableBar', - title: '操作' - } + {field: 'positionId', hide: true, title: '主键id'}, + {field: 'positionName', sort: true, title: '职位名称'}, + {field: 'positionCode', sort: true, title: '职位编码'}, + {field: 'positionRemark', sort: true, title: '备注'}, + {field: 'createTime', sort: true, title: '创建时间'}, + {field: 'updateTime', sort: true, title: '更新时间'}, + {field: 'status', sort: true, templet: '#statusTpl', title: '状态'}, + {align: 'center', toolbar: '#tableBar', title: '操作'} ]]; }; diff --git a/src/main/webapp/assets/modular/system/position/position_add.js b/src/main/webapp/assets/modular/system/position/position_add.js index eb6ceadf..b505bb9e 100644 --- a/src/main/webapp/assets/modular/system/position/position_add.js +++ b/src/main/webapp/assets/modular/system/position/position_add.js @@ -15,29 +15,23 @@ var PositionInfoDlg = { } }; -layui.use(['form', 'admin', 'ax'], function () { +layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () { var $ = layui.jquery; var $ax = layui.ax; var form = layui.form; var admin = layui.admin; + var ajaxUtil = layui.ajaxUtil; //表单提交事件 form.on('submit(btnSubmit)', function (data) { - var ajax = new $ax(Feng.ctxPath + "/hrPosition/add", function (data) { + ajaxUtil.post(Feng.ctxPath + "/hrPosition/add", JSON.stringify(data.field), function (res) { + admin.closeThisDialog(); Feng.success("添加成功！"); - - //传给上个页面，刷新table用 admin.putTempData('formOk', true); - //关掉对话框 + }, function (res) { admin.closeThisDialog(); - - }, function (data) { - Feng.error("添加失败！" + data.responseJSON.message) + Feng.error("添加失败！" + res.responseJSON.message); }); - ajax.set(data.field); - ajax.start(); - - return false; }); }); \ No newline at end of file diff --git a/src/main/webapp/assets/modular/system/position/position_edit.js b/src/main/webapp/assets/modular/system/position/position_edit.js index 7a86cb06..d449accb 100644 --- a/src/main/webapp/assets/modular/system/position/position_edit.js +++ b/src/main/webapp/assets/modular/system/position/position_edit.js @@ -15,34 +15,30 @@ var PositionInfoDlg = { } }; -layui.use(['form', 'admin', 'ax'], function () { +layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () { var $ = layui.jquery; var $ax = layui.ax; var form = layui.form; var admin = layui.admin; - + var ajaxUtil = layui.ajaxUtil; //获取详情信息，填充表单 - var ajax = new $ax(Feng.ctxPath + "/hrPosition/detail?positionId=" + Feng.getUrlParam("positionId")); - var result = ajax.start(); - form.val('positionForm', result.data); + + ajaxUtil.get("/hrPosition/detail?positionId=" + Feng.getUrlParam("positionId"), function (res) { + form.val('positionForm', res.data); + }, function (res) { + admin.closeThisDialog(); + Feng.error("编辑异常！" + res.responseJSON.message); + }); //表单提交事件 form.on('submit(btnSubmit)', function (data) { - var ajax = new $ax(Feng.ctxPath + "/hrPosition/edit", function (data) { - Feng.success("更新成功！"); - - //传给上个页面，刷新table用 + ajaxUtil.post(Feng.ctxPath + "/hrPosition/edit", JSON.stringify(data.field), function (res) { + Feng.success("修改成功!"); admin.putTempData('formOk', true); - - //关掉对话框 admin.closeThisDialog(); - - }, function (data) { - Feng.error("更新失败！" + data.responseJSON.message) + }, function (res) { + admin.closeThisDialog(); + Feng.error("修改失败!" + res.responseJSON.message); }); - ajax.set(data.field); - ajax.start(); - - return false; }); }); \ No newline at end of file diff --git a/src/main/webapp/pages/modular/system/position/position_add.html b/src/main/webapp/pages/modular/system/position/position_add.html index 57f942b5..11e65c7b 100644 --- a/src/main/webapp/pages/modular/system/position/position_add.html +++ b/src/main/webapp/pages/modular/system/position/position_add.html @@ -7,6 +7,7 @@
+
diff --git a/src/main/webapp/pages/modular/system/position/position_edit.html b/src/main/webapp/pages/modular/system/position/position_edit.html index 264e83e8..d6cb5770 100644 --- a/src/main/webapp/pages/modular/system/position/position_edit.html +++ b/src/main/webapp/pages/modular/system/position/position_edit.html @@ -7,22 +7,23 @@
+
- +
- +
- +