【Position】功能完善并且增加easyweb新组件用于copy

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";
     }

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: 'createTime', sort: true, title: '创建时间',templet: function (d) {
-            {field: 'updateTime', sort: true, title: '更新时间'},
+                return util.toDateString(d.createTime);
-            {field: 'status', sort: true, templet: '#statusTpl', title: '状态'},
+            }},
+            {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 () {
         }
     };
 
-    /**
+    // 点击删除
-     * 点击删除
+    Position.delete = function (data) {
-     *
-     * @param data 点击按钮时候的行数据
-     */
-    Position.onDeleteItem = 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.updateStatus = function (positionId, checked) {
-     */
+        ajaxUtil.post(Feng.ctxPath + "/hrPosition/updateStatus", {"positionId":positionId,"statusFlag":checked},function (data) {
-    Position.changeStatus = function (positionId, checked) {
-        var ajax = new $ax(Feng.ctxPath + "/position/changeStatus", 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;
+        var event = obj.event;
-
+        if (event === 'edit') {
-        if (layEvent === 'edit') {
             Position.openEditDlg(data);
-        } else if (layEvent === 'delete') {
+        } else if (event === 'delete') {
-            Position.onDeleteItem(data);
+            Position.delete(data);
         }
+        dropdown.hideAll();
     });
 
-    // 修改user状态
+    // 修改状态
     form.on('switch(status)', function (obj) {
-
         var positionId = obj.elem.value;
-        var checked = obj.elem.checked ? true : false;
+        var checked = obj.elem.checked ? 1 : 2;
-
+        Position.updateStatus(positionId, checked);
-        Position.changeStatus(positionId, checked);
     });
 });

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);

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();

src/main/webapp/pages/modular/system/position/position.html

@@ -12,12 +12,25 @@
                     <div class="layui-form toolbar">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <input id="condition" class="layui-input" type="text" placeholder="名称"/>
+                                <input id="positionName" class="layui-input" type="text" placeholder="职位名称"/>
                             </div>
+<!--                            <div class="layui-inline">-->
+<!--                                <input id="positionCode" class="layui-input" type="text" placeholder="职位编码"/>-->
+<!--                            </div>-->
                             <div class="layui-inline">
                                 <button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
                                 <button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
                                 <button id="btnExp" class="layui-btn icon-btn"><i class="layui-icon">&#xe67d;</i>导出</button>
+                                <!-- 下拉按钮 -->
+                                <div class="dropdown-menu dropdown-hover">
+                                    <button class="layui-btn icon-btn" type="button">
+                                        &nbsp;更多 <i class="layui-icon layui-icon-drop"></i></button>
+                                    <ul class="dropdown-menu-nav">
+                                        <li><a><i class="layui-icon layui-icon-edit"></i>test1</a></li>
+                                        <li><a><i class="layui-icon layui-icon-delete"></i>test2</a></li>
+                                        <li><a><i class="layui-icon layui-icon-password"></i>test3</a></li>
+                                    </ul>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -31,9 +44,24 @@
 <script type="text/html" id="tableBar">
     <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">删除</a>
+    <a class="layui-btn layui-btn-xs" data-dropdown="#userTbDrop{{d.LAY_INDEX}}" no-shade="true">
+        更多<i class="layui-icon layui-icon-drop" style="font-size: 12px;margin-right: 0;"></i></a>
+    <!-- 下拉菜单 -->
+    <ul class="dropdown-menu-nav dropdown-bottom-right layui-hide" id="userTbDrop{{d.LAY_INDEX}}">
+        <div class="dropdown-anchor"></div>
+        <li><a lay-event="lock"><i class="layui-icon layui-icon-password"></i>锁定用户</a></li>
+        <li><a lay-event="reset"><i class="layui-icon layui-icon-key"></i>重置密码</a></li>
+        <li class="have-more show-left">
+            <a><i class="layui-icon layui-icon-upload-drag"></i>上传资料&nbsp;&nbsp;</a>
+            <ul class="dropdown-menu-nav-child">
+                <li><a><i class="layui-icon layui-icon-camera"></i>上传头像</a></li>
+                <li><a><i class="layui-icon layui-icon-picture-fine"></i>上传照片</a></li>
+            </ul>
+        </li>
+    </ul>
 </script>
 
 <script type="text/html" id="statusTpl">
-    <input type="checkbox" lay-filter="status" value="{{d.positionId}}" lay-skin="switch" lay-text="启用|禁用" {{d.status=='ENABLE'?'checked':''}} />
+    <input type="checkbox" lay-filter="status" value="{{d.positionId}}" lay-skin="switch" lay-text="正常|锁定" {{d.statusFlag=='1'?'checked':''}} />
 </script>
 @}