diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index 85e468fe..17ea49f8 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -10,23 +10,16 @@ --> - +
- +
-
- +
+
- + - - - {{ item?.billStatusLabel }} - {{ item?.billStatusLabel }} - 异常 - - - - {{ item?.billStatusLabel }} - {{ item?.billStatusLabel }} - - -
{{ item?.amount | currency: ' ' }}
- + @@ -76,5 +48,4 @@
- - + \ No newline at end of file diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less deleted file mode 100644 index 43a47df4..00000000 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts deleted file mode 100644 index 1c0d6328..00000000 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * @Description : - * @Version : 1.0 - * @Author : Shiming - * @Date : 2022-03-30 14:45:52 - * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 15:33:06 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts - * Copyright (C) 2022 huzhenhong. All rights reserved. - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TaxManagementIndividualCollectComponent } from './individual-collect.component'; - -describe('TaxManagementIndividualCollectComponent', () => { - let component: TaxManagementIndividualCollectComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ TaxManagementIndividualCollectComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TaxManagementIndividualCollectComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); 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 d794103e..30878968 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 @@ -1,71 +1,44 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData } from '@delon/abc/st'; +import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { of } from 'rxjs'; -import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; -// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; -// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @Component({ selector: 'app-tax-management-individual-collect', templateUrl: './individual-collect.component.html', - styleUrls: ['./individual-collect.component.less'] + styleUrls: ['../../../commom/less/box.less'] }) export class TaxManagementIndividualCollectComponent implements OnInit { _$expand = false; - ui!: SFUISchema; schema!: SFSchema; columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - tabType!: string; tabs: any[] = [ - { name: '待申报', value: '1' }, - { name: '待审核', value: '2' }, - { name: '已通过', value: '3' }, - { name: '不通过', value: '4' }, + { name: '待申报', value: '0' }, + { name: '待审核', value: '1' }, + { name: '已通过', value: '2' }, + { name: '不通过', value: '3' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 - serviceTel = ''; - constructor( - public service: TaxManagementService, - private router: Router, - private ar: ActivatedRoute, - public shipperservice: ShipperBaseService, - private modal: NzModalService, - public shipperSrv: ShipperBaseService - ) {} + selectedIndex = '0'; - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } + selectedRows: any[] = []; + constructor(public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, private modal: NzModalService) {} /** * 查询参数 */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex + declareStatus: this.selectedIndex }); delete params._$expand; return { ...params }; } - /** - * 选中行 - */ - get selectedRows() { - return this.st?.list.filter((item: any) => item.checked) || []; - } - /** * 伸缩查询条件 */ @@ -74,6 +47,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit { this.sf?.setValue('/_$expand', this._$expand); } + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + } + } + /** * 重置表单 */ @@ -96,7 +77,26 @@ export class TaxManagementIndividualCollectComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - billCode: { title: '申报状态', type: 'string', ui: { placeholder: '请输入' } }, + declareStatus: { + title: '申报状态', + type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '待申报' }, + { value: '1', label: '待审核' }, + { value: '2', label: '已通过' }, + { value: '3', label: '不通过' } + ], + ui: { + placeholder: '请选择', + widget: 'select', + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + }, + default: '' + }, resourceCode: { type: 'string', title: '申报结果', @@ -104,18 +104,23 @@ export class TaxManagementIndividualCollectComponent implements OnInit { placeholder: '请输入' } }, - serviceType3: { + overdueStatus: { title: '是否逾期', type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '否' }, + { value: '1', label: '是' } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, + widget: 'select', containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value } - } + }, + default: '' }, createTime: { title: '税款所属期', @@ -151,15 +156,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkFreightForwarder() } } } }; - this.ui = { - '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, - $time: { grid: { span: 24 } } - }; } /** @@ -168,121 +169,82 @@ export class TaxManagementIndividualCollectComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, - { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' }, - { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' }, + { + title: '申报状态', + index: 'declareStatus', + className: 'text-center', + width: '120px', + type: 'badge', + badge: { + '0': { text: '待申报', color: 'default' }, + '1': { text: '待审核', color: 'processing' }, + '2': { text: '已通过', color: 'success' }, + '3': { text: '不通过', color: 'error' } + } + }, + { title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } }, { title: '税款所属期起', - render: 'billComplianceVOS', + index: 'skssqq', className: 'text-center', width: '150px' }, - { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' }, + { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' }, { title: '纳税人名称', - render: 'serviceType', + index: 'nsrmc', className: 'text-center', width: '180px' }, - { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '申报人数', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, + { title: '税率', index: 'sl', className: 'text-center', width: '150px' }, + { title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' }, + { title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' }, + { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, + { title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' }, + { title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' }, + { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' } ]; } /** - *撤销 + *更正 * @param record 记录实例 */ recall() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要撤回的数据'); + this.service.msgSrv.warning('请选择需要更正的数据'); return; } - this.modal.confirm({ - nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', - nzOkText: '确定', - nzCancelText: '取消', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); - } - /** - *撤销 - * @param record 记录实例 - */ - unnormal(value: any) { - this.modal.confirm({ - nzTitle: '税务审核结果', - nzContent: '订单结算时间所在月份与申报月份不一致', - nzOkText: '确定', - nzCancelText: '', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); + // this.modal.confirm({ + // nzTitle: '撤回提示', + // nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + // nzOkText: '确定', + // nzCancelText: '取消', + // nzOnOk: () => { + // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('撤销成功'); + // this.search(); + // } + // }); + // } + // }); } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.name || ''; setTimeout(() => { this.st.load(1); }); } - /** - * 查看当行数据 - */ - view(record: STData) { - // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); - this.router.navigate(['../detail'], { - queryParams: { - id: record.id - }, - relativeTo: this.ar - }); - } - - // appeal(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '申诉', - // nzWidth: '40%', - // nzContent: CtcAppealComponent, - // nzComponentParams: { - // i: item, - // status: 'add' - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // if (res) { - // this.search({ representationsStatus: '' }); - // } - // }) - // } - /** * 申报 */ upload() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.service.msgSrv.warning('请选择需要上传的数据'); return; } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { @@ -298,10 +260,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { * @param params 更新数据 */ uploadSetting() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); - return; - } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { // if (res) { // this.service.msgSrv.success('更新成功'); @@ -310,33 +268,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { // }) } - /** - * 查看校验结果 - */ - viewResult(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '本地校验结果', - // nzWidth: 1200, - // nzContent: TaxManagementOrderVerifyResultComponent, - // nzComponentParams: { - // record: item - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // }) - } - - /** - * 查看监管审核结果 - */ - viewAuditResult(record: any) { - if (record?.billStatus !== '2') { - return; - } - this.openWainingModal('监管审核结果', record?.result); - } - search() { this.st.load(1); } @@ -347,12 +278,4 @@ export class TaxManagementIndividualCollectComponent implements OnInit { export() { this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); } - - openWainingModal(content: string, title = '提示') { - this.modal.warning({ - nzMask: false, - nzTitle: title, - nzContent: content - }); - } } 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 8cc0c73f..315d5f47 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 @@ -133,15 +133,20 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { isOvertime: { title: '是否逾期', type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '否' }, + { value: '1', label: '是' } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, + widget: 'select', containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value } - } + }, + default: '' }, taxDate: { 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 1d2ce0d2..728a19ff 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -19,6 +19,7 @@ import { ShipperBaseService } from '@shared'; export class TaxManagementService extends ShipperBaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + // public $api_order_reporting_page = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 查询运营报表 @@ -29,6 +30,11 @@ export class TaxManagementService extends ShipperBaseService { // 更新所有数据个税申报明细 $api_update_individual_income_page = `/api/sdc/taxIncome/updateAll`; + // 查询个税汇总 + $api_get_individual_collect_page = `/api/sdc/taxSummary/list/page`; + // 更新所有数据个税汇总 + $api_update_individual_collect_page = `/api/sdc/taxIncome/updateAll`; + // 订单上报列表 $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`; // 根据订单Id更新税务订单