Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/static/js/service.js

@@ -939,15 +939,28 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
+            // printReceitpData:function(data,success) {
+            //     var body = JSON.stringify(data);
+            //     $http({
+            //         method: 'POST',
+            //         url: "../exportExcel/printReceiptExcelData",
+            //         data: body,
+            //         headers: {'Content-Type': 'application/json'},
+            //         transformRequest: angular.identity,
+            //         responseType:'arraybuffer'
+            //     }).then(function successCallback(response) {
+            //         success(response.data)
+            //     })
+            // },
             printReceitpData:function(data,success) {
                 var body = JSON.stringify(data);
                 $http({
                     method: 'POST',
                     url: "../exportExcel/printReceiptExcelData",
                     data: body,
-                    headers: {'Content-Type': 'application/json'},
-                    transformRequest: angular.identity,
-                    responseType:'arraybuffer'
+                    headers: {'Content-Type': 'application/json'}
+                    // transformRequest: angular.identity,
+                    // responseType:'arraybuffer'
                 }).then(function successCallback(response) {
                     success(response.data)
                 })

src/main/resources/static/views/receitp/receitp.js

@@ -135,12 +135,13 @@ angular.module('AvatarCheck.receitp', ['ngRoute', 'AvatarCheck.http'])
             }
             console.log(json)
             HttpService.printReceitpData(json,function (data) {
-                var blob = new Blob([data], {type: "application/vnd.ms-excel"});
-                var a = document.createElement("a");
-                document.body.appendChild(a);
-                a.href = URL.createObjectURL(blob);
-                // a.download = fileName;
-                a.click();
+                console.log(data)
+                // var blob = new Blob([data], {type: "application/vnd.ms-excel"});
+                // var a = document.createElement("a");
+                // document.body.appendChild(a);
+                // a.href = URL.createObjectURL(blob);
+                // // a.download = fileName;
+                // a.click();
             })
         }