From 5c9ba7b7f195a27fd2625353a00007abfc6dbc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 13:34:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B5=84=E9=87=91=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-info/fund-info.component.html | 6 +- .../fund-info/fund-info.component.ts | 20 ++++- .../fund-reporting.component.ts | 4 +- .../order-reporting.component.html | 19 ++--- .../order-reporting.component.ts | 15 ++-- .../verify-result.component.html | 12 ++- .../verify-result/verify-result.component.ts | 79 +++++++++++++------ .../reporting/services/reporting.service.ts | 4 +- 8 files changed, 100 insertions(+), 59 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html index 4714651b..b8bbd698 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -3,10 +3,8 @@ - -
-
{{item.expenseName}}:{{item.price | currency}}
-
+ + {{filterCheckStatus(item?.checkStatus)}} diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts index eed6adc2..ed3f6b4e 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts @@ -51,16 +51,17 @@ export class DatatableReportingFundInfoComponent implements OnInit { width: '10%', type: 'enum', enum: { - '0': '非必填', - '1': '必填', + 0: '否', + 1: '是', }, }, { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', }, { title: '本地校验', - index: 'checkStatus', + render: 'checkStatus', className: 'text-center', type: 'enum', + enum: { '0': '校验中', '1': '通过', @@ -97,6 +98,19 @@ export class DatatableReportingFundInfoComponent implements OnInit { this.modalRef.destroy(); } + filterCheckStatus(status: number) { + switch (status) { + case 0: + return '校验中'; + case 1: + return '通过'; + case 2: + return '不通过'; + default: + return ''; + + } + } } diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index e7bdf47b..c62fca11 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -116,7 +116,7 @@ export class DatatableFundReportingComponent implements OnInit { title: '承运司机', type: 'string', ui: { - placeholder: '请输入司机姓名/手机号', visibleIf: { + placeholder: '请输入司机姓名', visibleIf: { _$expand: (value: boolean) => value, }, } @@ -169,7 +169,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, - enterpriseInfoId: { + ltdId: { title: '网络货运人', type: 'string', ui: { diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index 8b14bd1c..1d8a4f94 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -31,24 +31,25 @@ [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading" (change)="changeSt($event)"> - {{filterStatus(item?.orderCheckStatus)}} - {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} {{filterStatus(item?.driverCheckStatus)}} - {{filterStatus(item?.driverCheckStatus)}} + *ngIf="item?.driverCheckStatus === 2">{{filterStatus(item?.driverCheckStatus)}} + {{filterStatus(item?.driverCheckStatus)}} - {{filterStatus(item?.carCheckStatus)}} - {{filterStatus(item?.carCheckStatus)}} + {{filterStatus(item?.carCheckStatus)}} + {{filterStatus(item?.carCheckStatus)}} - {{filterCheckStatus(item?.checkStatus)}} - {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} + {{item?.billCode}} diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 77b16932..b3ad4682 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -29,8 +29,7 @@ export class DatatableOrderReportingComponent implements OnInit { { name: '异常', value: '4' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 - serviceTel = ''; + selectedIndex = '1'; isLoading: boolean = false; selectedRows: any[] = []; constructor( @@ -54,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex, + putStatus: this.selectedIndex, }); delete params._$expand; return { ...params }; @@ -407,7 +406,7 @@ export class DatatableOrderReportingComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.selectedRows = []; this.st.load(1); @@ -555,7 +554,7 @@ export class DatatableOrderReportingComponent implements OnInit { return; } const ids = this.selectedRows.map(i => i?.id); - this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => { + this.service.request(this.service.$api_update_order_data, ids).subscribe(res => { if (res) { this.selectedRows = []; this.st.reload(); @@ -567,11 +566,11 @@ export class DatatableOrderReportingComponent implements OnInit { filterStatus(status: number) { switch (status) { case 0: - return '校验中'; + return '待上传'; case 1: - return '通过'; + return '已上传'; case 2: - return '不通过'; + return '上传异常'; default: return ''; diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index f66d4313..033b9584 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -5,14 +5,12 @@
- - -
-
{{item.expenseName}}:{{item.price | currency}}
-
+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false,showSize:false}" + [loading]="false" [bordered]="true"> + + {{filterCheckStatus(item?.checkStatus)}}
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 3d52b397..ac8b8350 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; -import { SFSchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; @@ -11,26 +9,22 @@ import { ReportingService } from '../../services/reporting.service'; templateUrl: './verify-result.component.html', }) export class DatatableReportingVerifyResultComponent implements OnInit { - url = `/user`; - searchSchema: SFSchema = { - properties: { - no: { - type: 'string', - title: '编号' - } - } - }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = []; - record: any = {} - tabs: any[] = [ - { name: '订单信息', value: '1' }, - { name: '司机信息', value: '2' }, - { name: '车辆信息', value: '3' }, - ]; + record: any = {}; + tabs: any[] = [ + { name: '订单信息', value: 3 }, + { name: '司机信息', value: 2 }, + { name: '车辆信息', value: 4 }, + ]; + subjectType = 3; + subjectId = ''; get reqParams() { - return {}; + return { + subjectType: this.subjectType, + subjectId: this.record?.id + }; } constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { @@ -46,13 +40,31 @@ export class DatatableReportingVerifyResultComponent implements OnInit { initST() { this.columns = [ { title: '序号', type: 'no', className: 'text-center', width: '60px', }, - { title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', }, + { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', }, + { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', }, { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', }, - { title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', }, - { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', }, - { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', }, + { + title: '是否必填', + index: 'requiredStatus', + className: 'text-center', + width: '100px', + type: 'enum', + enum: { + 0: '否', + 1: '是' + } + }, + { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', }, + { + title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px', + type: 'enum', + enum: { + 0: '校验中', + 1: '通过', + 2: '不通过' + } + }, + { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', }, ] } @@ -64,7 +76,10 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } selectTab(e: any) { - + setTimeout(() => { + this.subjectType = e?.value; + this.st.load(1); + }) } update() { @@ -77,9 +92,23 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } + + close(): void { this.modalRef.destroy(); } + filterCheckStatus(status: number) { + switch (status) { + case 0: + return '校验中'; + case 1: + return '通过'; + case 2: + return '不通过'; + default: + return ''; + } + } } diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 155de748..f4216c85 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,12 +6,14 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报-列表 $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报 $api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = `/api/sdc/regulation/getPushConfig`; // 获取上传设置 $api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置 + $api_get_order_valid_result = `/api/sdc/regulation/queryPage/checkRes`;//订单上报-校验结果 + $api_update_order_data = `/api/sdc/regulation/renewalOrderById`;//订单批量更新订单数据 $api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; // 资金上报列表 $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传 From ae1ca9ad7f115f8350aec9f0f313c59c000fbc00 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 13:35:15 +0800 Subject: [PATCH 2/3] edit --- .../individual-collect.component.html | 49 +--- .../individual-collect.component.less | 5 - .../individual-collect.component.spec.ts | 34 --- .../individual-collect.component.ts | 259 ++++++------------ .../individual-income.component.ts | 11 +- .../services/tax-management.service.ts | 6 + 6 files changed, 115 insertions(+), 249 deletions(-) delete mode 100644 src/app/routes/tax-management/components/individual-collect/individual-collect.component.less delete mode 100644 src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts 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更新税务订单 From 3cdd46cdced79935724accbdf5753e2fc4d246dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 13:46:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-reporting.component.ts | 23 +++++++++++++------ .../order-reporting.component.ts | 3 +++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index c62fca11..fa7ecd77 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -146,11 +146,16 @@ export class DatatableFundReportingComponent implements OnInit { uploadStatus: { title: '上传状态', type: 'string', + default: 0, + enum: [ + { label: '待上传', value: 0 }, + { label: '已上传', value: 1 }, + { label: '异常', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -159,11 +164,15 @@ export class DatatableFundReportingComponent implements OnInit { verifyStatus: { title: '本地校验', type: 'string', + enum: [ + { label: '校验中', value: 0 }, + { label: '通过', value: 1 }, + { label: '不通过', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + allowClear: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, @@ -242,7 +251,7 @@ export class DatatableFundReportingComponent implements OnInit { { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' }, - { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '150px' }, + { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' }, { title: '车队长', index: 'payee', className: 'text-center', width: '150px' }, { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' }, diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index b3ad4682..e10847f0 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -149,6 +149,7 @@ export class DatatableOrderReportingComponent implements OnInit { putStatus: { title: '上传状态', type: 'string', + default: 0, enum: [ { label: '待上传', value: 0 }, { label: '已上传', value: 1 }, @@ -158,6 +159,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -174,6 +176,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, },