From 2e1ee9d9015486d240d9b4222a906ae615822ae9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 31 Mar 2022 16:05:23 +0800 Subject: [PATCH 1/5] fix bug --- .../components/complaint-detail/complaint-detail.component.ts | 1 - .../components/vehicle/vehicle.component.html | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index b33bede1..f40d2d70 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -34,7 +34,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit { } ngOnInit(): void { - if (this.id) { this.getDetail(this.id); diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index cc8d7995..835a7e4c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 11:10:20 + * @LastEditTime : 2022-03-31 16:05:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -82,7 +82,7 @@
- {{ data.expenseName }}：{{ data.price | currency }} + {{ data.expenseName }}：{{ data?.expenseCode === 'FL' ? (data.price * 100 + '%' ) : (data.price | currency) }} 待申请 已支付 From 67969a1d89b27b1c7bed7b96fd8a94110b2998d3 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 31 Mar 2022 16:09:28 +0800 Subject: [PATCH 2/5] edit --- .../partner-list/components/index/partner-list.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 7d1cafb2..d970bbd7 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -398,6 +398,7 @@ export class PartnerListComponent { width: 150, type: 'badge', badge: { + 0: { text: '未发起', color: 'default' }, 10: { text: '待合伙人签约', color: 'default' }, 15: { text: '签约中', color: 'processing' }, 20: { text: '平台签约完成', color: 'success' }, @@ -411,9 +412,8 @@ export class PartnerListComponent { type: 'badge', badge: { 0: { text: '未发起', color: 'default' }, - 10: { text: '待审核', color: 'processing' }, - 20: { text: '审核通过', color: 'success' }, - 30: { text: '驳回', color: 'error' } + 10: { text: '审核失败', color: 'error' }, + 20: { text: '审核通过', color: 'success' } } }, { From c2ecb57f37f33b8c54696aa186a053904675bbb5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 31 Mar 2022 17:08:17 +0800 Subject: [PATCH 3/5] edit --- .../personal-partner-detail.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index 9cf0a9fe..ab33519c 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -81,6 +81,13 @@ export class PersonalPartnerDetailComponent implements OnInit { ...new Set((this.detailData?.cityCodesList as any[]).map(city => city.provinceCode)) ]; } + if (this.detailData?.channelIdLabel) { + const channel = (this.detailData.channelIdLabel as string).split('/'); + Object.assign(this.detailData, { + channelName: channel[0], + channelMobile: channel[1] + }); + } } }); } @@ -285,7 +292,7 @@ export class PersonalPartnerDetailComponent implements OnInit { buttons: [ { text: '详情', - click: (item) => this.service.showChangeDetail(item.id) + click: item => this.service.showChangeDetail(item.id) } ] } From 46ceb837f6f98e9191861aec181a666db212381b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 31 Mar 2022 17:33:57 +0800 Subject: [PATCH 4/5] edit --- .../input-invoice/input-invoice.component.ts | 13 +++++++++---- .../invoice-requested-detail.component.html | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts index d8ff45cb..afc5e4d0 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -123,7 +123,7 @@ export class InputInvoiceComponent implements OnInit { title: '发票类型', ui: { widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, + params: { dictKey: 'DictConstants.INVOICE_TYPE' }, placeholder: '请选择', visibleIf: { expand: (value: boolean) => value @@ -154,14 +154,19 @@ export class InputInvoiceComponent implements OnInit { sts: { type: 'string', title: '收票状态', + enum: [ + { value: '', label: '全部' }, + { value: 1, label: '是' }, + { value: 0, label: '否' } + ], ui: { - widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, + widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, invdate: { type: 'string', diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 2d05f3d4..b4501159 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -25,7 +25,7 @@ {{headerInfo?.vatinvHNum}} - {{headerInfo?.reciname}} + {{headerInfo?.reciname}}/{{headerInfo?.recitel}} {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}} From 599fe261f2240c439bf7a6368a157b311d18372b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 31 Mar 2022 17:36:50 +0800 Subject: [PATCH 5/5] fix bug --- .../components/receipts-audit/receipts-audit.component.ts | 8 ++++---- .../components/vehicle/vehicle.component.ts | 6 ++++++ .../vehicle/confir-receipt/confir-receipt.component.ts | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index 1ee4249a..a5228fed 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -532,13 +532,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { } // 批量生成电子单据 sign1(item?: any) { - if (this.selectedRows.length <= 0) { + if (this.selectedRows?.length <= 0) { this.service.msgSrv.error('请选择订单！') return } let params: any[] = []; this.selectedRows.forEach(item => { - params.push(item.id); + params.push(item?.id); }); this.modal.confirm({ nzTitle: `已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？`, @@ -555,10 +555,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { // this.getGoodsSourceStatistical(); // }) { - this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params}) + this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params.join(',')}) - this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})} + this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params.join(',')})} }); } 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 37d2336c..55002520 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -761,6 +761,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme }, nzFooter: null }); + modalRef.afterClose.subscribe((res: boolean) => { + if (res) { + this.resetSF; + this.st.load(); + } + }); } revoke(item: any) { this.modal.confirm({ diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts index e20e427b..fa5b8958 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-03-31 14:21:48 + * @LastEditTime : 2022-03-31 17:36:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -74,7 +74,7 @@ export class VehicleConfirReceiptComponent implements OnInit { console.log(res); if (res) { this.service.msgSrv.success('确认签收成功！'); - this.modal.destroy(); + this.modal.destroy(true); } }); }