From ca10c0769007acb1e180a36d75d4aab36fa142a2 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 30 Mar 2022 14:29:38 +0800 Subject: [PATCH 1/8] edit --- .../channel-log-modal.component.html | 13 ++++ .../channel-log-modal.component.less | 0 .../channel-log-modal.component.ts | 34 +++++++++ .../partner-detail.component.html | 19 +---- .../partner-detail.component.ts | 72 ++++++------------- .../personal-partner-detail.component.html | 19 +++++ .../personal-partner-detail.component.ts | 27 ++++++- .../services/partner-list.service.ts | 14 +++- src/app/routes/partner/partner.module.ts | 4 +- 9 files changed, 132 insertions(+), 70 deletions(-) create mode 100644 src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html create mode 100644 src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less create mode 100644 src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html new file mode 100644 index 00000000..a9d9fe7e --- /dev/null +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html @@ -0,0 +1,13 @@ +

转移客户数：{{changeST?.total}}

+ + +

不转移客户数：{{noChangeST?.total}}

+ + +

+ 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 +

\ No newline at end of file diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts new file mode 100644 index 00000000..6fc1e963 --- /dev/null +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts @@ -0,0 +1,34 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STColumn } from '@delon/abc/st'; +import { PartnerListService } from '../../services/partner-list.service'; + +@Component({ + selector: 'app-channel-log-modal', + templateUrl: './channel-log-modal.component.html' +}) +export class ChannelLogModalComponent implements OnInit { + columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST(); + id = ''; + constructor(public service: PartnerListService, public route: ActivatedRoute) {} + + ngOnInit(): void {} + + private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } { + return { + changeColumn: [ + { title: '客户名称', index: 'payCode', width: 180 }, + { title: '合伙人', index: 'ltdName', width: 160 }, + { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, + { title: 'CRM审核状态', index: 'payDate', width: 150 }, + { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + ], + beChangeColumn: [ + { title: '客户名称', index: 'payCode', width: 180 }, + { title: '合伙人', index: 'ltdName', width: 160 }, + { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, + { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + ] + }; + } +} diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index dc271a74..041b2c1c 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -269,7 +269,6 @@ - 渠道销售信息 {{ detailData?.channelName }} @@ -282,7 +281,7 @@ 修改渠道销售记录 - @@ -317,19 +316,3 @@ - - -

转移客户数：{{changeST?.total}}

- - -

不转移客户数：{{noChangeST?.total}}

- - -

- 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 -

- \ No newline at end of file diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index b65e7695..80a9aa45 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -9,6 +9,7 @@ import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select'; import { Subscription, fromEvent } from 'rxjs'; import { PartnerListService } from '../../services/partner-list.service'; +import { ChannelLogModalComponent } from '../channel-log-modal/channel-log-modal.component'; import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component'; @Component({ @@ -18,12 +19,10 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit providers: [DatePipe] }) export class PartnerDetailComponent implements OnInit, OnDestroy { - @ViewChild('logModal') - logModal: any; @ViewChild('areaTreeSelect') areaTreeSelect!: NzTreeSelectComponent; - columns: { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST(); + columns: STColumn[] = this.initST(); detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } }; tempalateData = { ...this.detailData }; @@ -145,16 +144,6 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { }); } - showChangeDetail() { - const modal = this.nzModalService.create({ - nzTitle: '详情', - nzContent: this.logModal, - nzNoAnimation: true, - nzWidth: 700, - nzFooter: null - }); - } - ratify() { this.isEdit = true; // 搜索展开省份并选中节点 @@ -365,41 +354,26 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { }); } - private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } { - return { - logsColumn: [ - { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, - { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, - { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, - { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, - { title: '备注', index: 'remark', className: 'text-center', width: 150 }, - { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, - { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, - { - title: '操作', - fixed: 'right', - width: '140px', - buttons: [ - { - text: '详情', - click: () => this.showChangeDetail() - } - ] - } - ], - changeColumn: [ - { title: '客户名称', index: 'payCode', width: 180 }, - { title: '合伙人', index: 'ltdName', width: 160 }, - { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, - { title: 'CRM审核状态', index: 'payDate', width: 150 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } - ], - beChangeColumn: [ - { title: '客户名称', index: 'payCode', width: 180 }, - { title: '合伙人', index: 'ltdName', width: 160 }, - { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } - ] - }; + private initST(): STColumn[] { + return [ + { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, + { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, + { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, + { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, + { title: '备注', index: 'remark', className: 'text-center', width: 150 }, + { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, + { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, + { + title: '操作', + fixed: 'right', + width: '140px', + buttons: [ + { + text: '详情', + click: (item) => this.service.showChangeDetail(item.id) + } + ] + } + ]; } } diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html index b34aef70..68c93560 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html @@ -151,6 +151,25 @@ + + + 渠道销售信息 + {{ detailData?.channelName }} + {{ detailData?.channelMobile }} + {{ detailData?.bindChannelTime }} + + + + + + 修改渠道销售记录 + + + + + diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index ce1cec65..9cf0a9fe 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -21,6 +21,8 @@ export class PersonalPartnerDetailComponent implements OnInit { @ViewChild('areaTreeSelect') areaTreeSelect!: NzTreeSelectComponent; + columns: STColumn[] = this.initST(); + detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } }; tempalateData = { ...this.detailData }; @@ -35,7 +37,7 @@ export class PersonalPartnerDetailComponent implements OnInit { constructor( public service: PartnerListService, - private route: ActivatedRoute, + public route: ActivatedRoute, private nzModalService: NzModalService, private datePipe: DatePipe ) {} @@ -266,4 +268,27 @@ export class PersonalPartnerDetailComponent implements OnInit { } }); } + + private initST(): STColumn[] { + return [ + { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, + { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, + { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, + { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, + { title: '备注', index: 'remark', className: 'text-center', width: 150 }, + { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, + { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, + { + title: '操作', + fixed: 'right', + width: '140px', + buttons: [ + { + text: '详情', + click: (item) => this.service.showChangeDetail(item.id) + } + ] + } + ]; + } } diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts index b714c47c..22151e83 100644 --- a/src/app/routes/partner/partner-list/services/partner-list.service.ts +++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts @@ -2,6 +2,7 @@ import { Injectable, Injector } from '@angular/core'; import { BaseService, EACacheService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { ImageViewComponent } from 'src/app/shared/components/imagelist'; +import { ChannelLogModalComponent } from '../components/channel-log-modal/channel-log-modal.component'; @Injectable() export class PartnerListService extends ShipperBaseService { @@ -34,7 +35,7 @@ export class PartnerListService extends ShipperBaseService { // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck'; // 根据手机号查询实名信息 - $api_get_identityInfo_by_mobile= '/api/mdc/cuc/identityInfo/getByMobile'; + $api_get_identityInfo_by_mobile = '/api/mdc/cuc/identityInfo/getByMobile'; // 渠道销售修改详情 $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 @@ -60,4 +61,15 @@ export class PartnerListService extends ShipperBaseService { }; this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } }); } + + showChangeDetail(id: string) { + const modal = this.nzModalService.create({ + nzTitle: '详情', + nzContent: ChannelLogModalComponent, + nzComponentParams: { id }, + nzNoAnimation: true, + nzWidth: 800, + nzFooter: null + }); + } } diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index b27261c9..3255e0c1 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -62,6 +62,7 @@ import { PersonalPartnerDetailComponent } from './partner-list/components/person import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component'; import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component'; import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component'; +import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component'; const COMPONENTS: any[] = [ PartnerBusinessStatisticsIndexComponent, @@ -113,7 +114,8 @@ const COMPONENTS: any[] = [ PersonalPartnerDetailComponent, ParterAdviceFeedbackListComponent, ParterAdviceFeedbackDetailComponent, - ParterRebateManageMentAddPartnerListComponent + ParterRebateManageMentAddPartnerListComponent, + ChannelLogModalComponent ]; @NgModule({ From 2767780dec30d98a8ddd410c637e182be61e30ff Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:30:03 +0800 Subject: [PATCH 2/8] fix bug --- .../order-reporting.component.html | 7 +- .../order-reporting.component.ts | 84 ++++++++--------- .../verify-result.component.html | 23 +++++ .../verify-result.component.spec.ts | 24 +++++ .../verify-result/verify-result.component.ts | 94 +++++++++++++++++++ .../tax-management/taxmanagement.module.ts | 6 +- 6 files changed, 191 insertions(+), 47 deletions(-) create mode 100644 src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html create mode 100644 src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts create mode 100644 src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts 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 5834cc87..943a1e69 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 @@ -4,8 +4,8 @@ * @Author : Shiming * @Date : 2022-03-30 14:00:43 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:06:01 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\reporting\\order-reporting\\order-reporting.component.html + * @LastEditTime : 2022-03-30 14:20:03 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -62,6 +62,7 @@ - + + 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 75f60d81..1e0d1759 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 @@ -7,6 +7,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; +import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component'; // import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; // import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @@ -114,9 +115,6 @@ export class TaxManagementOrderReportingComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, onSearch: (q: any) => { let str =q.replace(/^\s+|\s+$/g,""); if (str) { @@ -240,10 +238,8 @@ export class TaxManagementOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', }, - { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', }, - { title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billComplianceVOS', @@ -251,37 +247,41 @@ export class TaxManagementOrderReportingComponent implements OnInit { width: '150px', }, { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, - { title: '网络货运人', render: 'serviceType', className: 'text-center', width: '180px', }, - { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '发货时间', render: 'driver', className: 'text-center', width: '180px' }, - { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' }, - { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, - { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '装货地', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '装货地详细地址', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '卸货地', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, + { title: '卸货地详细地址', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, + { title: '货主名称', render: 'driver', className: 'text-center', width: '180px' }, + { title: '货主纳税人识别号', render: 'payeeName', className: 'text-center', width: '180px' }, + { title: '录单时间', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '接单时间', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '发车时间', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, + { title: '到车时间', render: 'driver', className: 'text-center', width: '150px' }, + { title: '结束时间', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '订单金额', render: 'amount', className: 'text-center', width: '250px' }, { 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: '货物信息', 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: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '司机身份证号', render: 'transportInfo', className: 'text-center', width: '250px' }, + { 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: '装卸方式', 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: '收款人姓名', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '收款人身份证号码', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '装货照片', render: 'transportInfo', className: 'text-center', width: '150px' }, + { title: '卸货照片', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '提货单', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '签收单', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '最近上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, ]; } @@ -388,17 +388,17 @@ export class TaxManagementOrderReportingComponent implements OnInit { * 查看校验结果 */ viewResult(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '校验结果', - // nzWidth: 1200, - // nzContent: DatatableReportingVerifyResultComponent, - // nzComponentParams: { - // record: item - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // }) + const modalRef = this.modal.create({ + nzTitle: '本地校验结果', + nzWidth: 1200, + nzContent: TaxManagementOrderVerifyResultComponent, + nzComponentParams: { + record: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) } /** diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html new file mode 100644 index 00000000..e155b1bd --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -0,0 +1,23 @@ +
+
+ + + +
+
+ + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+ + +
+
+
+ + +
diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts new file mode 100644 index 00000000..48b1e9e5 --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingVerifyResultComponent } from './verify-result.component'; + +describe('DatatableReportingVerifyResultComponent', () => { + let component: DatatableReportingVerifyResultComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingVerifyResultComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingVerifyResultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts new file mode 100644 index 00000000..1d9b4d9e --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts @@ -0,0 +1,94 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-30 14:26:01 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-30 14:28:54 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +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 { TaxManagementService } from '../../../services/tax-management.service'; + +@Component({ + selector: 'app-tax-management-order-reporting-verify-result', + templateUrl: './verify-result.component.html', +}) +export class TaxManagementOrderVerifyResultComponent 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' }, + { name: '订单信息', value: '4' }, + ]; + + get reqParams() { + return {}; + } + constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) { + + } + + ngOnInit(): void { + this.initST(); + } + + /** + * 初始化数据列表 + */ + 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: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', }, + { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', }, + ] + } + + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + + selectTab(e: any) { + + } + + update() { + if (this.record?.billType === '1') { + window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`) + + } else if (this.record.billType === '2') { + window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`); + } + + + } + close(): void { + this.modalRef.destroy(); + } + + +} diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index 9cb1ff61..a4cbfa9b 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -4,18 +4,20 @@ * @Author : Shiming * @Date : 2022-03-30 13:58:28 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:14:57 + * @LastEditTime : 2022-03-30 14:27:22 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\taxmanagement.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { NgModule, Type } from '@angular/core'; import { SharedModule, SHARED_G2_MODULES } from '@shared'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; +import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component'; import { TaxManagementModuleRoutingModule } from './tax-management-routing.module'; const COMPONENTS: Type[] = [ - TaxManagementOrderReportingComponent + TaxManagementOrderReportingComponent, + TaxManagementOrderVerifyResultComponent ] From 1eef13738164371fca955f6a2c78477fc0e4d5c6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:41:49 +0800 Subject: [PATCH 3/8] fix bug --- .../order-reporting.component.html | 3 +- .../order-reporting.component.ts | 40 +++++-- .../upload-setting.component.html | 8 ++ .../upload-setting.component.spec.ts | 24 ++++ .../upload-setting.component.ts | 110 ++++++++++++++++++ .../tax-management/taxmanagement.module.ts | 6 +- 6 files changed, 179 insertions(+), 12 deletions(-) create mode 100644 src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.html create mode 100644 src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.spec.ts create mode 100644 src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.ts 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 943a1e69..564e2b27 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-30 14:00:43 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:20:03 + * @LastEditTime : 2022-03-30 14:41:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -42,6 +42,7 @@ {{item?.billStatusLabel}} {{item?.billStatusLabel}} + 异常 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 1e0d1759..cfc68535 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 @@ -7,6 +7,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; +import { TaxManagementUploadSettingComponent } from './upload-setting/upload-setting.component'; import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component'; // import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; // import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @@ -311,6 +312,27 @@ export class TaxManagementOrderReportingComponent implements OnInit { } }); + } + /** + *撤销 + * @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(); + } + }) + } + }); + } selectChange(item: any) { @@ -373,15 +395,15 @@ export class TaxManagementOrderReportingComponent implements OnInit { * @param params 上传设置 */ uploadSetting() { - // const modalRef = this.modal.create({ - // nzTitle: '上传设置', - // nzWidth: 600, - // nzContent: DatatableReportingUploadSettingComponent, - // nzComponentParams: {}, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // }) + const modalRef = this.modal.create({ + nzTitle: '税务上传设置', + nzWidth: 600, + nzContent: TaxManagementUploadSettingComponent, + nzComponentParams: {}, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) } /** diff --git a/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.html b/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.html new file mode 100644 index 00000000..a4f5ae6e --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.html @@ -0,0 +1,8 @@ + + +
+ + +
+ diff --git a/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.spec.ts b/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.spec.ts new file mode 100644 index 00000000..aeb5cf2c --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingUploadSettingComponent } from './upload-setting.component'; + +describe('DatatableReportingUploadSettingComponent', () => { + let component: DatatableReportingUploadSettingComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingUploadSettingComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingUploadSettingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.ts b/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.ts new file mode 100644 index 00000000..f171259e --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/upload-setting/upload-setting.component.ts @@ -0,0 +1,110 @@ +import { Component, OnInit } from '@angular/core'; +import { SFSchema, SFUISchema } from '@delon/form'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { TaxManagementService } from '../../../services/tax-management.service'; + + +@Component({ + selector: 'app-datatable-upload-setting', + templateUrl: './upload-setting.component.html', +}) +export class TaxManagementUploadSettingComponent implements OnInit { + record: any = {}; + i: any = {}; + schema!: SFSchema; + ui!: SFUISchema; + + constructor( + private modal: NzModalRef, + public service: TaxManagementService + ) { } + + ngOnInit(): void { + this.initSF(); + // this.loadData(); + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + no: { + type: 'string', + title: '订单数据', + enum: [ + { + label: '手动上传', + value: '1' + }, + { + label: '自动上传', + value: '2' + } + ], + description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传', + ui: { + widget: 'radio', + + } + }, + owner: { + type: 'string', + title: '资金数据', + enum: [ + { + label: '手动上传', + value: '1' + }, + { + label: '自动上传', + value: '2' + } + ], + description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传', + ui: { + widget: 'radio', + + } + }, + }, + required: ['owner', 'no'], + } + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 24 }, + }, + }; + } + + /** + * 获取设置数据 + */ + loadData() { + this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => { + if (res) { + this.i = res; + + } + }) + } + + /** + * 修改 + * @param value + */ + save(value: any): void { + this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => { + if (res) { + this.service.msgSrv.success('保存成功'); + this.modal.close(true); + } + }) + } + + close(): void { + this.modal.destroy(); + } +} diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index a4cbfa9b..bb28e051 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -4,20 +4,22 @@ * @Author : Shiming * @Date : 2022-03-30 13:58:28 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:27:22 + * @LastEditTime : 2022-03-30 14:35:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\taxmanagement.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { NgModule, Type } from '@angular/core'; import { SharedModule, SHARED_G2_MODULES } from '@shared'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; +import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component'; import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component'; import { TaxManagementModuleRoutingModule } from './tax-management-routing.module'; const COMPONENTS: Type[] = [ TaxManagementOrderReportingComponent, - TaxManagementOrderVerifyResultComponent + TaxManagementOrderVerifyResultComponent, + TaxManagementUploadSettingComponent ] From 3141de13570269397fe72887e1c6acbd969a92c4 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:44:03 +0800 Subject: [PATCH 4/8] fix bug --- .../order-reporting.component.html | 2 +- .../order-reporting/order-reporting.component.ts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) 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 564e2b27..32d82bd3 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 @@ -63,7 +63,7 @@ - + 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 cfc68535..c0707690 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 @@ -313,6 +313,22 @@ export class TaxManagementOrderReportingComponent implements OnInit { }); } + /** + *撤销 + * @param record 记录实例 + */ + resetData() { + 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('更新成功'); + this.search(); + } + }) + } /** *撤销 * @param record 记录实例 From abf59f38e7d11a9a974e5e73dffd6cbd16ac0234 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 30 Mar 2022 14:55:49 +0800 Subject: [PATCH 5/8] edit --- proxy.conf.js | 2 +- .../components/list/list.component.ts | 41 ++++++++----------- .../cancellation-invoice.component.html | 2 +- .../invoice-detail.component.html | 2 +- .../invoice-requested-detail.component.html | 2 +- .../invoice-requested.component.html | 2 +- .../invoice-requested.component.ts | 11 ++--- .../driver/detail/detail.component.html | 2 +- .../driver/detail/detail.component.ts | 19 ++++++--- 9 files changed, 42 insertions(+), 41 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 10071e14..67c15ee2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,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/download/components/list/list.component.ts b/src/app/routes/download/components/list/list.component.ts index 00b3626b..05f38c4c 100644 --- a/src/app/routes/download/components/list/list.component.ts +++ b/src/app/routes/download/components/list/list.component.ts @@ -8,7 +8,7 @@ import { DownloadService } from '../../services/download.service'; @Component({ selector: 'app-download-center-components-list', - templateUrl: './list.component.html', + templateUrl: './list.component.html' }) export class DownloadComponentsListComponent implements OnInit { ui: SFUISchema = {}; @@ -24,7 +24,7 @@ export class DownloadComponentsListComponent implements OnInit { get reqParams() { const params = Object.assign({}, this.sf?.value || {}); delete params._$expand; - return { ...params }; + return { ...params, createTime: params?.createTime?.start, applyEndTime: params?.createTime?.end }; } /** @@ -49,23 +49,18 @@ export class DownloadComponentsListComponent implements OnInit { properties: { _$expand: { type: 'boolean', - ui: { hidden: true }, + ui: { hidden: true } }, - applyStartTime: { + createTime: { type: 'string', title: '创建时间', ui: { - widget: 'date', - format: 'yyyy-MM-dd', - end: 'applyEndTime', - } as SFDateWidgetSchema, - }, - applyEndTime: { - type: 'string', - title: '', - ui: { widget: 'date', end: 'end' } as SFDateWidgetSchema, - }, - }, + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + } + } }; this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } }; } @@ -87,8 +82,8 @@ export class DownloadComponentsListComponent implements OnInit { enum: { 0: '生成中', 1: '已完成', - 2: '失败', - }, + 2: '失败' + } }, { title: '下载次数', index: 'downloadCount', width: '120px', className: 'text-center' }, { title: '创建时间', index: 'createTime', width: '120px', className: 'text-center' }, @@ -98,10 +93,8 @@ export class DownloadComponentsListComponent implements OnInit { fixed: 'right', width: '170px', className: 'text-center', - buttons: [ - { text: '下载', click: (_record) => this.download(_record)}, - ], - }, + buttons: [{ text: '下载', click: _record => this.download(_record) }] + } ]; } @@ -115,12 +108,12 @@ export class DownloadComponentsListComponent implements OnInit { nzTitle: '删除确认', nzContent: `即将删除 当前行数据,请仔细核对,避免误操作！
是否删除？
`, nzOnOk: () => - this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe((res) => { + this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe(res => { if (res) { this.service.msgSrv.success('数据删除成功！'); this.st?.reload(); } - }), + }) }); } download(record: STData) { @@ -129,7 +122,7 @@ export class DownloadComponentsListComponent implements OnInit { this.service.encodeUrlHeader(this.service.$api_download_file, headers), {}, { fileKey: record.fileUniqueKey }, - 'POST', + 'POST' ); } } diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 80d1837f..04fdad70 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -12,7 +12,7 @@
- + - +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 14f0808f..2d05f3d4 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -83,7 +83,7 @@ class="text-right"> - + - + + + + + + + + + + + + + + + {{ item?.billStatusLabel }} + {{ item?.billStatusLabel }} + 异常 + + + + {{ item?.billStatusLabel }} + {{ item?.billStatusLabel }} + + +
{{ item?.amount | currency: ' ' }}
+ + + + +
+
+ 已选择 + {{ selectedRows.length }} 条数据 +
+ + + + +
+ + + + +
司机姓名：张三/13812345678
+
是否确认要将该司机的起征点同步调整为超过15万？
+ + + + + + diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.less b/src/app/routes/tax-management/components/individual-income/individual-income.component.less new file mode 100644 index 00000000..43a47df4 --- /dev/null +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.less @@ -0,0 +1,5 @@ +:host { + .text-black { + color: #000; + } +} diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts new file mode 100644 index 00000000..d90f71c0 --- /dev/null +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts @@ -0,0 +1,34 @@ +/* + * @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 { TaxManagementIndividualIncomeComponent } from './individual-income.component'; + +describe('TaxManagementIndividualIncomeComponent', () => { + let component: TaxManagementIndividualIncomeComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ TaxManagementIndividualIncomeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TaxManagementIndividualIncomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..cc2fe881 --- /dev/null +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -0,0 +1,423 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { 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-income', + templateUrl: './individual-income.component.html', + styleUrls: ['./individual-income.component.less'] +}) +export class TaxManagementIndividualIncomeComponent 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: '' } + ]; + selectedIndex = ''; //选择的项目 + serviceTel = ''; + isVisible : boolean = false + constructor( + public service: TaxManagementService, + private router: Router, + private ar: ActivatedRoute, + public shipperservice: ShipperBaseService, + private modal: NzModalService, + public shipperSrv: ShipperBaseService + ) {} + + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + + /** + * 查询参数 + */ + get reqParams() { + const params = Object.assign({}, this.sf?.value || {}, { + representationsStatus: this.selectedIndex + }); + delete params._$expand; + return { ...params }; + } + + /** + * 选中行 + */ + get selectedRows() { + return this.st?.list.filter((item: any) => item.checked) || []; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + /** + * 程序初始化入口 + */ + ngOnInit() { + this.initSF(); + this.initST(); + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } }, + resourceCode: { + type: 'string', + title: '联系电话', + ui: { + placeholder: '请输入' + } + }, + driverName: { + title: '证件号码', + type: 'string', + ui: { + placeholder: '请输入证件号码' + } + }, + serviceType2: { + title: '申报状态', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + serviceType3: { + title: '申报结果', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + serviceType1: { + title: '是否逾期', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + createTime: { + title: '税款所属期', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + createTime3: { + title: '申报日期', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + enterpriseInfoId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } + } + } + }; + this.ui = { + '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, + $time: { grid: { span: 24 } } + }; + } + + /** + * 初始化数据列表 + */ + 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: '税款所属期起', + render: 'billComplianceVOS', + className: 'text-center', + width: '150px' + }, + { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' }, + { + title: '纳税人名称', + render: 'serviceType', + className: 'text-center', + width: '180px' + }, + { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '行政区划', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, + { title: '街道乡镇', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, + { title: '税务机关', render: 'driver', className: 'text-center', width: '180px' }, + { title: '姓名', render: 'payeeName', className: 'text-center', width: '180px' }, + { title: '证件类型', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '联系电话', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, + { title: '国籍（地区）', render: 'driver', className: 'text-center', width: '150px' }, + { title: '生产经营地行政区划', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '当月应税收入', render: 'amount', className: 'text-center', width: '250px' }, + { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '应税所得率', render: 'transportInfo', className: 'text-center', width: '250px' }, + { 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: '应纳税额', 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' }, + ]; + } + + /** + *撤销 + * @param record 记录实例 + */ + recall() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要撤回的数据'); + 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 记录实例 + */ + resetData() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要更新的数据！'); + return; + } + this.isVisible = true + + } + /** + *撤销 + * @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(); + } + }); + } + }); + } + + selectChange(item: any) { + this.selectedIndex = item?.representationsStatus || ''; + 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('请选择需要上传的数据'); + return; + } + // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('申报成功'); + // this.search(); + // } + // }) + } + + /** + * + * @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('更新成功'); + // this.search(); + // } + // }) + } + + /** + * 查看校验结果 + */ + 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); + } + + /** + * 异步导出 + */ + 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 + }); + } + handleOK() { + + } + handleCancel() { + this.isVisible = false; + } +} 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 32d82bd3..d672ffea 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-30 14:00:43 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:41:01 + * @LastEditTime : 2022-03-30 15:29:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less index 43a47df4..59e4c77b 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less @@ -2,4 +2,13 @@ .text-black { color: #000; } + .icon { + display: inline-block; + width: 1em; + height: 1em; + stroke-width: 0; + stroke: currentColor; + /* stylelint-disable-next-line order/properties-order */ + fill: currentColor; + } } diff --git a/src/app/routes/tax-management/tax-management-routing.module.ts b/src/app/routes/tax-management/tax-management-routing.module.ts index ab3e2090..f3a1c496 100644 --- a/src/app/routes/tax-management/tax-management-routing.module.ts +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -1,10 +1,22 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-30 13:58:28 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-30 15:33:48 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\tax-management-routing.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; const routes: Routes = [ { path: 'orderReport', component: TaxManagementOrderReportingComponent }, + { path: 'income', component: TaxManagementIndividualIncomeComponent }, ]; diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index bb28e051..76dc61c0 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -10,6 +10,7 @@ */ import { NgModule, Type } from '@angular/core'; import { SharedModule, SHARED_G2_MODULES } from '@shared'; +import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component'; import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component'; @@ -19,7 +20,8 @@ import { TaxManagementModuleRoutingModule } from './tax-management-routing.modul const COMPONENTS: Type[] = [ TaxManagementOrderReportingComponent, TaxManagementOrderVerifyResultComponent, - TaxManagementUploadSettingComponent + TaxManagementUploadSettingComponent, + TaxManagementIndividualIncomeComponent ] diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 42431b26..a1e082d1 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -681,6 +681,10 @@ { "text": "订单上报", "link": "/tax/orderReport" + }, + { + "text": "个税明细", + "link": "/tax/income" } ] }