diff --git a/src/main/resources/templates/pages/company/company-out.html b/src/main/resources/templates/pages/company/company-out.html index 007d3b33..00f023a1 100644 --- a/src/main/resources/templates/pages/company/company-out.html +++ b/src/main/resources/templates/pages/company/company-out.html @@ -57,7 +57,6 @@ @@ -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; } - }); - + }) }); diff --git a/src/main/resources/templates/pages/company/companyByParentId.html b/src/main/resources/templates/pages/company/companyByParentId.html index 4c0e7acd..11bed66f 100644 --- a/src/main/resources/templates/pages/company/companyByParentId.html +++ b/src/main/resources/templates/pages/company/companyByParentId.html @@ -55,8 +55,9 @@
@@ -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; + } }); }); diff --git a/src/main/resources/templates/pages/company/company_edit.html b/src/main/resources/templates/pages/company/company_edit.html index 3bb02123..0b47255d 100644 --- a/src/main/resources/templates/pages/company/company_edit.html +++ b/src/main/resources/templates/pages/company/company_edit.html @@ -19,12 +19,6 @@ -
- -
- -
-
diff --git a/src/main/resources/templates/pages/post/post-out.html b/src/main/resources/templates/pages/post/post-out.html index 802d9005..e61a81db 100644 --- a/src/main/resources/templates/pages/post/post-out.html +++ b/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) { diff --git a/src/main/resources/templates/pages/post/post-view.html b/src/main/resources/templates/pages/post/post-view.html index 1efe373b..1adff896 100644 --- a/src/main/resources/templates/pages/post/post-view.html +++ b/src/main/resources/templates/pages/post/post-view.html @@ -19,36 +19,18 @@
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-