diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index f74c02e8..a942aff9 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 20:22:46 + * @LastEditTime : 2022-03-30 10:45:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -95,7 +95,9 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '订单补充协议', value: '2' }, { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, - { label: '委托代收合同', value: '5' } + { label: '委托代收合同', value: '5' }, + { label: '电子提货单', value: '10' }, + { label: '电子卸货单', value: '11' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts index b50e7764..162d6391 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.ts +++ b/src/app/routes/datatable/components/compliance/index/index.component.ts @@ -82,14 +82,6 @@ export class DatatableComplianceIndexComponent implements OnInit { } - data = [ - { Date: '22 February', 订单合格率: 50000, 付款及时率: 125000 }, - { Date: '28 February', 订单合格率: 60000, 付款及时率: 150000 }, - { Date: '3 March', 订单合格率: 100000, 付款及时率: 250000 }, - { Date: '20 March', 订单合格率: 200000, 付款及时率: 500000 }, - { Date: '7 April', 订单合格率: 250000, 付款及时率: 625000 }, - { Date: '13 June', 订单合格率: 210000, 付款及时率: 525000 } - ]; render(el: ElementRef) { this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); } @@ -102,24 +94,105 @@ export class DatatableComplianceIndexComponent implements OnInit { }); // 以三组数据为例, 需要展示 91/92/93年中a/b/c数据走势 const data = [ - {x: '1991', z: 'a', y: 1}, - {x: '1991', z: 'b', y: 2}, - {x: '1991', z: 'c', y: 3}, + { data: '1月', label: '订单合格率', value: 5 }, + { data: '2月', label: '订单合格率', value: 10 }, + { data: '3月', label: '订单合格率', value: 25 }, + { data: '4月', label: '订单合格率', value: 35 }, + { data: '5月', label: '订单合格率', value: 15 }, + { data: '6月', label: '订单合格率', value: 5 }, + { data: '7月', label: '订单合格率', value: 95 }, + { data: '8月', label: '订单合格率', value: 45 }, - {x: '1992', z: 'a', y: 11}, - {x: '1992', z: 'b', y: 22}, - {x: '1992', z: 'c', y: 33}, - - {x: '1993', z: 'a', y: 1}, - {x: '1993', z: 'b', y: 2}, - {x: '1993', z: 'c', y: 3} - ]; + { data: '1月', label: '付款及时率', value: 10 }, + { data: '2月', label: '付款及时率', value: 15 }, + { data: '3月', label: '付款及时率', value: 30 }, + { data: '4月', label: '付款及时率', value: 8 }, + { data: '5月', label: '付款及时率', value: 9 }, + { data: '6月', label: '付款及时率', value: 5 }, + { data: '7月', label: '付款及时率', value: 80 }, + { data: '8月', label: '付款及时率', value: 55 }, + + { data: '1月', label: '货源占比率', value: 90 }, + { data: '2月', label: '货源占比率', value: 30 }, + { data: '3月', label: '货源占比率', value: 45 }, + { data: '4月', label: '货源占比率', value: 35 }, + { data: '5月', label: '货源占比率', value: 95 }, + { data: '6月', label: '货源占比率', value: 35 }, + { data: '7月', label: '货源占比率', value: 65 }, + { data: '8月', label: '货源占比率', value: 63 }, + + { data: '1月', label: '运费直付占比', value: 30 }, + { data: '2月', label: '运费直付占比', value: 60 }, + { data: '3月', label: '运费直付占比', value: 25 }, + { data: '4月', label: '运费直付占比', value: 35 }, + { data: '5月', label: '运费直付占比', value: 15 }, + { data: '6月', label: '运费直付占比', value: 55 }, + { data: '7月', label: '运费直付占比', value: 50 }, + { data: '8月', label: '运费直付占比', value: 30 }, + ]; chart.data(data); + //刻度自定义 + chart.scale({ + data: { + range: [0, 1], + }, + value: { + min: 0, + nice: true, + }, + }); + // 图表下方图形文字自定义 + chart.legend({ + items:[ + { + name: '订单合格率', + value: 'node_load1', + marker: { + symbol: 'circle', + style: {fill: '#6193f7'} + }, + }, + { + name: '付款及时率', + value: 'node_load2', + marker: {symbol: 'circle',style: {fill: '#58d3a2'}}, + }, + { + name: '货源占比率', + value: 'node_load13', + marker: {symbol: 'circle',style: {fill: '#5b6d8f'}}, + }, + { + name: '运费直付占比', + value: 'node_load13', + marker: {symbol: 'circle',style: {fill: '#f0b915'}}, + }, + ] + }); + // 提示自定义 + chart.tooltip({ + showCrosshairs: true, + shared: true, + }); + + //数据格式化 + chart.axis('value', { + label: { + formatter: (val) => { + return val + ' %'; + }, + }, + }); // 在x*y的坐标点上按z值绘制线条, 如果z值相同将使用直线连接 - chart.line().position('x*y').color('z'); + chart.line().position('data*value').color('label').tooltip('label*value', (name:any, value:any) => { + return { + name: name, + value: value + '%' + }; + });; // 在x*y的坐标上按z值绘制圆点 - chart.point().position('x*y').size(4).color('z').shape('circle'); + chart.point().position('data*value').size(4).color('label').shape('circle'); chart.render(); } } diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index fabd9c40..0ac5eb06 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -13,6 +13,7 @@ import { DatatableInvoicetableComponent } from './components/invoicetable/invoic import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component'; import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component'; import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component'; +import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component'; const routes: Routes = [ { path: 'dataindex', component: DatatableDataindexComponent }, @@ -28,8 +29,9 @@ const routes: Routes = [ { path: 'financetable', component: DatatableFinancetableComponent }, { path: 'invoicetable', component: DatatableInvoicetableComponent }, { path: 'reporting/fund', component: DatatableFundReportingComponent } -]; - + , + { path: 'fund-info', component: DatatableReportingFundInfoComponent }]; + @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index 000615f8..f361242a 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -17,6 +17,7 @@ import { DatatableComplianceCustomerComponent } from './components/compliance/cu import { DatatableReportingUploadSettingComponent } from './reporting/components/upload-setting/upload-setting.component'; import { DatatableReportingVerifyResultComponent } from './reporting/components/verify-result/verify-result.component'; import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component'; +import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -35,8 +36,9 @@ const COMPONENTS: Type[] = [ DatatableReportingUploadSettingComponent, DatatableReportingVerifyResultComponent, DatatableFundReportingComponent -] - + , + DatatableReportingFundInfoComponent] + @NgModule({ imports: [ diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html new file mode 100644 index 00000000..4f50f097 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -0,0 +1,15 @@ + + + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+ + + +
+ +
diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts new file mode 100644 index 00000000..09d9ac30 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingFundInfoComponent } from './fund-info.component'; + +describe('DatatableReportingFundInfoComponent', () => { + let component: DatatableReportingFundInfoComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingFundInfoComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingFundInfoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts new file mode 100644 index 00000000..ee1f57f6 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts @@ -0,0 +1,74 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { ReportingService } from '../../services/reporting.service'; + +@Component({ + selector: 'app-datatable-fund-info', + templateUrl: './fund-info.component.html', +}) +export class DatatableReportingFundInfoComponent implements OnInit { + url = `/user`; + searchSchema!: SFSchema; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = []; + record: any = {} + + + get reqParams() { + return {}; + } + constructor(public service: ReportingService, 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', }, + { 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/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index e55d1e52..d2d66960 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -42,6 +42,9 @@
{{item?.amount | currency :' '}}
 + +
{{item?.amount | currency :' '}}
+ @@ -52,6 +55,5 @@ - diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index e817b130..3db9b481 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -102,26 +102,12 @@ export class DatatableFundReportingComponent implements OnInit { placeholder: '请输入', }, }, - enterpriseInfoId: { - title: '网络货运人', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'select', - asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - - allowClear: true - } - }, - externalResourceCode: { - title: '货主', + resourceCode1: { type: 'string', + title: '流水单号', ui: { placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } + }, }, driverName: { title: '承运司机', @@ -143,6 +129,17 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, + carNo1: { + title: '车队长', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, serviceType: { title: '上传状态', type: 'string', @@ -169,6 +166,41 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, + enterpriseInfoId: { + title: '网络货运人', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'select', + asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), + + allowClear: true + } + }, + externalResourceCode: { + title: '货主', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + + + createTime1: { + title: '交易时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, createTime: { title: '上传时间', type: 'string', @@ -181,75 +213,6 @@ export class DatatableFundReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime1: { - title: '运单生成时间', - type: 'string', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, - }, - createTime2: { - 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, - }, - - loadingPlace: { - title: '车辆轨迹', - type: 'string', - enum: [ - { label: '全部', value: '' }, - { label: '有', value: '1' }, - { label: '无', value: '0' } - ], - ui: { - placeholder: '请选择', - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, - loadingPlace1: { - title: '司机轨迹', - type: 'string', - enum: [ - { label: '全部', value: '' }, - { label: '有', value: '1' }, - { label: '无', value: '0' } - ], - ui: { - placeholder: '请选择', - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } - }, }, }; this.ui = { @@ -264,10 +227,9 @@ export class DatatableFundReportingComponent 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: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '流水单号', render: 'freightDetails', className: 'text-center', width: '150px', }, { title: '订单号', render: 'billComplianceVOS', @@ -282,28 +244,19 @@ export class DatatableFundReportingComponent implements OnInit { 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: '司机姓名', 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: '实际承运人名称', 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: 'amount', className: 'text-center', width: '250px' }, + + { 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: 'total', className: 'text-center', width: '150px' }, + { title: '交易时间', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, ]; @@ -320,12 +273,21 @@ export class DatatableFundReportingComponent implements OnInit { this.openWainingModal('请选择需要撤回的数据'); return; } - - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.search(); + this.modal.confirm({ + nzTitle: '撤回提示', + nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + nzOkText: '确定', + nzCancelText: '取消', + nzOnOk: () => { + this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('撤销成功'); + this.search(); + } + }) } - }) + }); + } @@ -375,6 +337,12 @@ export class DatatableFundReportingComponent implements OnInit { 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(); + } + }) } diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 0c7ef2c2..ff637830 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -267,7 +267,7 @@ export class DatatableOrderReportingComponent implements OnInit { { 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: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billComplianceVOS', @@ -320,12 +320,20 @@ export class DatatableOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要撤回的数据'); return; } - - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.search(); + this.modal.confirm({ + nzTitle: '撤回提示', + nzContent: '撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + nzOkText: '确定', + nzCancelText: '取消', + nzOnOk: () => { + this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('撤销成功'); + this.search(); + } + }) } - }) + }); } @@ -375,6 +383,12 @@ export class DatatableOrderReportingComponent implements OnInit { 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(); + } + }) } diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index 5136cd37..e155b1bd 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -7,7 +7,8 @@
+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false" + [bordered]="true">
{{item.expenseName}}:{{item.price | currency}}
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 464766ad..19c73767 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 14:30:12 + * @LastEditTime : 2022-03-30 09:35:49 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -222,7 +222,7 @@
- + diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index 288f1e05..1d32b360 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/src/app/routes/order-management/components/complaint/complaint.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 16:13:40 + * @LastEditTime : 2022-03-30 13:44:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -54,6 +54,10 @@ {{item.complaintCode}} + +
{{item?.drvComplaintCauseLabel}}
+
{{item?.complaintCauseLabel}}
+
diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index ff32fbd7..9f9b1aca 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -23,15 +23,15 @@ export class OrderManagementComplaintComponent implements OnInit { _$expand = false; channelId: any; resourceStatus: any; - selectedMainTabStatus = '1'; + selectedMainTabStatus = '2'; @ViewChild('st') private readonly st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent; columns: STColumn[] = []; selectedIndex: number = 0; mainTabs = [ - { name: '司机投诉', status: '1' }, - { name: '货主投诉', status: '2' }, + { name: '司机投诉', status: '2' }, + { name: '货主投诉', status: '1' }, ] tabs = [ { name: '全部', @@ -54,11 +54,14 @@ export class OrderManagementComplaintComponent implements OnInit { public service: OrderManagementService, private modal: NzModalService, private router: Router - ) { if (this.selectedIndex === 0) { - this.selectedMainTabStatus = '1'; - } else if (this.selectedIndex === 1) { - this.selectedMainTabStatus = '2'; - }} + ) { + // console.log(this.selectedIndex); + // if (this.selectedIndex === 0) { + // this.selectedMainTabStatus = '2'; + // } else if (this.selectedIndex === 1) { + // this.selectedMainTabStatus = '1'; + // } + } /** * 查询参数 @@ -69,10 +72,8 @@ export class OrderManagementComplaintComponent implements OnInit { a.complaintStatus = this.resourceStatus } if(this.selectedMainTabStatus) { - a.complaintType = this.selectedMainTabStatus + a.complainantParty = this.selectedMainTabStatus } - console.log( this.sf?.value); - const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; return { @@ -156,7 +157,7 @@ export class OrderManagementComplaintComponent implements OnInit { title: '投诉原因', className: 'text-center', width: '170px', - index: 'complaintCauseLabel' + render: 'complaintCauseLabel' }, { title: '投诉状态', @@ -264,6 +265,7 @@ export class OrderManagementComplaintComponent implements OnInit { * 切换投诉与被投诉tab */ selectMainTab(e: any) { + console.log(e); console.log(this.selectedIndex); this.selectedMainTabStatus = e?.status; this.initST(); diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 8a89ec51..c05f1bcc 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 20:31:30 + * @LastEditTime : 2022-03-30 09:36:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -229,7 +229,7 @@ - + diff --git a/src/app/routes/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index f8daf42a..544a7684 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-13 19:22:47 * @LastEditors : Shiming - * @LastEditTime : 2022-01-25 17:24:24 + * @LastEditTime : 2022-03-30 14:09:00 * @FilePath : \\tms-obc-web\\src\\app\\routes\\routes-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -75,7 +75,9 @@ const routes: Routes = [ path: 'download', loadChildren: () => import('./download/download.module').then(m => m.DownloadModule) }, - { path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) },] + { path: 'datatable', loadChildren: () => import('./datatable/datatable.module').then((m) => m.DatatableModule) }, + { path: 'tax', loadChildren: () => import('./tax-management/taxmanagement.module').then((m) => m.TaxManagementModule) }, + ] }, // passport { 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 new file mode 100644 index 00000000..5834cc87 --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -0,0 +1,67 @@ + + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + + + {{item?.billStatusLabel}} + {{item?.billStatusLabel}} + + + + + {{item?.billStatusLabel}} + {{item?.billStatusLabel}} + + +
{{item?.amount | currency :' '}}
+ + + + +
+
+ 已选择 + {{ selectedRows.length }} 条数据 +
+ + + +
+ 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 new file mode 100644 index 00000000..43a47df4 --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less @@ -0,0 +1,5 @@ +:host { + .text-black { + color: #000; + } +} diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts new file mode 100644 index 00000000..2c07610f --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableOrderReportingComponent } from './order-reporting.component'; + +describe('DatatableOrderReportingComponent', () => { + let component: DatatableOrderReportingComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableOrderReportingComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableOrderReportingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..75f60d81 --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -0,0 +1,435 @@ +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-order-reporting', + templateUrl: './order-reporting.component.html', + styleUrls: ['./order-reporting.component.less'] +}) +export class TaxManagementOrderReportingComponent 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 = ''; + 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: '请输入', + }, + }, + shipperAppUserId: { + type: 'string', + title: '货主', + ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, + onSearch: (q: any) => { + let str =q.replace(/^\s+|\s+$/g,""); + if (str) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: str }) + .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + }, + + } as SFSelectWidgetSchema + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + placeholder: '请输入司机姓名/手机号', visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + carNo: { + title: '车牌号', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + carNo3: { + title: '收款人', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + + serviceType2: { + 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, + }, + } + }, + enterpriseInfoId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } + }, + 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, + }, + }, + }; + 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: '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: '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: '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' }, + { 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' }, + ]; + } + + + + /** + *撤销 + * @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(); + } + }) + } + }); + + } + + 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() { + // const modalRef = this.modal.create({ + // nzTitle: '上传设置', + // nzWidth: 600, + // nzContent: DatatableReportingUploadSettingComponent, + // nzComponentParams: {}, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe(res => { + // }) + } + + /** + * 查看校验结果 + */ + viewResult(item: any) { + // const modalRef = this.modal.create({ + // nzTitle: '校验结果', + // nzWidth: 1200, + // nzContent: DatatableReportingVerifyResultComponent, + // 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, + }) + } + + +} diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts new file mode 100644 index 00000000..93821ee1 --- /dev/null +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -0,0 +1,35 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-27 10:30:56 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-30 14:18:01 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ + +import { Injectable, Injector } from '@angular/core'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { map } from 'rxjs/operators'; +import { BaseService } from 'src/app/shared/services/core/base.service'; +import { EAFileUtil } from 'src/app/shared/utils/file.util'; + +@Injectable({ + providedIn: 'root', +}) +export class TaxManagementService extends BaseService { + // 获取货主企业列表 + public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + // 查询运营报表 + $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; + $api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + $api_recall_reporting = ``; // 撤回 + $api_async_export_order_reporting_list = ``; // 导出订单上报 + $api_get_upload_setting = ``; // 修改上传设置 + $api_upload_setting_save = ``; // 修改上传设置 + constructor(public injector: Injector) { + super(injector); + } +} diff --git a/src/app/routes/tax-management/tax-management-routing.module.ts b/src/app/routes/tax-management/tax-management-routing.module.ts new file mode 100644 index 00000000..ab3e2090 --- /dev/null +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; + + +const routes: Routes = [ + { path: 'orderReport', component: TaxManagementOrderReportingComponent }, +]; + + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class TaxManagementModuleRoutingModule { } diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts new file mode 100644 index 00000000..9cb1ff61 --- /dev/null +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -0,0 +1,30 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-30 13:58:28 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-30 14:14:57 + * @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 { TaxManagementModuleRoutingModule } from './tax-management-routing.module'; + + +const COMPONENTS: Type[] = [ + TaxManagementOrderReportingComponent +] + + +@NgModule({ + imports: [ + SharedModule, + TaxManagementModuleRoutingModule, + SHARED_G2_MODULES + ], + declarations: COMPONENTS, +}) +export class TaxManagementModule { } diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 245f172c..49342fda 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -717,6 +717,8 @@ export class CarSettleCarauthComponent implements OnInit { params.roadTransportPhoto = this.detailData.roadTransportPhoto delete params.titleA delete params.titleB + console.log(params); + this.service.request(this.service.$api_saveUpdateShipperCar, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('添加成功') diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 69601b29..42431b26 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -672,6 +672,17 @@ "link": "/datatable/invoicetable" } ] + }, + { + "text": "税务管理", + "icon": "iconfont icon-hetong-copy", + "group": true, + "children": [ + { + "text": "订单上报", + "link": "/tax/orderReport" + } + ] } ] }]