提交代码

dev
胡锐 2 weeks ago
parent 4765f162a6
commit 098e0ff07e
  1. 2
      src/app/pages/trade/order-oil-list/order-oil-list.component.html
  2. 15
      src/app/pages/trade/order-oil-list/order-oil-list.component.ts

@ -245,7 +245,7 @@
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li nz-menu-item (click)="showOrderDetail(data.orderNo)">交易详情</li> <li nz-menu-item (click)="showOrderDetail(data.orderNo)">交易详情</li>
<li *ngIf="data.status == 2 && data.createType == 1 && GAS_REFUND_BTN && (accountType == 2 || accountType == 3?(data.payTime | dateMinutesDiff: data.payTime) <=30:true)" (click)="showRefund(data.orderNo, data.orderChildNo)" nz-menu-item>交易退款</li> <li *ngIf="data.status == 2 && data.createType == 1 && GAS_REFUND_BTN && (accountType == 2 || accountType == 3?(data.payTime | dateMinutesDiff: data.payTime) <=30:true)" (click)="showRefund(data)" nz-menu-item>交易退款</li>
<li *ngIf="data.status == 2 && data.channelType != 1 && data.abnormal == true && GAS_ORDER_REPAIR_BTN" (click)="showRepairOrder(data.orderNo)" nz-menu-item>交易补单</li> <li *ngIf="data.status == 2 && data.channelType != 1 && data.abnormal == true && GAS_ORDER_REPAIR_BTN" (click)="showRepairOrder(data.orderNo)" nz-menu-item>交易补单</li>
<li *ngIf="data.channelType == 1 && data.status == 2 && GAS_ORDER_PRINT_BTN" (click)="showOrderPrint(data.orderNo);" nz-menu-item>打印小票</li> <li *ngIf="data.channelType == 1 && data.status == 2 && GAS_ORDER_PRINT_BTN" (click)="showOrderPrint(data.orderNo);" nz-menu-item>打印小票</li>
</ul> </ul>

@ -166,6 +166,10 @@ export class OrderOilListComponent {
this.refundForm = this.fb.group({ this.refundForm = this.fb.group({
orderNo: [{ value: null, disabled: true}, [Validators.required]], orderNo: [{ value: null, disabled: true}, [Validators.required]],
childOrderNo: [{ 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]], remarks: [null,[Validators.required]],
}); });
@ -348,8 +352,8 @@ export class OrderOilListComponent {
* @param orderNo * @param orderNo
* @param childOrderNo * @param childOrderNo
*/ */
showRefund(orderNo: string, childOrderNo: string) { showRefund(data: any) {
this.refundForm.patchValue({ orderNo: orderNo, childOrderNo: childOrderNo}) this.refundForm.patchValue(data)
this.orderRefundModal = true; this.orderRefundModal = true;
} }
@ -378,7 +382,12 @@ export class OrderOilListComponent {
} }
this.modal.confirm({ this.modal.confirm({
nzTitle: '提示', nzTitle: '提示',
nzContent: '确定对交易订号('+this.refundForm.controls['orderNo'].value+')进行退款吗?', nzContent: '交易单号:'+this.refundForm.controls['orderNo'].value+'<br/>'+
'加油油站:'+this.refundForm.controls['merName'].value+'<br/>'+
'加油客户:'+(this.refundForm.controls['userPhone'].value!=null?this.refundForm.controls['userPhone'].value:'无')+'<br/>'+
'加油金额:¥'+this.refundForm.controls['gasRefuelPrice'].value+'<br/>'+
'支付时间:'+ new Date(this.refundForm.controls['payTime'].value).toLocaleString()+'<br/>'+
'确定退款吗?',
nzOnOk: () => this.submitRefund() nzOnOk: () => this.submitRefund()
}); });
} }

Loading…
Cancel
Save