From 26e3893f3a8a322b386b204b65dce88f10ba9cf1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 30 Mar 2022 09:44:33 +0800 Subject: [PATCH 01/26] edit --- .../cancellation-invoice/cancellation-invoice.component.html | 2 +- .../invoice-requested-detail.component.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index c31db228..80d1837f 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -65,7 +65,7 @@

开户行： {{openInfo?.artobank}}

- {{openInfo?.vatnameLable}} + {{openInfo?.vatnameLabel}} {{openInfo?.vatremarks}} diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index fc9c0897..ee8858b6 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -50,6 +50,8 @@ export class InvoiceRequestedDetailComponent implements OnInit { } beforeReq = (requestOptions: STRequestOptions) => { + this.totalCallNo = '0'; + this.selectedRows = []; Object.assign(requestOptions.body, { vatappHId: this.id }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); @@ -58,7 +60,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { }; afterRes = (data: any[], rawData?: any) => { - this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2); + // this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2); return data.map(item => ({ ...item })); From 18c571dd973740440bbdcc4e32aa410f14d55917 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 09:58:02 +0800 Subject: [PATCH 02/26] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- .../components/vehicle-detail/vehicle-detail.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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/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 @@ - + From dafe2a811fd8b4616cfb8cb0fc87a5a01c71ad05 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 10:09:12 +0800 Subject: [PATCH 03/26] fix bug --- .../components/complaint/complaint.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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..b4149368 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -55,9 +55,9 @@ export class OrderManagementComplaintComponent implements OnInit { private modal: NzModalService, private router: Router ) { if (this.selectedIndex === 0) { - this.selectedMainTabStatus = '1'; - } else if (this.selectedIndex === 1) { this.selectedMainTabStatus = '2'; + } else if (this.selectedIndex === 1) { + this.selectedMainTabStatus = '1'; }} /** @@ -69,7 +69,7 @@ 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); From 48b2345a98f004978b70e4dd3fa8364f8d376ced Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 10:45:28 +0800 Subject: [PATCH 04/26] fix bug --- .../contract-template-detail.component.ts | 6 ++++-- .../components/order-reporting/order-reporting.component.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 0c7ef2c2..9870dda5 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', From 31923bec62d1e60ee373d9aad354cd62028d7222 Mon Sep 17 00:00:00 2001 From: heqinghang Date: Wed, 30 Mar 2022 10:45:30 +0800 Subject: [PATCH 05/26] 666 --- .../compliance/index/index.component.ts | 115 ++++++++++++++---- 1 file changed, 94 insertions(+), 21 deletions(-) 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(); } } From b817782b9baa39c981deb44f452c819e434f5c3e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 11:04:11 +0800 Subject: [PATCH 06/26] fix bug --- .../routes/vehicle/components/list/carauth/carauth.component.ts | 2 ++ 1 file changed, 2 insertions(+) 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('添加成功') From 6de4675aa943115023ed18738a4870d9577797ef Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 11:23:42 +0800 Subject: [PATCH 07/26] fix bug --- .../complaint/complaint.component.ts | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) 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 b4149368..a42d1148 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -54,11 +54,14 @@ export class OrderManagementComplaintComponent implements OnInit { public service: OrderManagementService, private modal: NzModalService, private router: Router - ) { if (this.selectedIndex === 0) { - this.selectedMainTabStatus = '2'; - } else if (this.selectedIndex === 1) { - this.selectedMainTabStatus = '1'; - }} + ) { + // console.log(this.selectedIndex); + // if (this.selectedIndex === 0) { + // this.selectedMainTabStatus = '2'; + // } else if (this.selectedIndex === 1) { + // this.selectedMainTabStatus = '1'; + // } + } /** * 查询参数 @@ -68,11 +71,18 @@ export class OrderManagementComplaintComponent implements OnInit { if(this.resourceStatus) { a.complaintStatus = this.resourceStatus } - if(this.selectedMainTabStatus) { - a.complainantParty = this.selectedMainTabStatus - } - console.log( this.sf?.value); + console.log(this.selectedMainTabStatus); + if(this.selectedMainTabStatus) { + switch(this.selectedMainTabStatus) { + case '1': + a.complainantParty = '2' + break; + case '2': + a.complainantParty = '1' + break; + } + } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; return { @@ -264,6 +274,7 @@ export class OrderManagementComplaintComponent implements OnInit { * 切换投诉与被投诉tab */ selectMainTab(e: any) { + console.log(e); console.log(this.selectedIndex); this.selectedMainTabStatus = e?.status; this.initST(); From 8e1169a8d9eed555a413f4bea199856c1cb05c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 30 Mar 2022 11:33:53 +0800 Subject: [PATCH 08/26] - --- .../fund-reporting.component.html | 4 +- .../fund-reporting.component.ts | 200 ++++++++---------- .../order-reporting.component.ts | 24 ++- 3 files changed, 106 insertions(+), 122 deletions(-) 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..3d44cf05 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 @@ -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(); + } + }) } From d2fe559c7c549a3eae6c58df059d03d31e9e410b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 13:48:21 +0800 Subject: [PATCH 09/26] fix bug --- .../complaint/complaint.component.html | 6 +++++- .../complaint/complaint.component.ts | 19 +++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) 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 a42d1148..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: '全部', @@ -71,17 +71,8 @@ export class OrderManagementComplaintComponent implements OnInit { if(this.resourceStatus) { a.complaintStatus = this.resourceStatus } - console.log(this.selectedMainTabStatus); - if(this.selectedMainTabStatus) { - switch(this.selectedMainTabStatus) { - case '1': - a.complainantParty = '2' - break; - case '2': - a.complainantParty = '1' - break; - } + a.complainantParty = this.selectedMainTabStatus } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; @@ -166,7 +157,7 @@ export class OrderManagementComplaintComponent implements OnInit { title: '投诉原因', className: 'text-center', width: '170px', - index: 'complaintCauseLabel' + render: 'complaintCauseLabel' }, { title: '投诉状态', From a92b3bade06dc0bb0d06676893dca6f5107615b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 30 Mar 2022 14:00:36 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E8=B5=84=E9=87=91=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatable/datatable-routing.module.ts | 6 +- src/app/routes/datatable/datatable.module.ts | 6 +- .../fund-info/fund-info.component.html | 15 ++++ .../fund-info/fund-info.component.spec.ts | 24 ++++++ .../fund-info/fund-info.component.ts | 74 +++++++++++++++++++ .../order-reporting.component.ts | 2 +- .../verify-result.component.html | 3 +- 7 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html create mode 100644 src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts create mode 100644 src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts 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/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 120c6e21..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 @@ -322,7 +322,7 @@ export class DatatableOrderReportingComponent implements OnInit { } this.modal.confirm({ nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + nzContent: '撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { 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}}
From 214ca1de9fc3c57c3a097c87d74abd398a9e92b8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:13:27 +0800 Subject: [PATCH 11/26] fix bug --- src/app/routes/routes-routing.module.ts | 6 +- .../order-reporting.component.html | 67 +++ .../order-reporting.component.less | 5 + .../order-reporting.component.spec.ts | 24 + .../order-reporting.component.ts | 459 ++++++++++++++++++ .../services/tax-management.service.ts | 34 ++ .../tax-management-routing.module.ts | 15 + .../tax-management/taxmanagement.module.ts | 30 ++ src/assets/mocks/menu-data.json | 11 + 9 files changed, 649 insertions(+), 2 deletions(-) create mode 100644 src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.html create mode 100644 src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.less create mode 100644 src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.spec.ts create mode 100644 src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.ts create mode 100644 src/app/routes/tax-management/services/tax-management.service.ts create mode 100644 src/app/routes/tax-management/tax-management-routing.module.ts create mode 100644 src/app/routes/tax-management/taxmanagement.module.ts 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/reporting/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.html new file mode 100644 index 00000000..5834cc87 --- /dev/null +++ b/src/app/routes/tax-management/components/reporting/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/reporting/order-reporting/order-reporting.component.less b/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.less new file mode 100644 index 00000000..43a47df4 --- /dev/null +++ b/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.less @@ -0,0 +1,5 @@ +:host { + .text-black { + color: #000; + } +} diff --git a/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.spec.ts b/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.spec.ts new file mode 100644 index 00000000..2c07610f --- /dev/null +++ b/src/app/routes/tax-management/components/reporting/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/reporting/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.ts new file mode 100644 index 00000000..8d5a65be --- /dev/null +++ b/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.ts @@ -0,0 +1,459 @@ +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, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +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, + 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: '请输入', + }, + }, + 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, + }, + } + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + placeholder: '请输入司机姓名/手机号', visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + carNo: { + title: '车牌号', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + serviceType: { + 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, + }, + 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 = { + '*': { 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..cce4c4d7 --- /dev/null +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -0,0 +1,34 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-27 10:30:56 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-30 14:05:39 + * @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 { + + // 查询运营报表 + $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..e60a9997 --- /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/reporting/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..dd50e2a1 --- /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:05:00 + * @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/reporting/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/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" + } + ] } ] }] From f62a87528fa4472b9676df86d08fb1a98baa6ca7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:15:08 +0800 Subject: [PATCH 12/26] fix bug --- .../order-reporting/order-reporting.component.html | 0 .../order-reporting/order-reporting.component.less | 0 .../order-reporting/order-reporting.component.spec.ts | 0 .../order-reporting/order-reporting.component.ts | 2 +- .../routes/tax-management/tax-management-routing.module.ts | 2 +- src/app/routes/tax-management/taxmanagement.module.ts | 4 ++-- 6 files changed, 4 insertions(+), 4 deletions(-) rename src/app/routes/tax-management/components/{reporting => }/order-reporting/order-reporting.component.html (100%) rename src/app/routes/tax-management/components/{reporting => }/order-reporting/order-reporting.component.less (100%) rename src/app/routes/tax-management/components/{reporting => }/order-reporting/order-reporting.component.spec.ts (100%) rename src/app/routes/tax-management/components/{reporting => }/order-reporting/order-reporting.component.ts (99%) diff --git a/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html similarity index 100% rename from src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.html rename to src/app/routes/tax-management/components/order-reporting/order-reporting.component.html diff --git a/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.less b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less similarity index 100% rename from src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.less rename to src/app/routes/tax-management/components/order-reporting/order-reporting.component.less diff --git a/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.spec.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts similarity index 100% rename from src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.spec.ts rename to src/app/routes/tax-management/components/order-reporting/order-reporting.component.spec.ts diff --git a/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts similarity index 99% rename from src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.ts rename to src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 8d5a65be..6c7f6126 100644 --- a/src/app/routes/tax-management/components/reporting/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -4,7 +4,7 @@ import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { TaxManagementService } from '../../../services/tax-management.service'; +import { TaxManagementService } from '../../services/tax-management.service'; // import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; // import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; 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 e60a9997..ab3e2090 100644 --- a/src/app/routes/tax-management/tax-management-routing.module.ts +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { TaxManagementOrderReportingComponent } from './components/reporting/order-reporting/order-reporting.component'; +import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; const routes: Routes = [ diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index dd50e2a1..9cb1ff61 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -4,13 +4,13 @@ * @Author : Shiming * @Date : 2022-03-30 13:58:28 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:05:00 + * @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/reporting/order-reporting/order-reporting.component'; +import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; import { TaxManagementModuleRoutingModule } from './tax-management-routing.module'; From 228adb1656dcb14656b4e709f6dc6bbcb4981c5e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 14:18:28 +0800 Subject: [PATCH 13/26] fix bug --- .../order-reporting.component.ts | 126 +++++++----------- .../services/tax-management.service.ts | 5 +- 2 files changed, 54 insertions(+), 77 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 6c7f6126..75f60d81 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -1,9 +1,11 @@ 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, SFUISchema } from '@delon/form'; +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'; @@ -34,6 +36,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, + public shipperservice: ShipperBaseService, private modal: NzModalService, public shipperSrv: ShipperBaseService ) { @@ -102,26 +105,31 @@ export class TaxManagementOrderReportingComponent implements OnInit { placeholder: '请输入', }, }, - enterpriseInfoId: { - title: '网络货运人', + shipperAppUserId: { type: 'string', - ui: { - placeholder: '请选择', - widget: 'select', - asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - - allowClear: true - } - }, - externalResourceCode: { title: '货主', - type: 'string', ui: { - placeholder: '请输入', + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + allowClear: true, visibleIf: { - _$expand: (value: boolean) => value, + _$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: '承运司机', @@ -143,7 +151,19 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - serviceType: { + carNo3: { + title: '收款人', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + + serviceType2: { title: '上传状态', type: 'string', ui: { @@ -169,6 +189,19 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, + enterpriseInfoId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } + }, createTime: { title: '上传时间', type: 'string', @@ -181,32 +214,8 @@ export class TaxManagementOrderReportingComponent 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: '收货时间', + title: '结束时间', type: 'string', ui: { widget: 'sl-from-to', @@ -217,39 +226,6 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } 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 = { 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 cce4c4d7..93821ee1 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:05:39 + * @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. */ @@ -20,7 +20,8 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util'; 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`; // 订单上报列表 From ca10c0769007acb1e180a36d75d4aab36fa142a2 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 30 Mar 2022 14:29:38 +0800 Subject: [PATCH 14/26] edit --- .../channel-log-modal.component.html | 13 ++++ .../channel-log-modal.component.less | 0 .../channel-log-modal.component.ts | 34 +++++++++ .../partner-detail.component.html | 19 +---- .../partner-detail.component.ts | 72 ++++++------------- .../personal-partner-detail.component.html | 19 +++++ .../personal-partner-detail.component.ts | 27 ++++++- .../services/partner-list.service.ts | 14 +++- src/app/routes/partner/partner.module.ts | 4 +- 9 files changed, 132 insertions(+), 70 deletions(-) create mode 100644 src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html create mode 100644 src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less create mode 100644 src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html new file mode 100644 index 00000000..a9d9fe7e --- /dev/null +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html @@ -0,0 +1,13 @@ +

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

+ + +

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

+ + +

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

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

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

- - -

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

- - -

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

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