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

YL

2022-02-15 81c93ee7a4bc6735ad8f69ea0ee7244eaa58d73f

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/ReportInventoryAccount.html

@@ -68,8 +68,8 @@
                                    <table class="" id="layTable" lay-filter="layTable"></table>
                                    <script type="text/html" id="toolbarDemo">
                                        <div class="layui-btn-container">
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" style="display:none;"><i class="layui-icon layui-icon-return"></i>退出</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" ><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" ><i class="layui-icon layui-icon-return"></i>退出</button>

                                        </div>
                                    </script>
@@ -195,7 +195,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportInventoryAccountBillList',
                    type: "GET",
                    data: { "page": 1, "limit": 500, "HStartDate": HStartDate, "HEndDate": HEndDate, "HSupName": HSupName },
                    data: { "page": 1, "limit": 50, "HStartDate": HStartDate, "HEndDate": HEndDate, "HSupName": HSupName },
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
@@ -249,7 +249,7 @@
                    page: true,   //开启分页
                    totalRow: true, //开启合计
                    limit: 50,     //一页能够显示的最大数目
                    limits: [50, 100, 300, 500, 1000, 5000], //控制多少行一页（默认五条一页）
                    limits: [50, 500, 5000, 20000], //控制多少行一页（默认五条一页）
                    method: 'get',  //提交方式
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    parseData: function (res) {  //res ä¸ºè¿”回的数据