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

YL

2022-02-15 81c93ee7a4bc6735ad8f69ea0ee7244eaa58d73f

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

@@ -82,8 +82,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>
@@ -136,9 +136,8 @@
                                    <table class="" id="layTable1" lay-filter="layTable1"></table>
                                    <script type="text/html" id="toolbarDemo1">
                                        <div class="layui-btn-container">
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1" style="display:none;"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1" style="display:none;"><i class="layui-icon layui-icon-return"></i>退出</button>

                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload1"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit1"><i class="layui-icon layui-icon-return"></i>退出</button>
                                        </div>
                                    </script>
                                </div>
@@ -215,7 +214,6 @@
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;

                };
            });
            $('.layui-tab-title').on('click', function (title) {
@@ -295,7 +293,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillList',
                    type: "GET",
                    data: { "page": 1, "limit": 500, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
                    data: { "page": 1, "limit": 50, "HStartDate": HStartDate, "HEndDate": HEndDate, "HNumber": HNumber, "HBarCode": HBarCode, "HSupName": HSupName },
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
@@ -315,7 +313,7 @@
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
                    type: "GET",
                    data: { "page": 1, "limit": 500, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
                    data: { "page": 1, "limit": 50, "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 },
                    async: false,
                    dataType: "json",//数据类型可以为 text xml json  script  jsonp
                    success: function (data1) {
@@ -368,7 +366,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 ä¸ºè¿”回的数据
@@ -417,7 +415,7 @@
                    elem: '#layTable1',
                    url: GetWEBURL() + '/Sc_MESReportFrom/ReportMaterialReceiptBillSumList',
                    toolbar: '#toolbarDemo1', //开启头部工具栏，并为其绑定左侧模板
                    title: '器具即时库存汇总表',
                    //title: '器具即时库存汇总表',
                    cols: cols_arr1,    //填充表格头数据,
                    id: 'layTable1', //表格id
                    where: { "HStartDate": HStartDate1, "HEndDate": HEndDate1, "HNumber": HNumber1, "HSupName": HSupName1 }, //扩展参数,可以传数据到后台