From ce0cb0f91b7922ce33e6c2b9f7af8a08b39a7983 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 6 Jun 2022 11:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oil-station-order.component.html          |  3 +-
 .../oil-station-order.component.ts            | 65 +++++++++++--------
 src/app/services/order.service.ts             | 13 ++++
 src/environments/environment.ts               |  8 +--
 4 files changed, 56 insertions(+), 33 deletions(-)
diff --git a/src/app/admin/order/oil-station-order/oil-station-order.component.html b/src/app/admin/order/oil-station-order/oil-station-order.component.html
index b160fc1..4ab5db6 100644
--- a/src/app/admin/order/oil-station-order/oil-station-order.component.html
+++ b/src/app/admin/order/oil-station-order/oil-station-order.component.html
@@ -110,7 +110,8 @@
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td nzRight>{{data.status | orderCouponStatus}}</td>
             <td nzRight class="table-td-operation">
-                <a style="float: left;width: 100%;margin-bottom: 10px;" (click)="showPrintDiv(data)">打印小票</a>
+                <a style="float: left;width: 100%;margin-bottom: 10px;" *ngIf="data.printStatus == false" (click)="showPrintDiv(data.orderId, data)">打印小票</a>
+                <a style="float: left;width: 100%;margin-bottom: 10px;" *ngIf="data.printStatus == true" (click)="showPrintDiv(data.orderId, data)">已打印({{data.printNum+'次'}})</a>
                 <a nz-dropdown [nzDropdownMenu]="menu">操作列表<i nz-icon nzType="down"></i></a>
                 <nz-dropdown-menu #menu="nzDropdownMenu">
                     <ul nz-menu nzSelectable>
diff --git a/src/app/admin/order/oil-station-order/oil-station-order.component.ts b/src/app/admin/order/oil-station-order/oil-station-order.component.ts
index 8f56b9f..ce79676 100644
--- a/src/app/admin/order/oil-station-order/oil-station-order.component.ts
+++ b/src/app/admin/order/oil-station-order/oil-station-order.component.ts
@@ -56,6 +56,7 @@ export class OilStationOrderComponent implements OnInit {
         private router: Router,
         private company: CompanyService,
         private merchant: MerchantService,
+        private orderService: OrderService,
         private store: LocalStorageService, // 数据请求
         private common: CommonsService
     ) {
@@ -164,15 +165,21 @@ export class OilStationOrderComponent implements OnInit {
         });
     }
 
-    showPrintDiv(data: PrintData) {
+    showPrintDiv(orderId: number, data: PrintData) {
         data['createTime'] = new Date(data['createTime']).toLocaleString();
         this.printDiv(data);
+
+        this.orderService.print(orderId, dataBack => {
+            if (dataBack['return_code'] === '000000') {
+                this.getRequest(false, this.searchForm.value);
+            }
+        });
     }
 
     printDiv(data: object) {
         const headstr = '<html><head><title>打印小票</title></head><body>';
         const footstr = '</body>';
-        const newstr = '<div id="div_print">\n' +
+        const newstr = '<div id="div_print" style="font-size: 16px;">\n' +
             '    <div style="float: left;margin-bottom: 150px;">\n' +
             '        <div style="line-height: 30px; color:#000;">\n' +
             '            <span  style="font-size: 13px;float: left;width: 100%;">' + data['gasName'] + '</span>\n' +
@@ -180,33 +187,33 @@ export class OilStationOrderComponent implements OnInit {
             '        </div>\n' +
             '        <table style="width: 100%;">\n' +
             '            <tbody>\n' +
-            '            <tr><td style="font-size: smaller;color: black;">---------------------------------------------------</td></tr>\n' +
+            '            <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">流水号：<span>' + data['orderNo'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">流水号：<span>' + data['orderNo'] + '</span></td>\n' +
             '            </tr>\n' +
-            '            <tr><td style="font-size: smaller;color: black;">---------------------------------------------------</td></tr>\n' +
+            '            <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">时间：<span>' + data['createTime'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">时间：<span>' + data['createTime'] + '</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">来源：<span>嗨森逛</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">来源：<span>嗨森逛</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">油枪：<span>' + data['gasGunNo'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">油枪：<span>' + data['gasGunNo'] + '</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">油品：<span>' + data['gasOilNo'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">油品：<span>' + data['gasOilNo'] + '</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">升数：<span>' + data['gasOilLiters'] + '升</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">升数：<span>' + data['gasOilLiters'] + '升</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">实际加油升数以油站加油机为准！</td>\n' +
+            '                <td style="font-size: xx-small;color: black;">实际加油升数以油站加油机为准！</td>\n' +
             '            </tr>\n' +
             '            <tr><td style="float: left;margin-top: 10px;font-size: 30px;color: black">加油金额</td></tr>\n' +
             '            <tr><td style="font-size: 30px;color: black">￥' + data['totalPrice'] + '元</td></tr>\n' +
-            '            <tr><td style="font-size: smaller;color: black;">---------------------------------------------------</td></tr>\n' +
-            '            <tr><td style="float: left;color: black;margin-left: 35px;">开心又省钱； 来”嗨森逛“</td></tr>\n' +
+            '            <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
+            '            <tr><td style="float: left;font-size: xx-small;color: black;margin-left: 25px;">开心又省钱； 来”嗨森逛“</td></tr>\n' +
             '            </tbody>\n' +
             '        </table>\n' +
             '    </div>\n' +
@@ -217,43 +224,45 @@ export class OilStationOrderComponent implements OnInit {
             '        </div>\n' +
             '        <table style="width: 100%;">\n' +
             '            <tbody>\n' +
-            '            <tr><td style="font-size: smaller;color: black;">---------------------------------------------------</td></tr>\n' +
+            '            <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">流水号：<span>' + data['orderNo'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">流水号：<span>' + data['orderNo'] + '</span></td>\n' +
             '            </tr>\n' +
-            '            <tr><td style="font-size: smaller;color: black;">---------------------------------------------------</td></tr>\n' +
+            '            <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">时间：<span>' + data['createTime'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">时间：<span>' + data['createTime'] + '</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;"来源：<span>嗨森逛</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">来源：<span>嗨森逛</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">油枪：<span>' + data['gasGunNo'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">油枪：<span>' + data['gasGunNo'] + '</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">油品：<span>' + data['gasOilNo'] + '</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">油品：<span>' + data['gasOilNo'] + '</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">升数：<span>' + data['gasOilLiters'] + '升</span></td>\n' +
+            '                <td style="font-size: xx-small;color: black;">升数：<span>' + data['gasOilLiters'] + '升</span></td>\n' +
             '            </tr>\n' +
             '            <tr>\n' +
-            '                <td style="font-size: smaller;color: black;">实际加油升数以油站加油机为准！</td>\n' +
+            '                <td style="font-size: xx-small;color: black;">实际加油升数以油站加油机为准！</td>\n' +
             '            </tr>\n' +
             '            <tr><td style="float: left;margin-top: 10px;font-size: 30px;color: black">加油金额</td></tr>\n' +
             '            <tr><td style="font-size: 30px;color: black">￥' + data['totalPrice'] + '元</td></tr>\n' +
-            '            <tr><td style="font-size: smaller;color: black;">---------------------------------------------------</td></tr>\n' +
-            '            <tr><td style="float: left;color: black;margin-left: 35px;">开心又省钱； 来”嗨森逛“</td></tr>\n' +
+            '            <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
+            '            <tr><td style="float: left;font-size: xx-small;color: black;margin-left: 25px;">开心又省钱； 来”嗨森逛“</td></tr>\n' +
             '            </tbody>\n' +
             '        </table>\n' +
             '    </div>\n' +
             '</div>';
-        console.log(newstr);
         // const oldstr = document.body.innerHTML;
-        document.body.innerHTML = headstr + newstr + footstr;
-        window.print();
+        // document.body.innerHTML = headstr + newstr + footstr;
+        const newWindow = window.open('', '');
+        newWindow.document.write(headstr + newstr + footstr);
+        newWindow.print();
+        newWindow.close();
         // document.body.innerHTML = oldstr;
-        location.reload();
+        // location.reload();
         return false;
     }
 }
diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts
index fe68ecf..b6613fc 100644
--- a/src/app/services/order.service.ts
+++ b/src/app/services/order.service.ts
@@ -14,6 +14,19 @@ export class OrderService {
   ) {
   }
 
+  /**
+   * 打印
+   *
+   * @param  paramsObject   对象
+   * @param  callBack   回调
+   */
+  public print(orderId: number, callBack) {
+    this.http.get(environment.baseUrl + 'highOrder/print?orderId=' + orderId).subscribe(data => {
+      callBack(data);
+    });
+  }
+
+
   /**
    * 查询订单列表
    *
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index ca22a39..0f97376 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-/*  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'http://localhost:9302/filesystem/',*/
-  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'http://localhost:9302/filesystem/',
+/*  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',*/
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };

---------------------------------------------------
-------------------------------------------
流水号：' + data['orderNo'] + '	流水号：' + data['orderNo'] + '
---------------------------------------------------
-------------------------------------------
时间：' + data['createTime'] + '	时间：' + data['createTime'] + '
来源：嗨森逛	来源：嗨森逛
油枪：' + data['gasGunNo'] + '	油枪：' + data['gasGunNo'] + '
油品：' + data['gasOilNo'] + '	油品：' + data['gasOilNo'] + '
升数：' + data['gasOilLiters'] + '升	升数：' + data['gasOilLiters'] + '升
实际加油升数以油站加油机为准！	实际加油升数以油站加油机为准！
加油金额
￥' + data['totalPrice'] + '元
---------------------------------------------------
开心又省钱；来”嗨森逛“
-------------------------------------------
开心又省钱；来”嗨森逛“