From 6548a0737f1d646bc8869cb1506d711e4a180024 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 13 May 2022 10:12:28 +0800 Subject: [PATCH 1/5] fix bug --- proxy.conf.js | 4 ++-- .../components/rebate-record/rebate-record.component.html | 2 +- .../components/rebate-record/rebate-record.component.ts | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 1443977f..e283d993 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-12 17:15:50 + * @LastEditTime : 2022-05-13 09:36:19 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html index 5e27e01e..539feb5b 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html @@ -23,7 +23,7 @@ >
- +
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts index cacd4105..3d8e8ec2 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts @@ -149,4 +149,10 @@ export class ParterRebateManageMentRecordComponent implements OnInit { this.sf.reset(); this.st.load(1); } + // 导出 + exprot() { + // this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_partnerIncomeHead_export); + this.service.downloadFile(this.service.$api_get_partnerIncomeHead_export, { ...this.reqParams, pageSize: -1 }); + } + } From d4fea43e4cf3c00d11061307d7f0323486d93b66 Mon Sep 17 00:00:00 2001 From: weiyu Date: Fri, 13 May 2022 10:21:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 2 +- .../individual-declare/individual-declare.component.ts | 2 +- .../components/billing-order/billing-order.component.ts | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 7db07ae1..0f09f6f7 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 75be4b4c..de7872fe 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -212,7 +212,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent className: 'text-center', width: '200px', type: 'widget', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jsyj }) } }, { title: '税率', diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index aceeaac5..beaf5437 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -213,11 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent { className: 'text-center', index: 'paymentMethodRate', width: 130, -<<<<<<< HEAD format: record => `${(record.paymentMethodRate*100).toFixed(2)}%` -======= - format: record => `${record.paymentMethodRate * 100}%` ->>>>>>> b6b51c9a662efd271b713242c077a04c199ed167 }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, From 6346d496f6be808f9d1e94b008cf4456b14a49ac Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 13 May 2022 10:25:19 +0800 Subject: [PATCH 3/5] fix bug --- .../add-personal-partner.component.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts index a322db65..ff731ffa 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts @@ -115,6 +115,8 @@ export class AddPersonalPartnerComponent { }; this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => { if (res) { + console.log(res); + // 法定代表人证件照 if (isFront === 'front') { // 正面 @@ -169,7 +171,7 @@ export class AddPersonalPartnerComponent { this.loadingIdentityInfoSub = true; this.getIdentityInfoSub = this.service.request(this.service.$api_get_identityInfo_by_mobile, { mobile }).subscribe( res => { - if (res) { + if (res?.name) { this.setInfo(res); this.sf.setValue('/adminUserInfo/id', res.id); this.sf.setValue('/adminUserInfo/userId', res.userId); @@ -289,17 +291,17 @@ export class AddPersonalPartnerComponent { grid: { span: 6 }, class: 'input-back', widget: 'checkbox', - change: i => this.sf?.setValue('/adminUserInfo/validEndTime', null) + change: i => this.sf?.setValue('/adminUserInfo/validEndTime', ' ') } as SFCheckboxWidgetSchema } }, - required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'validStartTime'] + required: ['_adminCertificatePhotoTipsA', 'adminMobile', 'name', 'certificateNumber', 'validStartTime', 'validEndTime'] }, // 所属城市 _addressTitle: { title: '', type: 'string', ui: { widget: 'custom' } }, cityCodesList: { type: 'string', - title: '所属城市7', + title: '所属城市', maxMultipleCount: 3, ui: { widget: 'tree-select', From 1b42d9347eaa5ae2d88062db58c3d98a2db2ce71 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 13 May 2022 10:42:27 +0800 Subject: [PATCH 4/5] fix bug --- .../etc-invoiced-list.component.html | 45 +++++++++++-------- .../etc-invoiced-list.component.ts | 26 ++++++++++- .../services/ticket.service.ts | 4 +- 3 files changed, 55 insertions(+), 20 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html index ddc2932f..51392472 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.html @@ -21,23 +21,32 @@ --> -
- -
- - -
+
+ +
+ + +
+
- - - {{item.driverName}}
{{item.driverTelephone}} - - - {{item.licenseCarNo}}
{{item.licenseBelonging}} - - - \ No newline at end of file + + + {{ item.driverName }}
{{ item.driverTelephone }} + + + {{ item.licenseCarNo }}
{{ item.licenseBelonging }} + + + diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index 1984c232..afe3793f 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -38,7 +38,15 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI } return requestOptions; }; - + afterRes = (data: any[], rawData?: any) => { + return data.map(item => ({ + ...item, + disabled: item.invoicingStatus !== '1' || item.invoicingStatus !== '9' + })); + }; + get selectedRows() { + return this.st?.list.filter(item => item.checked) || []; + } showDetail(item: any) { const modal = this.nzModalService.create({ nzTitle: '运单交易明细', @@ -129,6 +137,7 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI private initST(): STColumn[] { return [ + { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' }, { title: '运单号', index: 'wayBillCode', width: 200 }, { title: '订单号', index: 'billCode', width: 200 }, { @@ -177,4 +186,19 @@ export class ETCInvoicedListComponent extends BasicTableComponent implements OnI exprot() { this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportEtcApplyRecordList); } + sureInvoice() { + if (this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择订单！'); + return; + } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_updateEtcRecordStatus, params).subscribe(res => { + if (res) { + this.st.load(1); + } + }); + } } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 4e09936a..a0dc3c7a 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-29 13:12:35 - * @LastEditTime : 2022-05-10 09:51:30 + * @LastEditTime : 2022-05-13 10:38:32 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts @@ -152,6 +152,8 @@ export class TicketService extends ShipperBaseService { $api_export_InvoicedBillInfoPage = '/api/fcc/invoicedBillInfo/exportInvoicedBillInfoPage' // 批量生成进项发票 $api_createFicoInpinv = '/api/fcc/ficoEtcInvoiceL/createFicoInpinv' + // 开票记录-确认开票 + $api_updateEtcRecordStatus = '/api/fcc/ficoEtcRecord/updateEtcRecordStatus' constructor(public injector: Injector) { super(injector); From 7a0647252a462a2826c0f1ed4d7c3ab256c5c91c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 13 May 2022 11:01:40 +0800 Subject: [PATCH 5/5] fix bug --- .../add-personal-partner/add-personal-partner.component.ts | 4 +++- .../individual-declare/individual-declare.component.ts | 2 +- .../individual-income/individual-income.component.ts | 2 +- .../invoice-reporting/invoice-reporting.component.ts | 2 +- .../components/order-reporting/order-reporting.component.ts | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts index ff731ffa..080c1e62 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts @@ -114,7 +114,7 @@ export class AddPersonalPartnerComponent { side: isFront }; this.service.request(this.service.$api_ocr_recognize_id_card, params).subscribe(res => { - if (res) { + if (res.name) { console.log(res); // 法定代表人证件照 @@ -140,6 +140,8 @@ export class AddPersonalPartnerComponent { this.sf.setValue('/adminUserInfo/_isLoingDate', true); } } + } else { + this.sf.setValue('/adminUserInfo/_isLoingDate', false); } }); } diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index bd102b3d..96dd3167 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -299,7 +299,7 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent unnormal(value: any) { this.modal.confirm({ nzTitle: '税务审核结果', - nzContent: '订单结算时间所在月份与申报月份不一致', + nzContent: `${value?.exceptionInfo}`, nzOkText: '确定', nzCancelText: '', nzOnOk: () => { diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index e2a1ad34..754cbb65 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -322,7 +322,7 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent } // this.modal.warning({ // nzTitle: '申报提示', - // nzContent: '订单结算时间所在月份与申报月份不一致......' + // nzContent: `${value?.exceptionInfo}`, // }); // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { // if (res) { diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index 5c26cc75..b7391876 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -251,7 +251,7 @@ export class TaxManagementInvoiceReportingComponent extends BasicTableComponent }); this.modal.confirm({ nzTitle: '税务审核结果', - nzContent: '订单结算时间所在月份与申报月份不一致', + nzContent: `${value?.exceptionInfo}`, nzOkText: '确定', nzCancelText: '', nzOnOk: () => { diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index fb1280d1..654eca3b 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -321,7 +321,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im }); this.modal.confirm({ nzTitle: '税务审核结果', - nzContent: '订单结算时间所在月份与申报月份不一致', + nzContent: `${value?.exceptionInfo}`, nzOkText: '确定', nzCancelText: '', nzOnOk: () => {