diff --git a/proxy.conf.js b/proxy.conf.js index 000f97b3..b9211e38 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-11 13:29:32 + * @LastEditTime : 2022-05-11 19:19:55 * @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-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html index 218de752..bc545f49 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html @@ -1,3 +1,13 @@ + 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 7d1d3b89..e2a1ad34 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 @@ -23,8 +23,10 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent ]; selectedIndex = '0'; //选择的项目 isVisible: boolean = false; + oneStatus: boolean = false; selectedRows: any[] = []; + driverRecord!: any; constructor(public service: TaxManagementService, public searchDrawerService: SearchDrawerService) { super(searchDrawerService); @@ -287,11 +289,20 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent * @param record 记录实例 */ resetData() { - // if (this.selectedRows.length === 0) { - // this.openWainingModal('请选择需要更新的数据！'); - // return; - // } - // this.isVisible = true; + if (this.selectedRows.length === 0) { + this.service.msgSrv.error('请选择明细！'); + return; + } + if(this.selectedRows.length === 1) { + console.log(this.selectedRows); + this.oneStatus = true + this.driverRecord = this.selectedRows[0] + + } else { + this.oneStatus = false + + } + this.isVisible = true; } selectChange(item: any) { @@ -328,11 +339,11 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent uploadSetting() { let params: any; if (this.selectedRows.length === 0) { - params ={} + params =[] } else{ - params ={ ids: []} + params =[] this.selectedRows.forEach(item => { - params.ids.push(item.id); + params.push(item.id); }); } this.service.request(this.service.$api_update_individual_income_page, params).subscribe((res: any) => { @@ -349,10 +360,21 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent // 导出 exprot() { - this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxIncome_export); + this.service.exportStart({ ...this.sfValue,declareStatus: this.selectedIndex, pageSize: -1 }, this.service.$api_taxIncome_export); } - handleOK() {} + handleOK() { + let params: any = []; + if (this.selectedRows.length !== 0) { + this.selectedRows.forEach(item => { + params.push(item.id); + }); + } + this.service.request(this.service.$api_fixThreshold, params).subscribe((res) => { + console.log(res); + + }) + } handleCancel() { this.isVisible = false; } 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 8b2cf608..5c26cc75 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 @@ -312,7 +312,7 @@ export class TaxManagementInvoiceReportingComponent extends BasicTableComponent * 异步导出 */ export() { - this.service.exportStart(this.reqParams, this.service.$api_invoiceUpload_export); + this.service.exportStart({...this.reqParams, pageSize: -1 }, this.service.$api_invoiceUpload_export); } openWainingModal(content: string, title = '提示') { diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 1faa2dbe..adc012af 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -95,6 +95,9 @@
{{ item?.orderAmount | currency }}
 + +
{{ item?.wayAmount | currency }}
+ 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 12237a9c..fb1280d1 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 @@ -239,7 +239,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im { title: '司机身份证号', index: 'driverCertificateNumber', className: 'text-center', width: '180px' }, { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' }, { title: '货物信息', render: 'goodsName', className: 'text-center', width: '200px' }, - { title: '运费金额', render: 'orderAmount', className: 'text-center', width: '100px' }, + { title: '运费金额', render: 'wayAmount', className: 'text-center', width: '100px' }, { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' }, { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' }, { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' }, @@ -467,7 +467,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im * 异步导出 */ export() { - this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); + this.service.exportStart({...this.reqParams, pageSize: -1} ,this.service.$api_async_export_order_reporting_list); } openWainingModal(content: string, title = '提示') { diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index 3df8dc4a..f70df070 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -68,6 +68,8 @@ export class TaxManagementService extends ShipperBaseService { $api_taxDeclaration_export = '/api/sdc/taxDeclaration/asyncExport'; // 发票上传撤回 $api_invoiceUpload_withdraw = '/api/sdc/invoiceUploadInfo/withdraw'; + // 修改起征点 + $api_fixThreshold = '/api/sdc/taxIncome/fixThreshold'; constructor(public injector: Injector) { super(injector); }