fix bug
This commit is contained in:
@ -10,6 +10,7 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r
|
|||||||
import { of } from 'rxjs';
|
import { of } from 'rxjs';
|
||||||
import { ShipperBaseService } from '@shared';
|
import { ShipperBaseService } from '@shared';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-supply-management-bulk',
|
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',
|
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
|
||||||
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
|
acl: { ability: ['ORDER-BULK-signBulkOrder'] },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
text: '申请退款 ',
|
||||||
|
click: (_record) => this.applyRefund(_record),
|
||||||
|
iif: item => item.isApplyForRefund,
|
||||||
|
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
text: '修改订单 ',
|
text: '修改订单 ',
|
||||||
click: _record => this.changeOrder(_record),
|
click: _record => this.changeOrder(_record),
|
||||||
@ -762,5 +769,22 @@ export class OrderManagementBulkComponent implements OnInit {
|
|||||||
// 修改订单
|
// 修改订单
|
||||||
changeOrder(value: any) {
|
changeOrder(value: any) {
|
||||||
this.router.navigate(['order-management/bulk-detailChange', value.id]);
|
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();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -843,11 +843,11 @@ resourceStatus: any;
|
|||||||
this.router.navigate(['order-management/vehicle-detailChange', value.id]);
|
this.router.navigate(['order-management/vehicle-detailChange', value.id]);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
*取消待确认
|
*申请退款
|
||||||
*/
|
*/
|
||||||
applyRefund(item: any) {
|
applyRefund(item: any) {
|
||||||
const modalRef = this.modal.create({
|
const modalRef = this.modal.create({
|
||||||
nzTitle: '取消待确认',
|
nzTitle: '申请退款',
|
||||||
nzContent: OneCarOrderCancelConfirmComponent,
|
nzContent: OneCarOrderCancelConfirmComponent,
|
||||||
nzComponentParams: {
|
nzComponentParams: {
|
||||||
i: item
|
i: item
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2022-02-22 13:53:29
|
* @Date : 2022-02-22 13:53:29
|
||||||
* @LastEditors : Shiming
|
* @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
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
-->
|
-->
|
||||||
@ -20,7 +20,7 @@
|
|||||||
</sv>
|
</sv>
|
||||||
<sv label="退款金额">
|
<sv label="退款金额">
|
||||||
<p *ngFor="let data of i?.mybidDetailInfo; let index = index">
|
<p *ngFor="let data of i?.mybidDetailInfo; let index = index">
|
||||||
<label *ngIf="data?.paymentStatus == 3">
|
<label *ngIf="data?.paymentStatusLabel == '已支付'">
|
||||||
<span>{{data?.expenseName}}</span>
|
<span>{{data?.expenseName}}</span>
|
||||||
<span>{{ data.price | number: '0.2-2' }}</span>
|
<span>{{ data.price | number: '0.2-2' }}</span>
|
||||||
</label>
|
</label>
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
* @Author : Shiming
|
* @Author : Shiming
|
||||||
* @Date : 2022-02-22 13:53:29
|
* @Date : 2022-02-22 13:53:29
|
||||||
* @LastEditors : Shiming
|
* @LastEditors : Shiming
|
||||||
* @LastEditTime : 2022-02-22 15:04:58
|
* @LastEditTime : 2022-02-22 15:09:46
|
||||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.ts
|
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.ts
|
||||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||||
*/
|
*/
|
||||||
@ -75,12 +75,12 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
|
|||||||
let indexId = 0
|
let indexId = 0
|
||||||
let index = 0
|
let index = 0
|
||||||
this.i?.mybidDetailInfo.forEach((ele: any) => {
|
this.i?.mybidDetailInfo.forEach((ele: any) => {
|
||||||
if (ele?.paymentStatus == 3) {
|
if (ele?.paymentStatusLabel == '已支付') {
|
||||||
indexId += 1;
|
indexId += 1;
|
||||||
index += ele?.price;
|
index += ele?.price;
|
||||||
}
|
}
|
||||||
if (ele.expenseCode === '"ATT"'){
|
if (ele.expenseCode === '"ATT"'){
|
||||||
if(ele?.paymentStatus == 3) {
|
if(ele?.paymentStatusLabel == '已支付') {
|
||||||
this.ATTPrice = ele.price;
|
this.ATTPrice = ele.price;
|
||||||
} else {
|
} else {
|
||||||
this.ATTPrice = 0;
|
this.ATTPrice = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user