Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.ss.mes.web

wwwroot/mes/rpt/rpt135/rpt.ashx

@@ -194,7 +194,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                   from tp_pm_productiondata p
                                                  inner join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = p.groutingdailydetailid
 								                                LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=p.GROUTINGLINEID
-                                                INNER JOIN TP_PM_DEFECT dfc on dfc.productiondataid=p.productiondataid
+                                                 INNER JOIN TP_PM_DEFECT dfc on dfc.productiondataid=p.productiondataid
 								                                INNER JOIN tp_mst_goods g ON p.goodsid = g.goodsid
 								                                LEFT JOIN TP_MST_GOODSTYPE GT ON g.GOODSTYPEID=GT.GOODSTYPEID
 		                                 where p.accountid = @accountid@

wwwroot/mes/rpt/rpt341/rpt_index.html

@@ -162,15 +162,12 @@
             var index = $('#tableTabs').tabs('getTabIndex', $('#tableTabs').tabs('getSelected'));
 
             //加载表头
-            var fields1 = $('#DataGrid' + index).datagrid('getColumnFields');
-            var fields2 = $('#DataGrid' + index).datagrid('getColumnFields', true);
-            var fields = fields2.concat(fields1);
+            var fields = $('#DataGrid').datagrid('getColumnFields');
             var headers = [];
             for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
                 headers.push(fields[i]);
             }
-            $('#DataGrid' + index).datagridExport({
+            $('#DataGrid').datagridExport({
                 headers: headers,
                 fileName: '导出数据(月度成品入库数据统计表).xls',
                 workSheet: '导出数据(月度成品入库数据统计表)'