Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-09-24 ecb191aadfef8c12781a9b4615db9b26288247ff

 WebTM/views/基础资料/公用基础资料/Gy_Material.html

@@ -172,11 +172,11 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
                            <div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 75%">
                            <div >
                                <table class="" id="mainTable" lay-filter="mainTable" ></table>
                            </div>
                            <div id="page"></div>
                            <div id="page" style="position:relative;bottom:0;"></div>
                        </div>
                    </div>
                </div>
@@ -457,7 +457,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-80'
                    , height: 'full-150'
                    , page: false
                    , limit: 50 
                    , done: function (res, curr, count) {