【position】增加职位管理

src/main/java/cn/stylefeng/guns/modular/controller/PositionViewController.java

@@ -0,0 +1,59 @@
+package cn.stylefeng.guns.modular.controller;
+
+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 = "position")
+public class PositionViewController {
+
+    private String PREFIX = "/modular/system/position";
+
+    /**
+     * 职位管理
+     *
+     * @param
+     * @return
+     * @author chenjinlong
+     * @date 2020/12/28 9:33
+     */
+    @GetResource(name = "职位管理", path = "", requiredPermission = false, requiredLogin = false)
+    public String indexView() {
+        return PREFIX + "/position.html";
+    }
+
+    /**
+     * 职位管理
+     *
+     * @param
+     * @return
+     * @author chenjinlong
+     * @date 2020/12/28 9:33
+     */
+    @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
+     */
+    @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

@@ -19,14 +19,47 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () {
     Position.initColumn = function () {
         return [[
             {type: 'checkbox'},
-            {field: 'positionId', hide: true, title: '主键id'},
+            {
-            {field: 'name', sort: true, title: '职位名称'},
+                field: 'positionId',
-            {field: 'code', sort: true, title: '职位编码'},
+                hide: true,
-            {field: 'remark', sort: true, title: '备注'},
+                title: '主键id'
-            {field: 'createTime', sort: true, title: '创建时间'},
+            },
-            {field: 'updateTime', sort: true, title: '更新时间'},
+            {
-            {field: 'status', sort: true, templet: '#statusTpl', title: '状态'},
+                field: 'positionName',
-            {align: 'center', toolbar: '#tableBar', title: '操作'}
+                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: '操作'
+            }
         ]];
     };
 
@@ -37,7 +70,8 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () {
         var queryData = {};
         queryData['condition'] = $("#condition").val();
         table.reload(Position.tableId, {
-            where: queryData, page: {curr: 1}
+            where: queryData,
+            page: {curr: 1}
         });
     };
 
@@ -46,9 +80,9 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () {
      */
     Position.openAddDlg = function () {
         func.open({
-            height: 470,
+            height: 800,
             title: '添加职位',
-            content: Feng.ctxPath + '/position/add',
+            content: Feng.ctxPath + '/position/addView',
             tableId: Position.tableId
         });
     };
@@ -60,9 +94,9 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () {
      */
     Position.openEditDlg = function (data) {
         func.open({
-            height: 470,
+            height: 800,
             title: '修改职位',
-            content: Feng.ctxPath + '/position/edit?positionId=' + data.positionId,
+            content: Feng.ctxPath + '/position/editView?positionId=' + data.positionId,
             tableId: Position.tableId
         });
     };
@@ -116,11 +150,12 @@ layui.use(['table', 'admin', 'ax', 'form', 'func'], function () {
     // 渲染表格
     var tableResult = table.render({
         elem: '#' + Position.tableId,
-        url: Feng.ctxPath + '/position/list',
+        url: Feng.ctxPath + '/hrPosition/page',
         page: true,
         height: "full-158",
         cellMinWidth: 100,
-        cols: Position.initColumn()
+        cols: Position.initColumn(),
+        parseData: Feng.parseData
     });
 
     // 搜索按钮点击事件

src/main/webapp/assets/modular/system/position/position_add.js

@@ -23,7 +23,7 @@ layui.use(['form', 'admin', 'ax'], function () {
 
     //表单提交事件
     form.on('submit(btnSubmit)', function (data) {
-        var ajax = new $ax(Feng.ctxPath + "/position/addItem", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/hrPosition/add", function (data) {
             Feng.success("添加成功！");
 
             //传给上个页面，刷新table用

src/main/webapp/assets/modular/system/position/position_edit.js

@@ -22,13 +22,13 @@ layui.use(['form', 'admin', 'ax'], function () {
     var admin = layui.admin;
 
     //获取详情信息，填充表单
-    var ajax = new $ax(Feng.ctxPath + "/position/detail?positionId=" + Feng.getUrlParam("positionId"));
+    var ajax = new $ax(Feng.ctxPath + "/hrPosition/detail?positionId=" + Feng.getUrlParam("positionId"));
     var result = ajax.start();
     form.val('positionForm', result.data);
 
     //表单提交事件
     form.on('submit(btnSubmit)', function (data) {
-        var ajax = new $ax(Feng.ctxPath + "/position/editItem", function (data) {
+        var ajax = new $ax(Feng.ctxPath + "/hrPosition/edit", function (data) {
             Feng.success("更新成功！");
 
             //传给上个页面，刷新table用

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

@@ -10,25 +10,25 @@
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label">职位名称<span style="color: red;">*</span></label>
                         <div class="layui-input-block">
-                            <input id="name" name="name" placeholder="请输入职位名称" type="text" class="layui-input" lay-verify="required" required/>
+                            <input id="positionName" name="positionName" placeholder="请输入职位名称" type="text" class="layui-input" lay-verify="required" required/>
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label">职位编码<span style="color: red;">*</span></label>
                         <div class="layui-input-block">
-                            <input id="code" name="code" placeholder="请输入职位编码" type="text" class="layui-input" lay-verify="required" required/>
+                            <input id="positionCode" name="positionCode" placeholder="请输入职位编码" type="text" class="layui-input" lay-verify="required" required/>
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label">顺序<span style="color: red;">*</span></label>
                         <div class="layui-input-block">
-                            <input id="sort" name="sort" placeholder="请输入顺序" type="text" class="layui-input" lay-verify="required" required/>
+                            <input id="positionSort" name="positionSort" placeholder="请输入顺序" type="text" class="layui-input" lay-verify="required" required/>
                         </div>
                     </div>
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label">备注<span style="color: red;">*</span></label>
                         <div class="layui-input-block">
-                            <input id="remark" name="remark" placeholder="请输入备注" type="text" class="layui-input" lay-verify="required" required/>
+                            <textarea id="positionRemark" name="positionRemark" placeholder="请输入备注" class="layui-textarea" lay-verify="required" required></textarea>
                         </div>
                     </div>
                 </div>

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

@@ -28,7 +28,7 @@
                     <div class="layui-inline layui-col-md12">
                         <label class="layui-form-label">备注<span style="color: red;">*</span></label>
                         <div class="layui-input-block">
-                            <input id="remark" name="remark" placeholder="请输入备注" type="text" class="layui-input" lay-verify="required" required/>
+                            <textarea id="positionRemark" name="positionRemark" placeholder="请输入备注" class="layui-textarea" lay-verify="required" required></textarea>
                         </div>
                     </div>
                 </div>