导出尾缀 生产日进度报表增加sheet 页面

wwwroot/mes/rpt/rpt101/rpt_index.html

@@ -109,26 +109,7 @@
 
         //导出
         function tbExport() {
-            //加载表头
-            var fields = $('#DataGridMaster').datagrid('getColumnFields');
-            var headers = [];
-            for (var i = 0; i < fields.length; i++) {
-                //headers.push($('#DataGridMaster').datagrid('getColumnOption', fields[i])['title']);
-                headers.push(fields[i]);
-            }
-
-            $('#DataGridMaster').datagridExport({
-                headers: headers,
-                fileName: '  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'(成型月度结算表).xls',
-                workSheet: '  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'(成型月度结算表)'
-            });
-
-            //导出多sheet
-            //$.dataGridToExcel(
-            //    ['DataGridMaster', 'DataGridDetail'],
-            //    ['page1', 'page2'],
-            //    "  导出数据' + $("#datebeginMaster").datetimebox("getValue") + '       ' + $("#dateendMaster").datetimebox("getValue")+'（产量产值报表).xls"
-            //);
+            $('#DataGridMaster').datagrid('toExcel', '(成型月度结算表-汇总)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") + '.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt102/rpt.ashx

@@ -20,13 +20,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
         using (IDataAccess conn = DataAccess.Create())
         {
-            //主表
-            if (context.Request["m"].ToString() == "master")
-            {
-                DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+                 DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
                 DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]);
                 string procedure = context.Request["procedureMaster"];
                 string sqlStr = "";
+            //主表
+            if (context.Request["m"].ToString() == "master")
+            {
                 if (procedure == "本烧")
                 {
                     sqlStr = @"SELECT
@@ -620,7 +620,103 @@ SELECT
 
                 }
 
-                //获取查询条件
+              
+            }
+
+               if (context.Request["m"].ToString() == "Detail1")
+            {
+              
+                if (procedure == "本烧")
+                {
+                    sqlStr = @" SELECT
+                                            P.GOODSCODE AS 产品编码,
+																						p.GOODSNAME AS 产品名称,
+                                            UNITPRICE AS 产品单价,
+                                            SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END)产品产量,
+                                             TO_CHAR(( NVL( SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END), 0 ) * UNITPRICE ))   AS 产值
+                                            FROM(
+                                            SELECT
+                                            pd.PROCEDUREID,
+                                            pd.GOODSLEVELTYPEID,
+                                            pd.GOODSCODE AS GOODSCODE,
+											pd.GOODSNAME,
+                                            gd.UNITPRICE,
+                                            pd.KILNID,
+                                            pd.KILNNAME,
+											PD.ISREFIRE
+                                            FROM 
+                                            TP_PM_PRODUCTIONDATA pd
+                                            LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+                                            WHERE pd.VALUEFLAG=1
+                                            AND pd.CREATETIME>= @DATETIME@
+                                            AND pd.CREATETIME<=  @dateEnd@
+                                            AND pd.PROCEDUREID =16
+																						   )P
+                                            GROUP BY  P.GOODSCODE,p.GOODSNAME,UNITPRICE  ";
+
+
+                }
+                else if (procedure == "回烧")
+                {
+                    sqlStr = @" SELECT
+                                            P.GOODSCODE AS 产品编码,
+																						p.GOODSNAME AS 产品名称,
+                                            UNITPRICE AS 产品单价,
+                                            SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END)产品产量,
+                                             TO_CHAR(( NVL( SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END), 0 ) * UNITPRICE ))   AS 产值
+                                            FROM(
+                                            SELECT
+                                            pd.PROCEDUREID,
+                                            pd.GOODSLEVELTYPEID,
+                                            pd.GOODSCODE AS GOODSCODE,
+																						pd.GOODSNAME,
+                                            gd.UNITPRICE,
+                                            pd.KILNID,
+                                            pd.KILNNAME,
+																						PD.ISREFIRE
+                                             FROM 
+                                        TP_PM_PRODUCTIONDATA pd
+                                        LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=24
+                                        WHERE pd.VALUEFLAG=1
+                                        AND pd.CREATETIME>= @DATETIME@
+                                         AND pd.CREATETIME<=  @dateEnd@
+                                        AND pd.PROCEDUREID = 28
+																						   )P
+                                            GROUP BY  P.GOODSCODE,p.GOODSNAME,UNITPRICE  ";
+                }
+                else if (procedure == "冷修") {
+                    sqlStr = @" SELECT
+                                            P.GOODSCODE AS 产品编码,
+																						p.GOODSNAME AS 产品名称,
+                                            UNITPRICE AS 产品单价,
+                                            SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END)产品产量,
+                                             TO_CHAR(( NVL( SUM(CASE WHEN PROCEDUREID=16  AND GOODSLEVELTYPEID in (4,5) AND ISREFIRE=0 THEN 1 ELSE 0 END), 0 ) * UNITPRICE ))   AS 产值
+                                            FROM(
+                                            SELECT
+                                            pd.PROCEDUREID,
+                                            pd.GOODSLEVELTYPEID,
+                                            pd.GOODSCODE AS GOODSCODE,
+																						pd.GOODSNAME,
+                                            gd.UNITPRICE,
+                                            pd.KILNID,
+                                            pd.KILNNAME,
+																						PD.ISREFIRE
+                                            FROM 
+                                        TP_PM_PRODUCTIONDATA pd
+                                        LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID=pd.GOODSID
+																				INNER  JOIN TP_PM_PRODUCTIONDATA PDL ON PDL.BARCODE=PD.BARCODE AND PDL.PROCEDUREID=42
+                                        WHERE pd.VALUEFLAG=1
+                                        AND pd.CREATETIME>= @DATETIME@
+                                         AND pd.CREATETIME<=  @dateEnd@
+                                        AND pd.PROCEDUREID = 28
+																						   )P
+                                            GROUP BY  P.GOODSCODE,p.GOODSNAME,UNITPRICE  ";
+
+                }
+            }
+
+                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 sqlPara.Add(new CDAParameter("DATETIME", dateBegin, DataType.DateTime));
                 sqlPara.Add(new CDAParameter("dateEnd", dateEnd, DataType.DateTime));
@@ -639,7 +735,8 @@ SELECT
 
                 string jsonStr = new JsonResult(dt) { total = total }.ToJson();
                 context.Response.Write(jsonStr);
-            }
+
+
         }
     }
 

wwwroot/mes/rpt/rpt102/rpt_index.html

@@ -10,13 +10,14 @@
     <link href="/plugins/xeasyui/toolbar.min.css" rel="stylesheet" />
 </head>
 <body class="easyui-layout">
-    <!--生产日进度报表-->
-    <!--中部主体-->
-    <div data-options="border:false,region:'center',title:'',iconCls:'icon-grid'">
-        <!--工具条-->
-        <div id="tb" class="i-toolbar">
+
+    <!--上部工具条-->
+    <div id="toolbarLayout" data-options="border:false,region:'north',title:'',iconCls:'icon-grid'">
+        <div class="i-toolbar">
             <a href="javascript:void(0)" id="btnSearch" title="搜索" class="easyui-linkbutton" iconcls="icon-search" plain="true" toggle="true" onclick="tbSearch()">搜索</a>
             <a href="javascript:void(0)" id="btnExport" title="导出" class="easyui-linkbutton" iconcls="icon-excel" plain="true" onclick="tbExport()">导出</a>
+            <!--<a href="javascript:void(0)" id="btnColumn" class="easyui-menubutton" data-options="menu:'#btnColumnMenu',iconCls:'icon-undo'">列显示</a>-->
+            <!--<div id="btnColumnMenu" style="width:150px;" ></div>-->
             <a href="javascript:void(0)" id="btnReload" title="刷新" class="easyui-linkbutton" iconcls="icon-reload" plain="true" onclick="tbReload()">刷新</a>
             <a href="javascript:void(0)" id="btnHelp" title="帮助" class="easyui-linkbutton" iconcls="icon-help" plain="true" onclick="tbHelp()">帮助</a>
             <div id="tbSearchDiv" style="display:block;padding:10px;">
@@ -39,15 +40,30 @@
                 </form>
             </div>
         </div>
-        <!--表格-->
-        <table class="easyui-datagrid"
-               id="DataGridMaster"
-               data-options="toolbar: '#tb',method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
-            <thead>
-            </thead>
-        </table>
     </div>
 
+    <!--中部-->
+    <div id="tableLayout" data-options="border:false,region:'center',split:true,title:'',iconCls:'icon-grid'" title="East" style="width:700px;">
+        <div id="tableTabs" class="easyui-tabs" data-options="border:false" style="width: 100%; height: 100%">
+            <div title="汇总表">
+                <table class="easyui-datagrid" id="DataGridMaster"
+                       data-options="toolbar: '#tb',method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
+                    <thead>
+                    </thead>
+                </table>
+            </div>
+            <div title="明细表">
+                <table class="easyui-datagrid"
+                       id="DataGridDetail1"
+                       data-options="method:'get',border:false,singleSelect:true,fit:true,fitColumns:true">
+                    <thead>
+                    </thead>
+                </table>
+            </div>
+        </div>
+    </div>
+
+
     <script type="text/javascript">
         function formatterUA(value, row, index) {
             return Math.round(value * 10000) / 100 + '%';
@@ -73,26 +89,52 @@
         //搜索提交
         function tbSearchSubmit() {
             if ($('#ffMaster').form("validate")) {
-                $('#DataGridMaster').datagridLoad({
-                    title: '',
-                    idField: 'SID',
-                    queryParams: $('#ffMaster').serializeJson(),
-                    url: 'rpt.ashx?m=master&id=' + request('id'),
-                    fixWidth: 160,
-                    mergeWidth: 100,
-                    splitChar: '_',
-                    columnMenu: '#btnColumnMenu',
-                    columnMoving: true,
-                    pagination: true,
-                    pagelist: [10000, 50, 100, 50, 1000, 5000],
-                    pageSize: 10000
-                })
+                var index = $('#tableTabs').tabs('getTabIndex', $('#tableTabs').tabs('getSelected'));
+                if (index == 0) {
+                    $('#DataGridMaster').datagridLoad({
+                        title: '',
+                        idField: 'SID',
+                        queryParams: $('#ffMaster').serializeJson(),
+                        url: 'rpt.ashx?m=master&id=' + request('id'),
+                        fixWidth: 160,
+                        mergeWidth: 100,
+                        splitChar: '_',
+                        columnMenu: '#btnColumnMenu',
+                        columnMoving: true,
+                        pagination: true,
+                        pagelist: [10000, 50, 100, 50, 1000, 5000],
+                        pageSize: 10000
+                    })
+                }
 
+                if (index == 1) {
+                    $('#DataGridDetail1').datagridLoad({
+                        title: '',
+                        idField: 'SID',
+                        queryParams: $('#ffMaster').serializeJson(),
+                        url: 'rpt.ashx?m=Detail1&id=' + request('id'),
+                        fixWidth: 160,
+                        mergeWidth: 100,
+                        splitChar: '_',
+                        columnMenu: '#btnColumnMenu',
+                        columnMoving: true,
+                        pagination: true,
+                        pagelist: [10000, 50, 100, 50, 1000, 5000],
+                        pageSize: 10000
+                    })
+                }
             };
         }
         //导出
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(生产日进度表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+
+            var index = $('#tableTabs').tabs('getTabIndex', $('#tableTabs').tabs('getSelected'));
+            if (index == 0) {
+                $('#DataGridMaster').datagrid('toExcel', '(生产日进度表-汇总)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            }
+            if (index == 1) {
+                $('#DataGridDetail1').datagrid('toExcel', '(生产日进度表-明细)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
+            }
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt201/rpt_index.html

@@ -156,7 +156,7 @@
         //导出
   
             function tbExport() {
-                $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(成型)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+                $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(成型))' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
             }
         
 

wwwroot/mes/rpt/rpt202/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(半检)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(半检)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt203/rpt.ashx

@@ -67,7 +67,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
                               		TO_CHAR(COUNT( DISTINCT  CASE WHEN df.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END ))缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN DF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+	                                TO_CHAR( (COUNT( DISTINCT  CASE WHEN df.DEFECTCODE IN ( '10', '12', '13', '14', '15', '16', '17', '18', '19', '20' ) THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                          TP_PM_PRODUCTIONDATA PD

wwwroot/mes/rpt/rpt203/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(打磨)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(打磨)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt204/rpt.ashx

@@ -68,7 +68,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
 									TO_CHAR(COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '25', '34') THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )) 缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN DF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+	                                TO_CHAR( (COUNT( DISTINCT  CASE WHEN  df.DEFECTCODE IN ( '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '25', '34') THEN to_char(DF.BARCODE||df.DEFECTCODE ) ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                         	TP_PM_PRODUCTIONDATA PD

wwwroot/mes/rpt/rpt204/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦洗)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(擦洗)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt205/rpt.ashx

@@ -63,7 +63,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
                                 TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL or  MDF.DEFECTCODE='20' THEN DF.BARCODE ELSE NULL END ))缺陷量,
-	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
+	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL or  MDF.DEFECTCODE='20' THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM
 	                            TP_PM_PRODUCTIONDATA PD

wwwroot/mes/rpt/rpt205/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(施釉)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(施釉)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt207/rpt.ashx

@@ -64,7 +64,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                                TO_CHAR(MD.DICTIONARYVALUE) AS 釉色,
 	                                TO_CHAR(LG.LOGONAME) AS 商标,
 	                                TO_CHAR(COUNT(DISTINCT PD.BARCODE)) 出窑量,
-                                TO_CHAR(COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END ))缺陷量,
+                                TO_CHAR(	  COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END ))缺陷量,
 	                                TO_CHAR( (COUNT( DISTINCT CASE WHEN MDF.DEFECTCODE IS NOT NULL AND DF.BARCODE IS NOT NULL  THEN DF.BARCODE ELSE NULL END )/COUNT(DISTINCT PD.BARCODE) * 100), 'fm99990.00') || '%' 缺陷率,
                                     {DEFECT}
                                 FROM

wwwroot/mes/rpt/rpt207/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(装窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(装窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt208/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(烧窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(烧窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt209/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(出窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(出窑)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({

wwwroot/mes/rpt/rpt210/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(原料)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析日报表(原料)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt211/rpt_index.html

@@ -135,7 +135,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(注浆工个人质量分析报表（成型车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(注浆工个人质量分析报表（成型车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt212/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(打磨工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(打磨工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt213/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(刷洗工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(刷洗工个人质量分析报表（精修车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt214/rpt_index.html

@@ -85,7 +85,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(半检工个人质量分析报表（半检车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(半检工个人质量分析报表（半检车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt215/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(施釉工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(施釉工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt216/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(擦坯工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(擦坯工个人质量分析报表（施釉车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt217/rpt_index.html

@@ -84,7 +84,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(装窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(装窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt218/rpt_index.html

@@ -86,7 +86,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(烧窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt219/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(出窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(出窑工个人质量分析报表（烧成车间）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt220/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧成车间烧窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(烧成车间烧窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt221/rpt_index.html

@@ -87,7 +87,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧成车间出窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(烧成车间出窑工质量分析报表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt223/rpt_index.html

@@ -98,7 +98,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(月份成型车间缺陷发生率).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(月份成型车间缺陷发生率).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt224/rpt_index.html

@@ -93,7 +93,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(月份烧成车间质量缺陷表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(月份烧成车间质量缺陷表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt225/rpt_index.html

@@ -90,7 +90,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(月份施釉车间缺陷分析表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(月份施釉车间缺陷分析表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt226/rpt_index.html

@@ -92,7 +92,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(个人质量分析日报表（回烧修补工）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(个人质量分析日报表（回烧修补工）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
         //搜索按钮

wwwroot/mes/rpt/rpt303/rpt_index.html

@@ -118,7 +118,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(产品统计表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(产品统计表).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt304/rpt_index.html

@@ -226,7 +226,7 @@
 
 		//导出
 		function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(卫生陶瓷欠点).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue") );
+            $('#DataGridMaster').datagrid('toExcel', '(卫生陶瓷欠点).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls' );
 		}
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt305/rpt_index.html

@@ -103,7 +103,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析汇总表（此表包括冷修、重烧质量分析表）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成品质量分析汇总表（此表包括冷修、重烧质量分析表）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
 		//搜索按钮

wwwroot/mes/rpt/rpt306/rpt_index.html

@@ -99,7 +99,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(成型注浆报表（结转时间为天）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(成型注浆报表（结转时间为天）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
 
 		//搜索按钮

wwwroot/mes/rpt/rpt307/rpt_index.html

@@ -101,7 +101,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(施釉精坯存量报表(结转周期天：精坯库出-釉坯库入)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(施釉精坯存量报表(结转周期天：精坯库出-釉坯库入)).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {

wwwroot/mes/rpt/rpt308/rpt_index.html

@@ -99,7 +99,7 @@
         //导出
 
         function tbExport() {
-            $('#DataGridMaster').datagrid('toExcel', '(烧成釉坯存量报表（结转周期天：釉坯库入）).xls' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue"));
+            $('#DataGridMaster').datagrid('toExcel', '(烧成釉坯存量报表（结转周期天：釉坯库入）)' + $("#datebeginMaster").datetimebox("getValue") + '_' + $("#dateendMaster").datetimebox("getValue")+'.xls');
         }
         //帮助事件
         function tbHelp() {