diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index cdd9fee..e5f0fc1 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -886,7 +886,8 @@ namespace AMESCoreStudio.Web.Controllers
                         FirstCnt = int.Parse(joPass["firstCnt"].ToString()),
                         PassCnt = int.Parse(jo["passCnt"].ToString()),
                         FailCnt = int.Parse(jo["passCnt"].ToString()) - int.Parse(joPass["firstCnt"].ToString()),
-                        Yield = int.Parse(joPass["firstCnt"].ToString()) * 1.0 / int.Parse(jo["passCnt"].ToString()) * 100.0
+                        Yield = double.Parse((int.Parse(joPass["firstCnt"].ToString()) * 1.0 / int.Parse(jo["passCnt"].ToString()) * 100.0).ToString("0.00"))
+
                     });
                 }
             }
diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
index aa12923..765ee91 100644
--- a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
+++ b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
@@ -132,6 +132,7 @@
         <table class="layui-hide" id="query" lay-filter="query"></table>
         <div class="layui-inline">
             <button type="button" id="btnChart1" class="layui-btn layui-btn-normal layui-btn-sm"><i class="layui-icon">&#xe68a;</i>良率統計圖表</button>
+            <button type="button" id="btnExport" class="layui-btn layui-btn-normal layui-btn-sm"><i class="fa fa-file-excel-o"></i>導出全部數據</button>
         </div>
     </div>
 </div>
@@ -213,6 +214,48 @@
                 });
         };
 
+        layui.use(['jquery', 'excel', 'layer'], function () {
+            var $ = layui.jquery;
+            var layer = layui.layer;
+            var excel = layui.excel;
+
+            $('#btnExport').on('click', function () {
+
+                $.ajax({
+                    url: '@Url.Action("QRS010Query", "QRS")',
+                    dataType: 'json',
+                    success(res) {
+                        var data = res.data;
+                        data = excel.filterExportData(data, [
+                            'wipNO',
+                            'itemNO',
+                            'planQty',
+                            'modelNO',
+                            'lineDesc',
+                            'stationDesc',
+                            'firstCnt',
+                            'passCnt',
+                            'yield'
+                        ]);
+
+                        data.unshift({
+                            wipNO: "工單號碼", itemNO: "料號", planQty: "計畫數量", modelNO: "機種", lineDesc: "線別", stationDesc: "站別", firstCnt: "首次過站數量", passCnt: "總共過站數量", yield: "良率"
+                        });
+
+                        var timestart = Date.now();
+                        excel.downloadExcel(data, '良率數據' + formatJSONDate(Date.now().toString()), 'xlsx');
+                        var timeend = Date.now();
+
+                        var spent = (timeend - timestart) / 1000;
+                        layer.alert('導出全部數據耗時 ' + spent + ' s');
+                    }
+                    , error() {
+                        layer.alert('導出全部數據失敗');
+                    }
+                });
+            });
+        });
+
         layui.use(['form', 'layer', 'laydate'], function () {
             form = layui.form;
             laydate = layui.laydate;