修改部分页面展示情况

src/main/resources/templates/pages/company/company-out.html

@@ -57,7 +57,6 @@
         <script type="text/html" id="currentTableBar">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类别</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail">详情</a>
-            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="post">岗位</a>
         </script>
 
     </div>
@@ -100,7 +99,6 @@
             cols: [
                 [
                     {type: "checkbox", width: 50},
-                    {field: 'number', width: 100, title: '编号', sort: true},
                     {field: 'name', width: 250, title: '名称'},
                     {field: 'abbreviation', width: 200, title: '简称'},
                     {
@@ -175,29 +173,14 @@
                     maxmin: true,
                     shadeClose: true,
                     area: ['100%', '100%'],
-                    content: '/findCompanyByParentId?parentId=' + data.id+'&level='+data.level
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-                return false;
-            } else if (obj.event == 'post') {
-                var index = layer.open({
-                    title: '岗位列表',
-                    type: 2,
-                    shade: 0.2,
-                    maxmin: true,
-                    shadeClose: true,
-                    area: ['100%', '100%'],
-                    content: '/findPostByOrganization?organization=' + data.id
+                    content: '/findCompanyByParentId?parentId=' + data.id + '&level=' + data.level
                 });
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
                 return false;
             }
-        });
-
+        })
     });
 </script>
 

src/main/resources/templates/pages/company/companyByParentId.html

@@ -55,8 +55,9 @@
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
 
         <script type="text/html" id="currentTableBar">
-            <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子公司</a>
+            <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子类别</a>
             <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="detail">详情</a>
+            <a class="layui-btn  layui-btn-xs data-count-edit" lay-event="post">岗位</a>
         </script>
 
     </div>
@@ -101,7 +102,6 @@
             cols: [
                 [
                     {type: "checkbox", width: 50},
-                    {field: 'number', width: 100, title: '编号', sort: true},
                     {field: 'name', width: 200, title: '名称', sort: true},
                     {field: 'abbreviation', width: 200, title: '简称', sort: true},
                     {
@@ -169,9 +169,9 @@
                     layer.full(index);
                 });
                 return false;
-            } else if (obj.event == 'subclass') {
+            } else if (obj.event === 'subclass') {
                 var index = layer.open({
-                    title: '子公司',
+                    title: '子类型',
                     type: 2,
                     shade: 0.2,
                     maxmin: true,
@@ -184,6 +184,21 @@
                 });
                 return false;
             }
+            else if (obj.event === 'post') {
+                var index = layer.open({
+                    title: '岗位列表',
+                    type: 2,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['100%', '100%'],
+                    content: '/findPostByOrganization?organization=' + data.id
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+                return false;
+            }
         });
 
     });

src/main/resources/templates/pages/company/company_edit.html

@@ -19,12 +19,6 @@
             <input type="text" th:value="${record.getId()}" name="id" required  lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">编号</label>
-        <div class="layui-input-block">
-            <input type="text" th:value="${record.getNumber()}" name="number" required  lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
-        </div>
-    </div>
     <div class="layui-form-item">
         <label class="layui-form-label">公司名称</label>
         <div class="layui-input-block">

src/main/resources/templates/pages/post/post-out.html

@@ -98,15 +98,12 @@
             cols: [
                 [
                     {type: "checkbox", width: 50},
-                    {field: 'number', width: 100, title: '编号', sort: true},
                     {field: 'name', width: 250, title: '名称'},
                     {field: 'dutiesname', width: 200, title: '名称'},
                     {field: 'aoname', width: 200, title: '归属行政组织名称'},
-                    {field: 'aonumber', width: 200, title: '归属行政组织编号'},
                     {field: 'jobname', width: 200, title: '职务类别'},
                     {field: 'depositoryName', width: 200, title: '管理仓库'},
                     {field: 'superiorname', width: 200, title: '上级名称'},
-                    {field: 'superiornumber', width: 200, title: '上级编号'},
                     {field: 'departmentname', width: 200, title: '部门'},
                     {
                         field: 'state', title: '状态', minWidth: 80, templet: function (d) {

src/main/resources/templates/pages/post/post-view.html

@@ -19,36 +19,18 @@
             <input type="text" th:value="${record.getId()}" name="id" required  lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">编号</label>
-        <div class="layui-input-block">
-            <input type="text" th:value="${record.getNumber()}" name="number" required  lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
-        </div>
-    </div>
     <div class="layui-form-item">
         <label class="layui-form-label">岗位名称</label>
         <div class="layui-input-block">
             <input type="text" th:value="${record.getName()}" name="name" required  lay-verify="required" autocomplete="off" class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">职务编号</label>
-        <div class="layui-input-block">
-            <input type="text" th:value="${record.getDutiesnumber()}" name="introduce" required  lay-verify="required" autocomplete="off" class="layui-input">
-        </div>
-    </div>
     <div class="layui-form-item">
         <label class="layui-form-label">上级名称:</label>
         <div class="layui-input-block">
             <input type="text" th:value="${record.getAoname()}" name="aoname" required  lay-verify="required" autocomplete="off" class="layui-input">
         </div>
     </div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">上级编号</label>
-        <div class="layui-input-block">
-            <input type="text" th:value="${record.getAonumber()}" name="aonumber" required  lay-verify="required" autocomplete="off" class="layui-input">
-        </div>
-    </div>
     <div class="layui-form-item">
         <label class="layui-form-label">上级名称:</label>
         <div class="layui-input-block">