-
-
-
+
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index 312a5e7d..0f607efa 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -436,14 +436,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
map((res: any) => {
return [...res];
})
- );
+ )
},
change: (tag: any, org: any) => {
- if (tag === '3') {
+ if(tag === '3'){
this.sf5.setValue('/insurancePremium', null);
this.sf5.setValue('/insuranceRate', null);
- } else {
- console.log(tag);
+ }else {
this.getInsurersPrice(tag);
}
}
@@ -453,29 +452,23 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
type1: {
type: 'string',
title: '',
- enum: ['货源曝光率 +10', '车源匹配率 +10'],
- readOnly: true,
ui: {
- widget: 'checkbox',
+ widget: 'custom',
visibleIf: { insuranceType: (value: string) => value === '0' }
- } as SFCheckboxWidgetSchema,
- default: ['货源曝光率 +10', '车源匹配率 +10']
+ } ,
},
type2: {
type: 'string',
title: '',
- enum: ['货源曝光率 +20', '车源匹配率 +20'],
- readOnly: true,
ui: {
- widget: 'checkbox',
+ widget: 'custom',
visibleIf: { insuranceType: (value: string) => value === '1' }
- } as SFCheckboxWidgetSchema,
- default: ['货源曝光率 +20', '车源匹配率 +20']
+ }
},
insurancePremium: {
type: 'string',
title: '服务包费用',
- readOnly: true,
+ readOnly:true,
ui: {
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
@@ -502,9 +495,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value === '1' }
}
- }
+ },
},
- required: ['insurancePremium']
+ required: [ 'insurancePremium']
};
this.ui5 = {
'*': {
@@ -962,6 +955,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
...this.sf6.value,
expenseDTOList: expenseList,
paymentDays: this.sf7.value.paymentDays,
+ subtotal :this.sf7.value.subtotal,
+ total:this.sf7.value.total,
estimatedKilometers: this.totalDistance,
estimatedTravelTime: this.totalTime,
insurancePackagedGoods: this.sf4.value.insurancePackagedGoods,
@@ -1192,7 +1187,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
getInsurersPrice(insuranceType = this.sf5.value?.insuranceType) {
console.log(insuranceType);
console.log(this.totalDistance);
- if (insuranceType !== '3' && this.sf4.value?.goodsValue >= 50000 && this.totalDistance > 0) {
+ if (insuranceType !== '3' && this.totalDistance > 0) {
const params = {
insuranceType,
goodsValue: this.sf4.value.goodsValue,
@@ -1209,4 +1204,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
});
}
}
+ // 运费信息价格变更
+ priceChange(event:any, i:any){
+ i.setValue(event);
+ if(event>=99999){
+ this.modalService.warning({
+ nzTitle: '可输入的最大金额为99999元',
+ });
+ }
+ this.payChange()
+ }
}
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index b3aeafc6..b192689d 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -159,10 +159,10 @@
{{ i?.insuranceTypeLabel}}
-
+
{{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
-
+
{{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
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
new file mode 100644
index 00000000..f942e824
--- /dev/null
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item?.amount | currency: ' ' }}
+
+
+
+
+
+
+ 已选择
+ {{ selectedRows.length }} 条数据
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item?.amount | currency: ' ' }}
+
+
+
+
+
+
+ 已选择
+ {{ selectedRows.length }} 条数据
+
+
+
+
+
+
司机姓名：张三/13812345678
+ 是否确认要将该司机的起征点同步调整为超过15万？
+
+
+
+
+
+
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.less b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.less
new file mode 100644
index 00000000..43a47df4
--- /dev/null
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.less
@@ -0,0 +1,5 @@
+:host {
+ .text-black {
+ color: #000;
+ }
+}
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts
new file mode 100644
index 00000000..23f9fc25
--- /dev/null
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.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-31 10:36:54
+ * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-declare\\individual-declare.component.spec.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TaxManagementIndividualDeclareComponent } from './individual-declare.component';
+
+describe('TaxManagementIndividualDeclareComponent', () => {
+ let component: TaxManagementIndividualDeclareComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ TaxManagementIndividualDeclareComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(TaxManagementIndividualDeclareComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
new file mode 100644
index 00000000..aabc62f5
--- /dev/null
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@@ -0,0 +1,431 @@
+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-declare',
+ templateUrl: './individual-declare.component.html',
+ styleUrls: ['./individual-declare.component.less']
+})
+export class TaxManagementIndividualDeclareComponent 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();
+ const object1 : any = {};
+ const object2 : any = {};
+ Object.defineProperty(object1, 'name',{ writable: false ,value: 'wang'});
+ Object.defineProperty(object2, 'xxoo',{ writable: false ,value: 'wang'});
+ console.log(object1);
+ console.log(object1.name);
+ console.log(object2);
+ console.log(object2.xxoo);
+ object1.name = 'ming'
+ object2.xxoo = 'ming'
+ console.log(object1);
+ console.log(object2);
+ }
+
+ /**
+ * 初始化查询表单
+ */
+ 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: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '联系电话', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '国家（地区）', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '所属行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '征收项目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '征收品目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '计税依据', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { title: '税率', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
+ { 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: 'payeeName', className: 'text-center', width: '150px' },
+ { 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/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html
index de71d3e2..8f9d0783 100644
--- 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
@@ -1,5 +1,5 @@
-
+ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="false">
{{ item?.billStatusLabel }}
{{ item?.billStatusLabel }}
@@ -79,7 +65,8 @@
-
+
司机姓名：张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万？
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 95304139..5ce02b5a 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
@@ -35,7 +35,7 @@
-
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
index 8d3df409..91c1d871 100644
--- 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
@@ -5,7 +5,7 @@
-
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 07033423..ed893c38 100644
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/src/app/routes/tax-management/services/tax-management.service.ts
@@ -26,7 +26,7 @@ export class TaxManagementService extends BaseService {
// 查询运营报表
$api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
- $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
+ $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
$api_recall_reporting = ``; // 撤回
$api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = ``; // 修改上传设置
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 f3a1c496..84b09d08 100644
--- a/src/app/routes/tax-management/tax-management-routing.module.ts
+++ b/src/app/routes/tax-management/tax-management-routing.module.ts
@@ -4,12 +4,14 @@
* @Author : Shiming
* @Date : 2022-03-30 13:58:28
* @LastEditors : Shiming
- * @LastEditTime : 2022-03-30 15:33:48
+ * @LastEditTime : 2022-03-31 10:37:24
* @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 { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
+import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
@@ -17,6 +19,8 @@ import { TaxManagementOrderReportingComponent } from './components/order-reporti
const routes: Routes = [
{ path: 'orderReport', component: TaxManagementOrderReportingComponent },
{ path: 'income', component: TaxManagementIndividualIncomeComponent },
+ { path: 'collect', component: TaxManagementIndividualCollectComponent },
+ { path: 'declare', component: TaxManagementIndividualDeclareComponent },
];
diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts
index 76dc61c0..92dbda10 100644
--- a/src/app/routes/tax-management/taxmanagement.module.ts
+++ b/src/app/routes/tax-management/taxmanagement.module.ts
@@ -10,6 +10,8 @@
*/
import { NgModule, Type } from '@angular/core';
import { SharedModule, SHARED_G2_MODULES } from '@shared';
+import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
+import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
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';
@@ -21,7 +23,9 @@ const COMPONENTS: Type[] = [
TaxManagementOrderReportingComponent,
TaxManagementOrderVerifyResultComponent,
TaxManagementUploadSettingComponent,
- TaxManagementIndividualIncomeComponent
+ TaxManagementIndividualIncomeComponent,
+ TaxManagementIndividualCollectComponent,
+ TaxManagementIndividualDeclareComponent
]
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
index 5911e06b..c9f454ad 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@@ -339,6 +339,7 @@ export class CancellationInvoiceComponent implements OnInit {
click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId])
},
{ title: '申请时间', index: 'createTime', type: 'date', width: 150 },
+ { title: '发票类型', index: 'vatapptypeLabel', width: 150 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '购买人', index: 'artoname', width: 160 },
{ title: '订单数', index: 'ordlines', width: 90, className: 'text-right' },
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
index d8ff45cb..afc5e4d0 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
@@ -123,7 +123,7 @@ export class InputInvoiceComponent implements OnInit {
title: '发票类型',
ui: {
widget: 'dict-select',
- params: { dictKey: 'refund:apply:status' },
+ params: { dictKey: 'DictConstants.INVOICE_TYPE' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
@@ -154,14 +154,19 @@ export class InputInvoiceComponent implements OnInit {
sts: {
type: 'string',
title: '收票状态',
+ enum: [
+ { value: '', label: '全部' },
+ { value: 1, label: '是' },
+ { value: 0, label: '否' }
+ ],
ui: {
- widget: 'dict-select',
- params: { dictKey: 'refund:apply:status' },
+ widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
- }
+ },
+ default: ''
},
invdate: {
type: 'string',
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 2d05f3d4..b4501159 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
@@ -25,7 +25,7 @@
{{headerInfo?.vatinvHNum}}
- {{headerInfo?.reciname}}
+ {{headerInfo?.reciname}}/{{headerInfo?.recitel}}
{{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index a1e082d1..1aee4bad 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -685,6 +685,14 @@
{
"text": "个税明细",
"link": "/tax/income"
+ },
+ {
+ "text": "个税汇总",
+ "link": "/tax/collect"
+ },
+ {
+ "text": "税务申报",
+ "link": "/tax/declare"
}
]
}