diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html index 13411ab5..1495916b 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html @@ -3,12 +3,27 @@ + + {{item.totalInvoicedAmount | currency}} + + + {{item.invAmountMonth | currency}} + + + {{item.applyWaitInvAmount | currency}} + + + {{item.unInvoicedAmountHistory | currency}} + + + {{item.unInvoicedAmountCurMonth | currency}} + diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts index 9916e4c4..fd61e55f 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts @@ -1,7 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; +import { DataService } from '../../services/data.service'; @Component({ selector: 'app-datatable-invoicetable', @@ -13,7 +14,7 @@ export class DatatableInvoicetableComponent implements OnInit { columns!: STColumn[]; data=[{name1:1111}] - constructor(private http: _HttpClient, private modal: ModalHelper) { } + constructor(private http: _HttpClient, private modal: ModalHelper,public service :DataService) { } /** * 查询参数 @@ -23,48 +24,48 @@ export class DatatableInvoicetableComponent implements OnInit { } ngOnInit(): void { this.initST(); + } initST() { this.columns = [ { title: '运营主体', - index: 'name1' + index: 'operationName' }, { title: '已开票总金额', - index: 'name1' + index: 'totalInvoicedAmount', + render: 'totalInvoicedAmount', }, { title: '当月已开票金额', - index: 'name1' + index: 'invAmountMonth', + render: 'invAmountMonth', + }, + { + title: '当月已开票张数', + index: 'numInvAmountMonth', }, { title: '已申请待开金额', - index: 'name1' + index: 'applyWaitInvAmount', + render: 'applyWaitInvAmount', + }, + { + title: '申请待开客户', + index: 'applyWaitCustomer', }, { title: '未申请开票金额（历史）', - index: 'name1' + index: 'unInvoicedAmountHistory', + render: 'unInvoicedAmountHistory', }, { title: '未申请开票金额（当月）', - index: 'name1' + index: 'unInvoicedAmountCurMonth', + render: 'unInvoicedAmountCurMonth', }, - { - title: '当月发票张数', - index: 'name1' - }, - { - title: '剩余发票张数', - index: 'name1' - }, - ]; } - add(): void { - // this.modal - // .createStatic(FormEditComponent, { i: { id: 0 } }) - // .subscribe(() => this.st.reload()); - } } diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index be36c9cf..4522bacd 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -24,6 +24,9 @@ export class DataService extends BaseService { // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; + // 查询开票数据报表 + $api_findInvoiceReport = `/api/fcc/invoiceReport/findInvoiceReport`; + constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index c20719db..1ee4249a 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -544,16 +544,22 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { nzTitle: `已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？`, nzContent: `确认后单据不可修改，请谨慎操作。`, nzOnOk: () => - this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => { - if (res === true) { - this.service.msgSrv.success('操作成功！'); - this.st?.reload(1); - this.getGoodsSourceStatistical(); - this.initST(); - } - this.st?.reload(1); - this.getGoodsSourceStatistical(); - }) + // this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => { + // if (res === true) { + // this.service.msgSrv.success('操作成功！'); + // this.st?.reload(1); + // this.getGoodsSourceStatistical(); + // this.initST(); + // } + // this.st?.reload(1); + // this.getGoodsSourceStatistical(); + // }) + { + this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params}) + + + this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})} + }); } // 获取所属项目 diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 4955b61e..21b45d1c 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 11:07:48 + * @LastEditTime : 2022-03-30 16:08:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -163,6 +163,15 @@ export class OrderManagementService extends ShipperBaseService { // 异常预警 public $api_getAbnormalWarningByBillId = '/api/sdc/abnormalWarning/getAbnormalWarningByBillId'; + // 生成卸货单 + public $api_createBillDischargeGoods = '/api/sdc/billOperate/createBillDischargeGoods'; + // 生成提货单 + public $api_createBillTakeGoods = '/api/sdc/billOperate/createBillTakeGoods'; + // 生成卸货单-页面展示 + public $api_getBillDischargeGoodsVO = '/api/sdc/billOperate/getBillDischargeGoodsVO'; + // 生成提货单-页面展示 + public $api_getBillTakeGoodsVO = '/api/sdc/billOperate/getBillTakeGoodsVO'; + getDictByKey(dictKey: string) { const params = { dictKey: dictKey }; return this.request(this.$api_getDictValue, params); diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index a334b188..3ee63aed 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -528,7 +528,7 @@ export class NetworkFreightComponent implements OnInit { } // 应用设置 settingApp(item?: any) { - this.nzModalService.create({ + const modalRef = this.nzModalService.create({ nzTitle: '应用设置', nzContent: DynamicSettingModalComponent, nzWidth: 900, @@ -539,6 +539,12 @@ export class NetworkFreightComponent implements OnInit { }, nzFooter: null }); + modalRef.afterClose.subscribe((res: boolean) => { + if (res) { + this.resetSF; + this.st.load(); + } + }) } // 重置账户 settingPay(item?: any) { diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html new file mode 100644 index 00000000..de71d3e2 --- /dev/null +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -0,0 +1,91 @@ + + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + {{ 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 5ab12419..95304139 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/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index ad538887..dc7ee992 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -23,7 +23,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { detailData: any; userDetail: any; contencarModel: any; - changeSub = new Subject(); facetext: any; faceStatus: any = 0; userIdentityDetail: any = {}; @@ -76,7 +75,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { ngOnInit() { this.initData(); this.initDetailByCode(); - this.changeEndKmAction(); } initData() { // 获取司机头部信息 @@ -210,25 +208,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { /** 审核通过驾驶员信息 */ approveDriver() { + this.nzModalService.confirm({ nzTitle: '审核通过', nzContent: `

驾驶证号：${this.driverDetail?.licenseNo}

从业资格证号：${this.licenseDetail?.licenseNo}

是否确认通过审核`, nzOnOk: () => { - this.changeEndKmAction(); + this.adjuctDriverLicense( + { + approvalStatus: 20, + appUserId: this.userDetail?.appUserId + }, + '审核成功' + ); } }); } - changeEndKmAction() { - this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { - this.adjuctDriverLicense( - { - approvalStatus: 20, - appUserId: this.userDetail?.appUserId - }, - '审核成功' - ); - }); - } + /** 驳回驾驶员信息 */ rejectedDriver() { this.approvalOpinion = ''; diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 6cb03f06..743e721c 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 16:03:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-09 16:17:28 + * @LastEditTime : 2022-03-30 16:50:35 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -100,7 +100,7 @@ - + diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 0523979a..14ba8893 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 16:03:45 * @LastEditors : Shiming - * @LastEditTime : 2022-02-22 19:59:59 + * @LastEditTime : 2022-03-30 16:50:00 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ 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" } ] }