diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 0ff623ba..abc0a682 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r import { of } from 'rxjs'; import { ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; +import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component'; @Component({ selector: 'app-supply-management-bulk', @@ -511,6 +512,12 @@ export class OrderManagementBulkComponent implements OnInit { item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', acl: { ability: ['ORDER-BULK-signBulkOrder'] }, }, + { + text: '申请退款 ', + click: (_record) => this.applyRefund(_record), + iif: item => item.isApplyForRefund, + acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }, + }, { text: '修改订单 ', click: _record => this.changeOrder(_record), @@ -762,5 +769,22 @@ export class OrderManagementBulkComponent implements OnInit { // 修改订单 changeOrder(value: any) { this.router.navigate(['order-management/bulk-detailChange', value.id]); + } + /** + *申请退款 + */ + applyRefund(item: any) { + const modalRef = this.modal.create({ + nzTitle: '申请退款', + nzContent: OneCarOrderCancelConfirmComponent, + nzComponentParams: { + i: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(() => { + this.resetSF; + this.st.load(); + }); } } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 01c0b723..f2401ae1 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -843,11 +843,11 @@ resourceStatus: any; this.router.navigate(['order-management/vehicle-detailChange', value.id]); } /** - *取消待确认 + *申请退款 */ applyRefund(item: any) { const modalRef = this.modal.create({ - nzTitle: '取消待确认', + nzTitle: '申请退款', nzContent: OneCarOrderCancelConfirmComponent, nzComponentParams: { i: item diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html index e2f03c4f..e8e7f5c8 100644 --- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html +++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @LastEditors : Shiming - * @LastEditTime : 2022-02-22 15:03:49 + * @LastEditTime : 2022-02-22 15:11:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -20,7 +20,7 @@

-