From d9b8eca541795e9951f64d3e341257c71c5c24b9 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Thu, 31 Dec 2020 00:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90Position=E3=80=91=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B9=B6=E4=B8=94=E5=A2=9E=E5=8A=A0easyweb?= =?UTF-8?q?=E6=96=B0=E7=BB=84=E4=BB=B6=E7=94=A8=E4=BA=8Ecopy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../position/PositionViewController.java | 24 ++--- .../modular/system/position/position.js | 93 ++++++++----------- .../modular/system/position/position_add.js | 2 +- .../modular/system/position/position_edit.js | 4 +- .../modular/system/position/position.html | 32 ++++++- 5 files changed, 79 insertions(+), 76 deletions(-) diff --git a/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java index 20a2b390..77d12452 100644 --- a/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java +++ b/src/main/java/cn/stylefeng/guns/modular/position/PositionViewController.java @@ -19,40 +19,34 @@ public class PositionViewController { private String PREFIX = "/modular/system/position"; /** - * 职位管理 + * 职位管理-首页-视图 * - * @param - * @return * @author chenjinlong - * @date 2020/12/28 9:33 + * @date 2020/11/04 11:07 */ - @GetResource(name = "职位管理", path = "", requiredPermission = false, requiredLogin = false) + @GetResource(name = "职位管理-首页-视图", path = "", requiredPermission = false, requiredLogin = false) public String indexView() { return PREFIX + "/position.html"; } /** - * 职位管理 + * 职位管理-首页-视图 * - * @param - * @return * @author chenjinlong - * @date 2020/12/28 9:33 + * @date 2020/11/04 11:07 */ - @GetResource(name = "职位管理", path = "/addView", requiredPermission = false, requiredLogin = false) + @GetResource(name = "职位管理-首页-视图", path = "/addView", requiredPermission = false, requiredLogin = false) public String addView() { return PREFIX + "/position_add.html"; } /** - * 职位管理 + * 职位管理-首页-视图 * - * @param - * @return * @author chenjinlong - * @date 2020/12/28 9:33 + * @date 2020/11/04 11:07 */ - @GetResource(name = "职位管理", path = "editView", requiredPermission = false, requiredLogin = false) + @GetResource(name = "职位管理-首页-视图", path = "editView", requiredPermission = false, requiredLogin = false) public String editView() { return PREFIX + "/position_edit.html"; } diff --git a/src/main/webapp/assets/modular/system/position/position.js b/src/main/webapp/assets/modular/system/position/position.js index 3b229e2c..33bf2680 100644 --- a/src/main/webapp/assets/modular/system/position/position.js +++ b/src/main/webapp/assets/modular/system/position/position.js @@ -1,21 +1,18 @@ -layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { +layui.use(['table', 'admin', 'ax', 'form', 'func', 'ajaxUtil', 'dropdown','util'], function () { var $ = layui.$; var table = layui.table; - var $ax = layui.ax; - var admin = layui.admin; var form = layui.form; var func = layui.func; + var ajaxUtil = layui.ajaxUtil; + var dropdown = layui.dropdown; + var util = layui.util; - /** - * 职位表管理 - */ + // 职位表管理 var Position = { tableId: "positionTable" }; - /** - * 初始化表格的列 - */ + // 初始化表格的列 Position.initColumn = function () { return [[ {type: 'checkbox'}, @@ -23,28 +20,30 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { {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: '状态'}, + {field: 'createTime', sort: true, title: '创建时间',templet: function (d) { + return util.toDateString(d.createTime); + }}, + {field: 'updateTime', sort: true, title: '更新时间',templet: function (d) { + console.log(d.updateTime); + return d.updateTime==null?'': util.toDateString(d.updateTime); + }}, + {field: 'statusFlag', sort: true, templet: '#statusTpl', title: '状态'}, {align: 'center', toolbar: '#tableBar', title: '操作'} ]]; }; - /** - * 点击查询按钮 - */ + // 点击查询按钮 Position.search = function () { var queryData = {}; - queryData['condition'] = $("#condition").val(); + queryData['positionName'] = $("#positionName").val(); + //queryData['positionCode'] = $("#positionCode").val(); table.reload(Position.tableId, { where: queryData, page: {curr: 1} }); }; - /** - * 弹出添加对话框 - */ + // 弹出添加对话框 Position.openAddDlg = function () { func.open({ height: 800, @@ -54,11 +53,7 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { }); }; - /** - * 点击编辑 - * - * @param data 点击按钮时候的行数据 - */ + // 点击编辑 Position.openEditDlg = function (data) { func.open({ height: 800, @@ -68,9 +63,7 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { }); }; - /** - * 导出excel按钮 - */ + // 导出excel按钮 Position.exportExcel = function () { var checkRows = table.checkStatus(Position.tableId); if (checkRows.data.length === 0) { @@ -80,38 +73,27 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { } }; - /** - * 点击删除 - * - * @param data 点击按钮时候的行数据 - */ - Position.onDeleteItem = function (data) { + // 点击删除 + Position.delete = function (data) { var operation = function () { - var ajax = new $ax(Feng.ctxPath + "/position/delete", function (data) { + ajaxUtil.post(Feng.ctxPath + "/hrPosition/delete", {"positionId":data.positionId},function (data) { Feng.success("删除成功!"); table.reload(Position.tableId); - }, function (data) { + },function (data) { Feng.error("删除失败!" + data.responseJSON.message + "!"); }); - ajax.set("positionId", data.positionId); - ajax.start(); }; Feng.confirm("是否删除?", operation); }; - /** - * 修改职位状态 - */ - Position.changeStatus = function (positionId, checked) { - var ajax = new $ax(Feng.ctxPath + "/position/changeStatus", function (data) { + // 修改职位状态 + Position.updateStatus = function (positionId, checked) { + ajaxUtil.post(Feng.ctxPath + "/hrPosition/updateStatus", {"positionId":positionId,"statusFlag":checked},function (data) { Feng.success("修改成功!"); - }, function (data) { + },function (data) { Feng.error("修改失败!" + data.responseJSON.message); table.reload(Position.tableId); }); - ajax.set("positionId", positionId); - ajax.set("status", checked); - ajax.start(); }; // 渲染表格 @@ -119,6 +101,7 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { elem: '#' + Position.tableId, url: Feng.ctxPath + '/hrPosition/page', page: true, + request: {pageName: 'pageNo', limitName: 'pageSize'}, //自定义分页参数 height: "full-158", cellMinWidth: 100, cols: Position.initColumn(), @@ -143,21 +126,19 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () { // 工具条点击事件 table.on('tool(' + Position.tableId + ')', function (obj) { var data = obj.data; - var layEvent = obj.event; - - if (layEvent === 'edit') { + var event = obj.event; + if (event === 'edit') { Position.openEditDlg(data); - } else if (layEvent === 'delete') { - Position.onDeleteItem(data); + } else if (event === 'delete') { + Position.delete(data); } + dropdown.hideAll(); }); - // 修改user状态 + // 修改状态 form.on('switch(status)', function (obj) { - var positionId = obj.elem.value; - var checked = obj.elem.checked ? true : false; - - Position.changeStatus(positionId, checked); + var checked = obj.elem.checked ? 1 : 2; + Position.updateStatus(positionId, checked); }); }); 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 b505bb9e..7001f086 100644 --- a/src/main/webapp/assets/modular/system/position/position_add.js +++ b/src/main/webapp/assets/modular/system/position/position_add.js @@ -24,7 +24,7 @@ layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () { //表单提交事件 form.on('submit(btnSubmit)', function (data) { - ajaxUtil.post(Feng.ctxPath + "/hrPosition/add", JSON.stringify(data.field), function (res) { + ajaxUtil.post(Feng.ctxPath + "/hrPosition/add", data.field, function (res) { admin.closeThisDialog(); Feng.success("添加成功！"); admin.putTempData('formOk', true); 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 d449accb..3804c18a 100644 --- a/src/main/webapp/assets/modular/system/position/position_edit.js +++ b/src/main/webapp/assets/modular/system/position/position_edit.js @@ -15,7 +15,7 @@ var PositionInfoDlg = { } }; -layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () { +layui.use(['form', 'admin', 'ajaxUtil'], function () { var $ = layui.jquery; var $ax = layui.ax; var form = layui.form; @@ -32,7 +32,7 @@ layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () { //表单提交事件 form.on('submit(btnSubmit)', function (data) { - ajaxUtil.post(Feng.ctxPath + "/hrPosition/edit", JSON.stringify(data.field), function (res) { + ajaxUtil.post(Feng.ctxPath + "/hrPosition/edit", data.field, function (res) { Feng.success("修改成功!"); admin.putTempData('formOk', true); admin.closeThisDialog(); diff --git a/src/main/webapp/pages/modular/system/position/position.html b/src/main/webapp/pages/modular/system/position/position.html index 550519dd..b223ced0 100644 --- a/src/main/webapp/pages/modular/system/position/position.html +++ b/src/main/webapp/pages/modular/system/position/position.html @@ -12,12 +12,25 @@
- +
+ + +
+ +
+ + +
@@ -31,9 +44,24 @@ @} \ No newline at end of file