提交代码

master
胡锐 4 months ago
parent 470586b5f5
commit 94c249c062
  1. 2
      src/app/pages/trade/order-oil-list/order-oil-list.component.html
  2. 2
      src/app/pages/trade/order-oil-list/order-oil-list.component.ts
  3. 1
      src/app/pipes/common/date-minutes-diff.pipe.ts

@ -228,7 +228,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 && 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 && 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.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>
</nz-dropdown-menu> </nz-dropdown-menu>

@ -146,7 +146,6 @@ export class OrderOilListComponent {
refundForm: FormGroup; refundForm: FormGroup;
GAS_REFUND_BTN = new ButtonPipe().isButton("GAS_REFUND"); GAS_REFUND_BTN = new ButtonPipe().isButton("GAS_REFUND");
GAS_ORDER_PRINT_BTN = new ButtonPipe().isButton("GAS_ORDER_PRINT_BTN"); GAS_ORDER_PRINT_BTN = new ButtonPipe().isButton("GAS_ORDER_PRINT_BTN");
constructor(private fb: NonNullableFormBuilder, constructor(private fb: NonNullableFormBuilder,
private orderOilService : OrderOilService, private orderOilService : OrderOilService,
private agentService : AgentService, private agentService : AgentService,
@ -156,6 +155,7 @@ export class OrderOilListComponent {
private message: NzMessageService, private message: NzMessageService,
private modal: NzModalService) { private modal: NzModalService) {
this.accountType = this.storage.get(DATA)['account']['objectType']; this.accountType = this.storage.get(DATA)['account']['objectType'];
console.log(this.GAS_REFUND_BTN);
// 退款提示模态框 // 退款提示模态框
this.refundForm = this.fb.group({ this.refundForm = this.fb.group({

@ -11,6 +11,7 @@ export class DateMinutesDiffPipe implements PipeTransform {
transform(newTime: number | Date, olbTime: number | Date): number { transform(newTime: number | Date, olbTime: number | Date): number {
console.log('123');
var diffTimeStamp = new Date().getTime() - new Date(olbTime).getTime(); var diffTimeStamp = new Date().getTime() - new Date(olbTime).getTime();
return parseInt(String(diffTimeStamp / (1000 * 60))); return parseInt(String(diffTimeStamp / (1000 * 60)));
} }

Loading…
Cancel
Save