diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.html b/src/app/pages/trade/order-oil-list/order-oil-list.component.html index 12cf88b..012adcd 100644 --- a/src/app/pages/trade/order-oil-list/order-oil-list.component.html +++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.html @@ -245,7 +245,7 @@ diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts index fc06a8d..5ba8f0f 100644 --- a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts +++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts @@ -166,6 +166,10 @@ export class OrderOilListComponent { this.refundForm = this.fb.group({ orderNo: [{ value: null, disabled: true}, [Validators.required]], childOrderNo: [{ value: null, disabled: true}, [Validators.required]], + merName: [{ value: null}], + userPhone: [{ value: null}], + gasRefuelPrice: [{ value: null}], + payTime: [{ value: null}], remarks: [null,[Validators.required]], }); @@ -348,8 +352,8 @@ export class OrderOilListComponent { * @param orderNo * @param childOrderNo */ - showRefund(orderNo: string, childOrderNo: string) { - this.refundForm.patchValue({ orderNo: orderNo, childOrderNo: childOrderNo}) + showRefund(data: any) { + this.refundForm.patchValue(data) this.orderRefundModal = true; } @@ -378,7 +382,12 @@ export class OrderOilListComponent { } this.modal.confirm({ nzTitle: '提示', - nzContent: '确定对交易订号('+this.refundForm.controls['orderNo'].value+')进行退款吗?', + nzContent: '交易单号:'+this.refundForm.controls['orderNo'].value+'
'+ + '加油油站:'+this.refundForm.controls['merName'].value+'
'+ + '加油客户:'+(this.refundForm.controls['userPhone'].value!=null?this.refundForm.controls['userPhone'].value:'无')+'
'+ + '加油金额:¥'+this.refundForm.controls['gasRefuelPrice'].value+'
'+ + '支付时间:'+ new Date(this.refundForm.controls['payTime'].value).toLocaleString()+'
'+ + '确定退款吗?', nzOnOk: () => this.submitRefund() }); }