diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts index 479d2daa..1f235de5 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts @@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router'; import { NzModalService } from 'ng-zorro-antd/modal'; import { RecordedService } from '../../services/recorded.service'; - @Component({ selector: 'app-partner-recored-detail', templateUrl: './detail.component.html', @@ -21,7 +20,7 @@ export class PartnerRecordedDetailComponent implements OnInit { this.getRecordedDetail(this.id); } - ngOnInit(): void { } + ngOnInit(): void {} getRecordedDetail(id: string) { this.service.request(this.service.$api_get_recorded_record_detail, { id }).subscribe(res => { @@ -87,18 +86,28 @@ export class PartnerRecordedDetailComponent implements OnInit { this.service.msgSrv.warning('请填写拒绝原因 '); return; } - this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => { - modal.destroy(true); - }, '审核拒绝成功'); + this.audit( + { ids: params, rejectReason: this.msg, sts: '3' }, + () => { + modal.destroy(true); + }, + '审核拒绝成功' + ); } }, { label: '通过', type: 'primary', onClick: () => { - this.audit({ ids: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, () => { - modal.destroy(true); - }, `${this.formData?.sts === '1' ? '审核' : '复审'}通过成功`); + console.log(this.formData?.sts); + + this.audit( + { ids: params, rejectReason: this.msg, sts: this.formData?.sts === '0' ? 1 : 2 }, + () => { + modal.destroy(true); + }, + `${this.formData?.sts === '1' ? '审核' : '复审'}通过成功` + ); } } ] @@ -117,13 +126,11 @@ export class PartnerRecordedDetailComponent implements OnInit { * 审核 */ audit(params: any, callback: Function, msg = '成功') { - this.service - .request(this.service.$api_audit_recored, ...params) - .subscribe(res => { - if (res) { - this.service.msgSrv.success(msg); - callback(); - } - }); + this.service.request(this.service.$api_audit_recored, {...params}).subscribe(res => { + if (res) { + this.service.msgSrv.success(msg); + callback(); + } + }); } } diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 05582e51..1541fe77 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -245,7 +245,16 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent * @param params 更新数据 */ uploadSetting() { - this.service.request(this.service.$api_get_updateData).subscribe((res: any) => { + let params: any; + if (this.selectedRows.length === 0) { + params ={} + } else{ + params ={ ids: []} + this.selectedRows.forEach(item => { + params.ids.push(item.id); + }); + } + this.service.request(this.service.$api_get_updateData,params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('更新成功'); this.search(); 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 3c70d41c..1a549383 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 @@ -381,14 +381,15 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent * @param params 更新数据 */ resetData() { + let params: any; if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据'); - return; + params ={} + } else{ + params ={ ids: []} + this.selectedRows.forEach(item => { + params.ids.push(item.id); + }); } - let params: any[] = []; - this.selectedRows.forEach(item => { - params.push(item.id); - }); this.service.request(this.service.$api_get_taxDeclaration_updateAll, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('更新成功'); 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 28b29378..7d1d3b89 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 @@ -326,7 +326,16 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent * @param params 更新数据 */ uploadSetting() { - this.service.request(this.service.$api_update_individual_income_page).subscribe((res: any) => { + let params: any; + if (this.selectedRows.length === 0) { + params ={} + } else{ + params ={ ids: []} + this.selectedRows.forEach(item => { + params.ids.push(item.id); + }); + } + this.service.request(this.service.$api_update_individual_income_page, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('更新成功'); this.search(); 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 9c3b1970..1faa2dbe 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 @@ -20,33 +20,37 @@
- - - + +
- + 待上传 已上传 上传中 - 上传异常 - + 上传异常 校验中 通过 - 不通过 - + 不通过 -
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}