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

yangle

2023-07-24 7861d012b84104a33099fdd3b96560e1ccbffdf2

 WebTM/views/基础资料/工资基础资料/Gy_Group.html

@@ -233,8 +233,9 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
                    , limits: [50, 500, 5000, 20000]
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
@@ -320,10 +321,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);