hurui
/
high-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
pull/1/head
胡锐 2 years ago
parent 6894a752c1
commit 07e9972b77
2 changed files with 10 additions and 42 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 44
      src/app/admin/order/oil-station-order/oil-station-order.component.ts
  2. 8
      src/environments/environment.ts

44
src/app/admin/order/oil-station-order/oil-station-order.component.ts
Unescape View File

@ -227,7 +227,7 @@ export class OilStationOrderComponent implements OnInit {
showPrintDiv() { showPrintDiv() {
const orderId = this.printDataObject.orderId; const orderId = this.printDataObject.orderId;
const data = this.printDataObject.printData; const data = this.printDataObject.printData;
data['createTime'] = new Date(data['createTime']).toLocaleString(); data['payTime'] = new Date(data['payTime']).toLocaleString();
this.printDiv(data); this.printDiv(data);
this.orderService.print(orderId, 1, dataBack => { this.orderService.print(orderId, 1, dataBack => {
@ -241,10 +241,10 @@ export class OilStationOrderComponent implements OnInit {
const headstr = '<html><head><title>打印小票</title></head><body>'; const headstr = '<html><head><title>打印小票</title></head><body>';
const footstr = '</body>'; const footstr = '</body>';
const newstr = '<div id="div_print" style="font-size: 16px;">\n' + const newstr = '<div id="div_print" style="font-size: 16px;">\n' +
' <div style="float: left;margin-bottom: 150px;">\n' + ' <div style="float: left;margin-bottom: 50px;">\n' +
' <div style="line-height: 30px; color:#000;">\n' + ' <div style="line-height: 30px; color:#000;">\n' +
' <span style="font-size: 13px;float: left;width: 100%;">' + data['gasName'] + '</span>\n' + ' <span style="font-size: 13px;float: left;width: 100%;">' + data['gasName'] + '</span>\n' +
' <span style="font-size: 13px;float: left;width: 100%;margin-left: 60px;">（客户存根）</span>\n' + ' <span style="font-size: 13px;float: left;width: 100%;margin-left: 60px;">（收银员存根）</span>\n' +
' </div>\n' + ' </div>\n' +
' <table style="width: 100%;">\n' + ' <table style="width: 100%;">\n' +
' <tbody>\n' + ' <tbody>\n' +
@ -254,45 +254,13 @@ export class OilStationOrderComponent implements OnInit {
' </tr>\n' + ' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' + ' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr>\n' + ' <tr>\n' +
' <td style="font-size: xx-small;color: black;">时间：<span>' + data['createTime'] + '</span></td>\n' + ' <td style="font-size: xx-small;color: black;">打印时间：<span>' + new Date().toLocaleString() + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">来源：<span>嗨森逛</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">油枪：<span>' + data['gasGunNo'] + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">油品：<span>' + data['gasOilNo'] + '</span></td>\n' +
' </tr>\n' + ' </tr>\n' +
' <tr>\n' + ' <tr>\n' +
' <td style="font-size: xx-small;color: black;">升数：<span>' + data['gasOilLiters'] + '升</span></td>\n' + ' <td style="font-size: xx-small;color: black;">支付时间：<span>' + data['payTime'] + '</span></td>\n' +
' </tr>\n' + ' </tr>\n' +
' <tr>\n' + ' <tr>\n' +
' <td style="font-size: xx-small;color: black;">实际加油升数以油站加油机为准！</td>\n' + ' <td style="font-size: xx-small;color: black;">电话：<span>' + data['merPhone'] + '</span></td>\n' +
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></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: 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 style="float: left;margin-bottom: 50px;">\n' +
' <div style="line-height: 30px; color:#000;">\n' +
' <span style="font-size: 13px;float: left;width: 100%;">' + data['gasName'] + '</span>\n' +
' <span style="font-size: 13px;float: left;width: 100%;margin-left: 60px;">（收银员存根）</span>\n' +
' </div>\n' +
' <table style="width: 100%;">\n' +
' <tbody>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">流水号：<span>' + data['orderNo'] + '</span></td>\n' +
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">时间：<span>' + data['createTime'] + '</span></td>\n' +
' </tr>\n' + ' </tr>\n' +
' <tr>\n' + ' <tr>\n' +
' <td style="font-size: xx-small;color: black;">来源：<span>嗨森逛</span></td>\n' + ' <td style="font-size: xx-small;color: black;">来源：<span>嗨森逛</span></td>\n' +

8
src/environments/environment.ts
Unescape View File

@ -4,10 +4,10 @@
export const environment = { export const environment = {
production: false, production: false,
/* baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'http://localhost:9302/filesystem/',*/ imageUrl: 'http://localhost:9302/filesystem/',
baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) /* baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
imageUrl: 'https://hsgcs.dctpay.com/filesystem/', imageUrl: 'https://hsgcs.dctpay.com/filesystem/',*/
key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
}; };

Write Preview
Loading…
Cancel
Save