From b2ca193586dfe9d744a120714cc3e577bed6a8e8 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Thu, 31 Dec 2020 00:50:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90ajaxUtil=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0json=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/assets/expand/module/ax/ajaxUtil.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/assets/expand/module/ax/ajaxUtil.js b/src/main/webapp/assets/expand/module/ax/ajaxUtil.js index 090a2131..67acdb3a 100644 --- a/src/main/webapp/assets/expand/module/ax/ajaxUtil.js +++ b/src/main/webapp/assets/expand/module/ax/ajaxUtil.js @@ -5,6 +5,9 @@ layui.define(['jquery'], function (exports) { post: function (url, params, suc, err, contentType, async) { ajaxUtil.sendAjax(url, params, 'POST', suc, err, contentType, async); }, + post: function (url, params, suc, err) { + ajaxUtil.sendAjax(url, params, 'POST', suc, err, null, null); + }, get: function (url, params, suc, err, contentType, async) { ajaxUtil.sendAjax(url, params, 'GET', suc, err, contentType, async); }, @@ -19,7 +22,7 @@ layui.define(['jquery'], function (exports) { url: url, cache: false, async: async == undefined ? false : async, - data: params == undefined ? '' : params, + data: params == undefined ? '' : JSON.stringify(params), type: method == undefined ? "POST" : method, contentType: contentType == undefined ? 'application/json; charset=UTF-8' : contentType, dataType: "json", From b5b8d75da2f7281721b30d5e5eb49095f26d4e19 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Thu, 31 Dec 2020 00:51:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90Organization=E3=80=91=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=8A=9F=E8=83=BD=E6=9A=82=E6=9C=AA=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OrganizationViewController.java | 53 +++++++ .../system/organization/organization.js | 144 ++++++++++++++++++ .../system/organization/organization_add.js | 18 +++ .../system/organization/organization_edit.js | 25 +++ .../system/organization/organization.html | 67 ++++++++ .../system/organization/organization_add.html | 46 ++++++ .../organization/organization_edit.html | 46 ++++++ 7 files changed, 399 insertions(+) create mode 100644 src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java create mode 100644 src/main/webapp/assets/modular/system/organization/organization.js create mode 100644 src/main/webapp/assets/modular/system/organization/organization_add.js create mode 100644 src/main/webapp/assets/modular/system/organization/organization_edit.js create mode 100644 src/main/webapp/pages/modular/system/organization/organization.html create mode 100644 src/main/webapp/pages/modular/system/organization/organization_add.html create mode 100644 src/main/webapp/pages/modular/system/organization/organization_edit.html diff --git a/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java b/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java new file mode 100644 index 00000000..3a8ff30b --- /dev/null +++ b/src/main/java/cn/stylefeng/guns/modular/organization/OrganizationViewController.java @@ -0,0 +1,53 @@ +package cn.stylefeng.guns.modular.organization; + +import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; + +/** + * 职位管理控制器 + * + * @author chenjinlong + * @date 2020/12/28 9:28 + */ +@Controller +@Slf4j +@ApiResource(name = "职位管理相关的界面渲染", path = "organization") +public class OrganizationViewController { + + private String PREFIX = "/modular/system/organization"; + + /** + * 机构管理-首页-视图 + * + * @author chenjinlong + * @date 2020/11/04 11:07 + */ + @GetResource(name = "机构管理-首页-视图", path = "", requiredPermission = false, requiredLogin = false) + public String indexView() { + return PREFIX + "/organization.html"; + } + + /** + * 机构管理—新增-视图 + * + * @author chenjinlong + * @date 2020/11/04 11:07 + */ + @GetResource(name = "机构管理—新增-视图", path = "/addView", requiredPermission = false, requiredLogin = false) + public String addView() { + return PREFIX + "/organization_add.html"; + } + + /** + * 机构管理_修改_视图 + * + * @author chenjinlong + * @date 2020/11/04 11:07 + */ + @GetResource(name = "机构管理-修改-视图", path = "editView", requiredPermission = false, requiredLogin = false) + public String editView() { + return PREFIX + "/organization_edit.html"; + } +} diff --git a/src/main/webapp/assets/modular/system/organization/organization.js b/src/main/webapp/assets/modular/system/organization/organization.js new file mode 100644 index 00000000..3256b375 --- /dev/null +++ b/src/main/webapp/assets/modular/system/organization/organization.js @@ -0,0 +1,144 @@ +layui.use(['table', 'admin', 'ax', 'form', 'func', 'ajaxUtil', 'dropdown','util'], function () { + var $ = layui.$; + var table = layui.table; + var form = layui.form; + var func = layui.func; + var ajaxUtil = layui.ajaxUtil; + var dropdown = layui.dropdown; + var util = layui.util; + + // 职位表管理 + var Organization = { + tableId: "organizationTable" + }; + + // 初始化表格的列 + Organization.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: '创建时间',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: '操作'} + ]]; + }; + + // 点击查询按钮 + Organization.search = function () { + var queryData = {}; + queryData['positionName'] = $("#positionName").val(); + //queryData['positionCode'] = $("#positionCode").val(); + table.reload(Organization.tableId, { + where: queryData, + page: {curr: 1} + }); + }; + + // 弹出添加对话框 + Organization.openAddDlg = function () { + func.open({ + height: 800, + title: '添加职位', + content: Feng.ctxPath + '/hrOrganization/addView', + tableId: Organization.tableId + }); + }; + + // 点击编辑 + Organization.openEditDlg = function (data) { + func.open({ + height: 800, + title: '修改职位', + content: Feng.ctxPath + '/organization/editView?positionId=' + data.positionId, + tableId: Organization.tableId + }); + }; + + // 导出excel按钮 + Organization.exportExcel = function () { + var checkRows = table.checkStatus(Organization.tableId); + if (checkRows.data.length === 0) { + Feng.error("请选择要导出的数据"); + } else { + table.exportFile(tableResult.config.id, checkRows.data, 'xls'); + } + }; + + // 点击删除 + Organization.delete = function (data) { + var operation = function () { + ajaxUtil.post(Feng.ctxPath + "/hrOrganization/delete", {"positionId":data.positionId},function (data) { + Feng.success("删除成功!"); + table.reload(Organization.tableId); + },function (data) { + Feng.error("删除失败!" + data.responseJSON.message + "!"); + }); + }; + Feng.confirm("是否删除?", operation); + }; + + // 修改职位状态 + Organization.updateStatus = function (positionId, checked) { + ajaxUtil.post(Feng.ctxPath + "/hrOrganization/updateStatus", {"positionId":positionId,"statusFlag":checked},function (data) { + Feng.success("修改成功!"); + },function (data) { + Feng.error("修改失败!" + data.responseJSON.message); + table.reload(Organization.tableId); + }); + }; + + // 渲染表格 + var tableResult = table.render({ + elem: '#' + Organization.tableId, + url: Feng.ctxPath + '/hrOrganization/page', + page: true, + request: {pageName: 'pageNo', limitName: 'pageSize'}, //自定义分页参数 + height: "full-158", + cellMinWidth: 100, + cols: Organization.initColumn(), + parseData: Feng.parseData + }); + + // 搜索按钮点击事件 + $('#btnSearch').click(function () { + Organization.search(); + }); + + // 添加按钮点击事件 + $('#btnAdd').click(function () { + Organization.openAddDlg(); + }); + + // 导出excel + $('#btnExp').click(function () { + Organization.exportExcel(); + }); + + // 工具条点击事件 + table.on('tool(' + Organization.tableId + ')', function (obj) { + var data = obj.data; + var event = obj.event; + if (event === 'edit') { + Organization.openEditDlg(data); + } else if (event === 'delete') { + Organization.delete(data); + } + dropdown.hideAll(); + }); + + // 修改状态 + form.on('switch(status)', function (obj) { + var positionId = obj.elem.value; + var checked = obj.elem.checked ? 1 : 2; + Organization.updateStatus(positionId, checked); + }); +}); diff --git a/src/main/webapp/assets/modular/system/organization/organization_add.js b/src/main/webapp/assets/modular/system/organization/organization_add.js new file mode 100644 index 00000000..b01eb4bf --- /dev/null +++ b/src/main/webapp/assets/modular/system/organization/organization_add.js @@ -0,0 +1,18 @@ +layui.use(['form', 'admin', 'ax', 'ajaxUtil'], function () { + var form = layui.form; + var admin = layui.admin; + var ajaxUtil = layui.ajaxUtil; + + //表单提交事件 + form.on('submit(btnSubmit)', function (data) { + ajaxUtil.post(Feng.ctxPath + "/hrOrganization/add", data.field, function (res) { + admin.closeThisDialog(); + Feng.success("添加成功！"); + admin.putTempData('formOk', true); + + }, function (res) { + admin.closeThisDialog(); + Feng.error("添加失败！" + res.responseJSON.message); + }); + }); +}); \ No newline at end of file diff --git a/src/main/webapp/assets/modular/system/organization/organization_edit.js b/src/main/webapp/assets/modular/system/organization/organization_edit.js new file mode 100644 index 00000000..450527c7 --- /dev/null +++ b/src/main/webapp/assets/modular/system/organization/organization_edit.js @@ -0,0 +1,25 @@ +layui.use(['form', 'admin', 'ajaxUtil'], function () { + var form = layui.form; + var admin = layui.admin; + var ajaxUtil = layui.ajaxUtil; + //获取详情信息，填充表单 + + ajaxUtil.get("/hrOrganization/detail?orgId=" + 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) { + ajaxUtil.post(Feng.ctxPath + "/hrOrganization/edit", data.field, function (res) { + Feng.success("修改成功!"); + admin.putTempData('formOk', true); + admin.closeThisDialog(); + }, function (res) { + admin.closeThisDialog(); + Feng.error("修改失败!" + res.responseJSON.message); + }); + }); +}); \ No newline at end of file diff --git a/src/main/webapp/pages/modular/system/organization/organization.html b/src/main/webapp/pages/modular/system/organization/organization.html new file mode 100644 index 00000000..5bd69589 --- /dev/null +++ b/src/main/webapp/pages/modular/system/organization/organization.html @@ -0,0 +1,67 @@ +@layout("/layout/_container.html",{js:["/assets/modular/system/organization/organization.js"]}){ + +
+ 职位表管理 +
+ +
+
+
+
+
+
+
+
+ +
+ + + +
+ + + + +
+ + +
+
+
+
+
+
+
+
+
+
+ + + + +@} \ No newline at end of file diff --git a/src/main/webapp/pages/modular/system/organization/organization_add.html b/src/main/webapp/pages/modular/system/organization/organization_add.html new file mode 100644 index 00000000..a66a33bb --- /dev/null +++ b/src/main/webapp/pages/modular/system/organization/organization_add.html @@ -0,0 +1,46 @@ +@layout("/layout/_form.html",{js:["/assets/modular/system/organization/organization_add.js"]}){ + +
+
+
+
基本信息
+
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ + +
+ +
+ +@} \ No newline at end of file diff --git a/src/main/webapp/pages/modular/system/organization/organization_edit.html b/src/main/webapp/pages/modular/system/organization/organization_edit.html new file mode 100644 index 00000000..40dbf4b9 --- /dev/null +++ b/src/main/webapp/pages/modular/system/organization/organization_edit.html @@ -0,0 +1,46 @@ +@layout("/layout/_form.html",{js:["/assets/modular/system/organization/organization_edit.js"]}){ + +
+
+
+
基本信息
+
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ + +
+ +
+ +@} \ No newline at end of file From d9b8eca541795e9951f64d3e341257c71c5c24b9 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Thu, 31 Dec 2020 00:52:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90Position=E3=80=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=E5=B9=B6=E4=B8=94=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?easyweb=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 From a742c45dab04d52d17b2e2be12ec16a8de541684 Mon Sep 17 00:00:00 2001 From: chenjinlong <$chenjinlong> Date: Thu, 31 Dec 2020 01:06:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90Organization=E3=80=91=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/organization/organization.html | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/src/main/webapp/pages/modular/system/organization/organization.html b/src/main/webapp/pages/modular/system/organization/organization.html index 5bd69589..e988d339 100644 --- a/src/main/webapp/pages/modular/system/organization/organization.html +++ b/src/main/webapp/pages/modular/system/organization/organization.html @@ -6,35 +6,32 @@
-
+
-
-
-
-
- -
- - - -
- - - - -
- - -
-
-
-
-
+
+ + + + + + + + + + + + + + +
+
+
+
+
+
+
+ +