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 abc0a682..734c6771 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -691,9 +691,11 @@ export class OrderManagementBulkComponent implements OnInit { nzComponentParams: { data: { ...data, billId: item.id } }, nzFooter: null }); - modal.afterClose.subscribe(_ => { + modal.afterClose.subscribe((res: any) => { + if(res) { this.st.reload(1); this.getGoodsSourceStatistical(); + } }); } }); @@ -778,13 +780,16 @@ export class OrderManagementBulkComponent implements OnInit { nzTitle: '申请退款', nzContent: OneCarOrderCancelConfirmComponent, nzComponentParams: { - i: item + i: item, + sts: 1 }, nzFooter: null }); - modalRef.afterClose.subscribe(() => { - this.resetSF; - this.st.load(); + modalRef.afterClose.subscribe((res: boolean) => { + if(res) { + 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 f2401ae1..09e49f8c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -656,20 +656,12 @@ resourceStatus: any; nzContent: VehicleUpdateFreightComponent, nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } }, nzFooter: null, - // nzOnOk: sin => { - // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { - // if (res) { - // this.service.msgSrv.success('变更运费成功'); - // modal.destroy(); - // this.st.reload(); - // } - // }); - // return false; - // } }); - modal.afterClose.subscribe(_ => { - this.st.load(); - this.getGoodsSourceStatistical() + modal.afterClose.subscribe((res: Boolean) => { + if(res) { + this.st.load(); + this.getGoodsSourceStatistical() + } }); } }); @@ -850,13 +842,16 @@ resourceStatus: any; nzTitle: '申请退款', nzContent: OneCarOrderCancelConfirmComponent, nzComponentParams: { - i: item + i: item, + sts: 2 }, nzFooter: null }); - modalRef.afterClose.subscribe(() => { - this.resetSF; - this.st.load(); + modalRef.afterClose.subscribe((res: boolean) => { + if(res) { + this.resetSF; + this.st.load(); + } }); } } diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index af73040f..281184cf 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 14:03:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 17:04:28 + * @LastEditTime : 2022-02-22 15:44:05 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -213,6 +213,6 @@ export class UpdateFreightComponent implements OnInit { } close(): void { - this.modal.destroy(); + this.modal.destroy(false); } } 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 e8e7f5c8..681de039 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 @@ -31,6 +31,6 @@ diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts index d64e8e97..56e734b3 100644 --- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts +++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-22 13:53:29 * @LastEditors : Shiming - * @LastEditTime : 2022-02-22 15:15:24 + * @LastEditTime : 2022-02-22 15:51:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -29,10 +29,11 @@ import { OrderManagementService } from '../../../services/order-management.servi templateUrl: './cancel-confirm.component.html' }) export class OneCarOrderCancelConfirmComponent implements OnInit { - i: any; - index: any; - ATTPrice: any; - List: any; + i: any; // 单行数据 + sts: any; // 区分大宗、整车 + index: any; // 项目数 + ATTPrice: any; // 附加费 + List: any; // 运费 @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; @@ -75,14 +76,23 @@ export class OneCarOrderCancelConfirmComponent implements OnInit { let indexId = 0 let index = 0 this.i?.mybidDetailInfo.forEach((ele: any) => { - if (ele?.paymentStatusLabel == '已支付') { - indexId += 1; - index += ele?.price; + if(this.sts == 1) { + // 大宗 + if (ele?.paymentStatusLabel == '已支付' && ele.expenseCode == "TRA") { + index += ele?.price; + } + if (ele?.paymentStatusLabel == '已支付') { + indexId += 1; + } + } else { + // 整车 + if (ele?.paymentStatusLabel == '已支付') { + indexId += 1; + index += ele?.price; + } + console.log(ele.expenseCode) } - console.log(ele.expenseCode) if (ele.expenseCode == '"ATT"' || ele.expenseCode == 'ATT'){ - console.log('ele.expenseCode') - console.log(ele) if(ele?.paymentStatusLabel == '已支付') { this.ATTPrice = ele.price; } else { @@ -110,7 +120,7 @@ export class OneCarOrderCancelConfirmComponent implements OnInit { }); } - close(): void { - this.modalRef.close(true); + close(value: boolean): void { + this.modalRef.close(false); } } diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 30f42c9b..5876cdad 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-21 14:27:51 + * @LastEditTime : 2022-02-22 15:40:02 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index ec153aa7..cbb65a33 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-21 14:27:50 + * @LastEditTime : 2022-02-22 15:40:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -130,7 +130,6 @@ export class VehicleUpdateFreightComponent implements OnInit { this.service.msgSrv.error('请填写必填项!'); return; } - console.log(this.getParams()) this.service.request(this.service.$api_get_insertFreightChangeWhole, this.getParams()).subscribe(res => { if (res) { this.modal.destroy(true); @@ -140,7 +139,7 @@ export class VehicleUpdateFreightComponent implements OnInit { } close(): void { - this.modal.destroy(); + this.modal.destroy(false); } /** * 更新数字框