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

yangle

2023-07-24 7861d012b84104a33099fdd3b96560e1ccbffdf2

 WebTM/views/»ù´¡×ÊÁÏ/²úÆ·»ù´¡×ÊÁÏ/Gy_StdMinPickQty.html

@@ -740,9 +740,11 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , limit: 500
                    , height: 'full-250'
                    , cellMinWidth: 90
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                };
                //rowdata[0].开始日期 = Format(new Date(), "yyyy-MM-dd");
                //rowdata[0].结束日期 = "2100-01-01";
@@ -801,10 +803,10 @@
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , cellMinWidth: 90
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                            }
                            table.render(option);