From f5550c81bbde92b9e530b1d82204785020a16913 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 2 Jun 2022 10:50:59 +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 | 97 +++++++++++++++++-- .../oil-station-order.component.ts | 21 ++++ .../ty-order-list.component.html | 22 +++++ .../ty-order-list/ty-order-list.component.ts | 1 + src/environments/environment.ts | 8 +- 5 files changed, 139 insertions(+), 10 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 7686ff5..01f2c81 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 @@ -76,7 +76,7 @@ (nzPageSizeChange)="getRequest(false , searchForm.value)"> - 编号 + 编号 订单号 油站名称 类型 @@ -89,8 +89,8 @@ 支付金额 优惠金额 创建时间 - 状态 - 操作 + 状态 + 操作 @@ -110,9 +110,14 @@ {{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}} {{data.status | orderCouponStatus}} - 详情 - - 退款 + + 操作列表 + + + @@ -153,3 +158,83 @@ + + +
+
油站名称
+
{{printData['gasName']}}
+
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+
油站名称
+
{{printData['gasName']}}
+
+ 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 4c78b49..0ef5a56 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 @@ -36,6 +36,11 @@ export class OilStationOrderComponent implements OnInit { refundContent: string; roleType: number; secUser: object; + + + printModal = false; + printData = {}; + constructor( private form: FormBuilder, private order: OrderService, @@ -152,4 +157,20 @@ export class OilStationOrderComponent implements OnInit { } }); } + + /** + * 打开打印小票模态框 + */ + showPrintModal(data: object) { + this.printData = data; + this.printModal = true; + } + + /** + * 关闭打印小票模态框 + */ + closePrintModal() { + this.printData = {}; + this.printModal = false; + } } diff --git a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html index 2d2f6ca..5d7f04d 100644 --- a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html +++ b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html @@ -72,6 +72,19 @@ +
+ + 订单状态 + + + + + + + + + +
@@ -117,6 +130,8 @@ 团油枪价 创建时间 支付时间 + 订单状态 + 退款时间 操作 @@ -139,6 +154,13 @@ {{data.gasPriceGun}}元 {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} {{data.payTime | date : 'yyyy-MM-dd HH:mm:ss'}} + + 已完成 + 已退款 + 退款中 + 退款驳回 + + {{data.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}} 操作列表 diff --git a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts index 38cd5ec..cbc8d58 100644 --- a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts +++ b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts @@ -53,6 +53,7 @@ export class TyOrderListComponent implements OnInit { salesmanId: [null], memPhone: [null], payTimeArray: [null], + orderStatus: [null], }); this.requestData(1); diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8ebb4f1..c0bc8fa 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://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - imageUrl: 'https://hsg.dctpay.com/filesystem/',*/ +/* baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) + imageUrl: 'http://localhost:9302/filesystem/',*/ + baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + imageUrl: 'https://hsg.dctpay.com/filesystem/', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', };