Merge branch 'master' of http://git.dongkesoft.cn:8000/MES/HEGII.ss.mes.web

wwwroot/mes/pc/materielquery/rpt_index.html

@@ -248,13 +248,14 @@
                 //scrollbarSize: 0
             });
             //物料信息表
-            $('#DataGridMateriel').datagridLoad({
+            $('#DataGridMateriel').datagrid({
                 title: '',
                 idField: 'SID',
                 queryParams: $('#ffMaster').serializeJson(),
                 url: 'rpt.ashx?m=materiel&id=' + request('id') + '&barcodeDB=' + barcode,
                 fixWidth: 160,
                 mergeWidth: 100,
+				Pagination: false,
                 splitChar: '_',
                 columnMenu: '#btnColumnMenu',
                 columnMoving: true
@@ -286,13 +287,14 @@
                     }
                     if (index == 2 && (IDNRKONLYCODE.length > 0)) {
                         //物料信息表
-                        $('#DataGridMateriel').datagridLoad({
+                        $('#DataGridMateriel').datagrid({
                             title: '',
                             idField: 'SID',
                             queryParams: $('#ffMaster').serializeJson(),
                             url: 'rpt.ashx?m=materiel&id=' + request('id'),
                             fixWidth: 160,
                             mergeWidth: 100,
+							Pagination: false,
                             splitChar: '_',
                             columnMenu: '#btnColumnMenu',
                             columnMoving: true
@@ -336,6 +338,7 @@
                             url: 'rpt.ashx?m=materiel&id=' + request('id'),
                             fixWidth: 160,
                             mergeWidth: 100,
+							pagination: false,
                             splitChar: '_',
                             columnMenu: '#btnColumnMenu',
                             columnMoving: true