'commit'

2 years ago · 6adf1fb0cd
parent 2dc9a88e0d
commit 6adf1fb0cd
5 changed files with 4 additions and 4 deletions
--- a/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf
+++ b/WebRoot/Excel/06856ad1-50e0-4078-af05-b9ac27f27f4f.pdf
--- a/WebRoot/Excel/2a6751fe-496b-4774-9025-a4a7f7977bd7.xlsx
+++ b/WebRoot/Excel/2a6751fe-496b-4774-9025-a4a7f7977bd7.xlsx
--- a/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf
+++ b/WebRoot/Excel/b712e11b-8449-4d2c-a4c2-c624b5a4810e.pdf
--- a/WebRoot/view/tb/org/publish.html
+++ b/WebRoot/view/tb/org/publish.html
@ -53,7 +53,7 @@
                                    <div class="layui-btn-container tag" lay-filter="orgs" lay-allowclose="true"
                                        style="border-style:dashed;border-width:1px;border-color: #CCCCCC;height: 100px;width: 630px;padding: 10px;overflow: auto;">
                                    </div>
-                                    <div style="width: 650px;">
+                                    <div id="tableDiv" style="width: 650px;">

                                        <table id="data-table"></table>
                                        <script type="text/html" id="table-toolbar">
@ -131,7 +131,7 @@
                    org_type_id: "-1",
                    org_name: $("#org_name").val()
                },
-                height: '375',
+                height: '#tableDiv',
                page: {
                    limit: 5
                    , layout: ['count', 'prev', 'page', 'next', 'skip']
@ -222,7 +222,7 @@
                        org_type_id: $("#orgTypeId").val(),
                        org_name: $("#org_name").val()
                    },
-                    scrollPos: true
+                    scrollPos: false
                });
            }

--- a/WebRoot/view/tb/org/task_view.html
+++ b/WebRoot/view/tb/org/task_view.html
@ -104,7 +104,7 @@
                        is_finish: $("#status").val(),
                        keyword: $("#org_name").val()
                    },
-                    height: 'full-130',
+                    height: 'full-150',
                    page: {
                        limit: 15
                        , layout: ['count', 'prev', 'page', 'next', 'skip']