From c49c3916be8e79cfbc1ead55ce6901b1d138f084 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 19:19:48 +0800 Subject: [PATCH 01/18] fix bug --- .../busiindex/busiindex.component.ts | 4 +- .../mancustomtable.component.ts | 39 +++++++++++-------- .../individual-collect.component.ts | 13 ------- 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index a5cc2092..4501e8fd 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -88,8 +88,8 @@ export class DatatableBusiindexComponent implements OnInit { if (res) { this.chartData = res if(flag) { - // this.pillar.reRender() - // this.curve.reRender() + this.pillar.reRender() + this.curve.reRender() } } }) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index e81c0f4b..efbfe907 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -20,6 +20,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; + resourceStatus: number = 0; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; today = new Date(); @@ -61,31 +62,33 @@ export class DatatableMancustomtableComponent implements OnInit { } }; columns: STColumn[] = [ - { title: '部门', index: 'enterpriseName', className: 'text-center', width: '200px' }, - { title: '业务员', index: 'registerTime', className: 'text-center', width: '200px' }, - { title: '已认证货主数', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '新增合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '合伙人活跃率', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '主动合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '纪念合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '流失合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '未搭档合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '新增货主数', index: 'salesmanName', className: 'text-center', width: '100px' }, - { title: '货主活跃率', index: 'partnerName', className: 'text-center', width: '100px' }, + { title: '部门', index: 'department', className: 'text-center', width: '200px' }, + { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, + { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px' }, + { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' }, + { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' }, + { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, + { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' }, + { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' }, + { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' }, + { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' }, + + { title: '新增货主数', index: 'addCount', className: 'text-center', width: '100px' }, + { title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, { title: '活跃货主数', - index: 'customerStatus', + index: 'aliveCount', className: 'text-center', width: '100px' }, - { title: '纪念货主数', index: 'zsl', className: 'text-center', width: '100px' }, + { title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' }, { - title: '货货主数', - index: 'ddje', + title: '流失货主数', + index: 'drainCount', className: 'text-right', width: '100px', }, - { title: '未激活货主数', index: 'ysdds', className: 'text-center', width: '120px' } + { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } ]; /** * 查询参数 @@ -225,7 +228,9 @@ export class DatatableMancustomtableComponent implements OnInit { this.isLoading = true; } selectChange(e: number) { - // this.resourceStatus = e; + console.log(e); + + this.resourceStatus = e; // this.initST(); setTimeout(() => { this.st.load(); diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index a22ef126..59dd9601 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -94,19 +94,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { }, default: '' }, - declareResult: { - title: '申报结果', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, overdueStatus: { title: '是否逾期', type: 'string', From 539a832228014c4423f18e25aad9cbead56c966a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 19:34:37 +0800 Subject: [PATCH 02/18] fix bug --- .../customtable/mancustomtable/mancustomtable.component.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index efbfe907..c304ca58 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -20,7 +20,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; - resourceStatus: number = 0; + resourceStatus: number = 1; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; today = new Date(); @@ -106,6 +106,7 @@ export class DatatableMancustomtableComponent implements OnInit { let params: any = { time: this.time, type: this.type, + parType: this.resourceStatus, ...this.sf?.value }; From 2ce3afa020e96658975061a1442e0805596dcf38 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 19:59:21 +0800 Subject: [PATCH 03/18] fix bug --- .../mancustomtable.component.ts | 1 + .../customtable/owner/owner.component.ts | 2 +- .../financetable/financetable.component.ts | 2 +- .../operationtable.component.ts | 2 +- .../operationtable/pie/pie.component.ts | 54 +++++++++++-------- 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index c304ca58..e5056e66 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -111,6 +111,7 @@ export class DatatableMancustomtableComponent implements OnInit { }; delete params._$expand; + delete params.sort; return { ...params }; } constructor(public service: DataService, private datePipe: DatePipe) {} diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index f3a81454..f9660833 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -156,7 +156,7 @@ export class DatatableOwnerComponent implements OnInit { } else if(this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else{ - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index ef318c6b..688dc89a 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -121,7 +121,7 @@ export class DatatableFinancetableComponent implements OnInit { } else if (this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else { - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index 891ee8e1..15a0571c 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -118,7 +118,7 @@ export class DatatableOperationtableComponent implements OnInit { } else if (this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] } else { - this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + ' 00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); } diff --git a/src/app/routes/datatable/components/operationtable/pie/pie.component.ts b/src/app/routes/datatable/components/operationtable/pie/pie.component.ts index fa58fbd1..cc358bd7 100644 --- a/src/app/routes/datatable/components/operationtable/pie/pie.component.ts +++ b/src/app/routes/datatable/components/operationtable/pie/pie.component.ts @@ -13,9 +13,10 @@ export class OperationtablePieComponent implements OnInit { @ViewChild('pie', { static: false }) pie!: G2PieComponent; chartData: any = []; el: any; + chart: any; enterpriseInfoIdPie = '' interManlist: any = [] - + innerView: any =[]; constructor(private service: DataService, private ngZone: NgZone) { } @@ -27,7 +28,11 @@ export class OperationtablePieComponent implements OnInit { this.service.request(this.service.$api_operationalReportWaybillStatusDistribution, {id: this.enterpriseInfoIdPie}).subscribe(res => { if (res) { this.chartData = res - this.ngZone.runOutsideAngular(() => this.init(this.el)); + // this.ngZone.runOutsideAngular(() => this.init(this.el)); + setTimeout(() => { + this.chart?.data(this.chartData); + this.chart?.render(); + }, 1000) } }) } @@ -39,21 +44,26 @@ export class OperationtablePieComponent implements OnInit { } render(el: ElementRef): void { this.el = el.nativeElement + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 500) } private init(el: HTMLElement): void { - const chart = new Chart({ + this.chart = new Chart({ container: el, autoFit: true, height: 400, }); // 新建一个 view 用来单独渲染Annotation - const innerView = chart.createView(); - chart.coordinate('theta', { + // const innerView = chart.createView(); + + this.innerView = this.chart.createView(); + this.chart.coordinate('theta', { radius: 0.6, innerRadius: 0.7, }); - chart.data(this.chartData); + // this.chart.data(this.chartData); // chart.scale('percent', { // formatter: val => { @@ -62,10 +72,10 @@ export class OperationtablePieComponent implements OnInit { // }, // }); - chart.tooltip(false); + this.chart.tooltip(false); // 声明需要进行自定义图例字段： 'item' - chart.legend('item', { + this.chart.legend('item', { position: 'right', // 配置图例显示位置 custom: true, // 关键字段，告诉 G2，要使用自定义的图例 items: this.chartData.map((obj: any, index: any) => { @@ -77,7 +87,7 @@ export class OperationtablePieComponent implements OnInit { symbol: 'square', // marker 的形状 style: { r: 5, // marker 图形半径 - fill: chart.getTheme().colors10[index], // marker 颜色，使用默认颜色，同图形对应 + fill: this.chart.getTheme().colors10[index], // marker 颜色，使用默认颜色，同图形对应 }, }, // marker 配置 }; @@ -90,7 +100,7 @@ export class OperationtablePieComponent implements OnInit { }, }); - const interval = chart + const interval = this.chart .interval() .adjust('stack') .position('percent') @@ -102,7 +112,7 @@ export class OperationtablePieComponent implements OnInit { }) .state({ active: { - style: element => { + style: (element: any) => { const shape = element.shape; return { lineWidth: 1, @@ -114,17 +124,17 @@ export class OperationtablePieComponent implements OnInit { }); // 移除图例点击过滤交互 - chart.removeInteraction('legend-filter'); - chart.interaction('element-active'); + this.chart.removeInteraction('legend-filter'); + this.chart.interaction('element-active'); - chart.render(true); + this.chart.render(true); // 默认选择 interval.elements[0].setState('selected', true); const ele = interval.elements[0].getData(); // 监听 element 上状态的变化来动态更新 Annotation 信息 - chart.on('element:statechange', (ev: any) => { + this.chart.on('element:statechange', (ev: any) => { const { state, stateStatus, element } = ev.gEvent.originalEvent; // 本示例只需要监听 active 的状态变化 @@ -142,10 +152,10 @@ export class OperationtablePieComponent implements OnInit { // 绘制 annotation let lastItem: any; - function updateAnnotation(data: any) { + const updateAnnotation = (data: any) => { if (data.item !== lastItem) { - innerView.annotation().clear(true); - innerView + this.innerView.annotation().clear(true); + this.innerView .annotation() .text({ position: ['50%', '50%'], @@ -168,7 +178,7 @@ export class OperationtablePieComponent implements OnInit { offsetX: -10, offsetY: 20, }) - innerView.render(true); + this.innerView.render(true); lastItem = data.item; @@ -176,9 +186,9 @@ export class OperationtablePieComponent implements OnInit { } // 清空 annotation - function clearAnnotation() { - innerView.annotation().clear(true); - innerView.render(true); + function clearAnnotation(this: any) { + this.innerView?.annotation()?.clear(true); + this.innerView.render(true); lastItem = null; } From 44c34efc9686408281c0f37f667a83c8feef98c5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 20:01:35 +0800 Subject: [PATCH 04/18] fix bug --- .../customtable/mancustomtable/mancustomtable.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index e5056e66..5103b7fc 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -232,7 +232,7 @@ export class DatatableMancustomtableComponent implements OnInit { selectChange(e: number) { console.log(e); - this.resourceStatus = e; + this.resourceStatus = e + 1; // this.initST(); setTimeout(() => { this.st.load(); From 70b8ef32621cffe4efe083566609a63bb8d1571c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 20:08:21 +0800 Subject: [PATCH 05/18] fix bug --- .../components/financetable/financetable.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index 688dc89a..fb0e6081 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -138,9 +138,9 @@ export class DatatableFinancetableComponent implements OnInit { } changeDataNext() { - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.dateFormat = 'yyyy' - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.dateFormat = 'yyyy-MM' } } @@ -148,9 +148,9 @@ export class DatatableFinancetableComponent implements OnInit { if(result === null) { return } - if(this.mode === 'year') { + if(this.modeNext === 'year') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] - } else if(this.mode === 'month') { + } else if(this.modeNext === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } this.initPillarData(); From 94b658b834f2883fdfd4fcaaae6e5aeb90b41f26 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 20:10:38 +0800 Subject: [PATCH 06/18] fix bug --- .../components/financetable/financetable.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index fb0e6081..5201e4cb 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -59,6 +59,7 @@ export class DatatableFinancetableComponent implements OnInit { } else { this.type = 4 } + let params: any = { time: this.time, type: this.type @@ -76,11 +77,11 @@ export class DatatableFinancetableComponent implements OnInit { initPillarData(){ let type = 1 - if(this.mode === 'year') { - type = 1 - } else if(this.mode === 'month') { - type = 2 - } + if (this.modeNext === 'year') { + this.type = 1 + } else if (this.modeNext === 'month') { + this.type = 2 + } const params: any = { time: this.timeNext, type, From 5677e6a371c70d6fc9adfa6d574aeee68b630b68 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 18 Apr 2022 20:18:20 +0800 Subject: [PATCH 07/18] fix bug --- .../mancustomtable/mancustomtable.component.ts | 6 +++++- .../components/complaint/complaint.component.ts | 12 +++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index 5103b7fc..f4db64b7 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -64,7 +64,11 @@ export class DatatableMancustomtableComponent implements OnInit { columns: STColumn[] = [ { title: '部门', index: 'department', className: 'text-center', width: '200px' }, { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, - { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px' }, + { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> { + console.log(this.resourceStatus); + return this.resourceStatus !== 1 + + } }, { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' }, { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' }, { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, 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 e29ca2e0..a0e077a1 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -93,10 +93,17 @@ export class OrderManagementComplaintComponent implements OnInit { initSF() { this.schema = { properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, complaintCode: { type: 'string', title: '投诉单号' }, + wayBillCode: { + type: 'string', + title: '运单号', + ui: { + } + }, complaintCause: { title: '投诉原因', type: 'string', @@ -124,7 +131,10 @@ export class OrderManagementComplaintComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd' + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value + }, } as SFDateWidgetSchema } } From a42cbf248bb61c515f7a0168d3491d0045f08ccb Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 09:52:41 +0800 Subject: [PATCH 08/18] edit --- .../invoice-requested.component.ts | 1 + .../requested-invoice-modal.component.html | 22 +++++------------- .../requested-invoice-modal.component.ts | 23 +++++++++++++++---- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 14a3554c..83b8228c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -263,6 +263,7 @@ export class InvoiceRequestedComponent { const modal = this.nzModalService.create({ nzTitle: '开票受理', nzContent: RequestedInvoiceModalComponent, + nzNoAnimation: true, nzWidth: 1200, nzComponentParams: { id: item.id diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index adfc2118..d1f3a8c1 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -11,26 +11,16 @@ - + {{ item.billHCode }}
- + -
+ \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 2a64cece..64d2d120 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -6,7 +6,7 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ -import { Component, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @@ -24,23 +24,38 @@ export class RequestedInvoiceModalComponent { columns: STColumn[] = this.initST(); id: any; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {} + + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private modal: NzModalRef, + private router: Router, + private cdr: ChangeDetectorRef + ) {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatappHId: this.id }); return requestOptions; }; + afterRes = (data: any[], rawData?: any) => { + return data.map(item => ({ ...item, isDelete: data?.length > 1 })); + }; + /** * 移除订单 * * @returns */ removeOrder(item: any[]) { - if (this.st1._data?.length <= 1) { + if (this.st1.total <= 1) { this.service.msgSrv.warning('开票申请记录不能少于一个订单'); return; } + if (item?.length <= 0) { + this.service.msgSrv.warning('请选择要移除订单'); + return; + } this.nzModalService.warning({ nzTitle: '确定从当前批次中移除所选订单？', nzContent: '移除后相关订单可以重新提交开票申请', @@ -111,7 +126,7 @@ export class RequestedInvoiceModalComponent { { text: '移除', click: (item: any) => this.removeOrder([item]), - iif: _ => this.st1._data?.length > 1 + iif: item => item.isDelete } ] } From 094ca57d6afb7c0affaec3cda1020ec0091d3614 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 10:09:34 +0800 Subject: [PATCH 09/18] edit --- .../invoicetable/invoicetable.component.html | 50 ++++++++----------- .../invoicetable/invoicetable.component.ts | 45 +++++++++++++---- 2 files changed, 58 insertions(+), 37 deletions(-) diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html index e45122f6..fd37f657 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html @@ -1,32 +1,26 @@ - - - {{item.totalInvoicedAmount | currency}} - - - {{item.invAmountMonth | currency}} - - - {{item.applyWaitInvAmount | currency}} - - - {{item.unInvoicedAmountHistory | currency}} - - - {{item.unInvoicedAmountCurMonth | currency}} - - - {{item.invoicedAmount | currency}} - + + + {{item.totalInvoicedAmount | currency}} + + + {{item.invAmountMonth | currency}} + + + {{item.applyWaitInvAmount | currency}} + + + {{item.unInvoicedAmountHistory | currency}} + + + {{item.unInvoicedAmountCurMonth | currency}} + + + {{item.invoicedAmount | currency}} + - + \ No newline at end of file diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts index 40aac5d4..fc71aab6 100644 --- a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts @@ -6,71 +6,98 @@ import { DataService } from '../../services/data.service'; @Component({ selector: 'app-datatable-invoicetable', - templateUrl: './invoicetable.component.html', + templateUrl: './invoicetable.component.html' }) export class DatatableInvoicetableComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; columns!: STColumn[]; - data=[{name1:1111}] - constructor(private http: _HttpClient, private modal: ModalHelper,public service :DataService) { } + data = [{ name1: 1111 }]; + constructor(private http: _HttpClient, private modal: ModalHelper, public service: DataService) {} /** * 查询参数 */ - get reqParams() { - return { }; + get reqParams() { + return {}; } - ngOnInit(): void { + ngOnInit(): void { this.initST(); - } initST() { this.columns = [ { title: '运营主体', - index: 'operationName' + index: 'operationName', + width: 220 }, { title: '已开票总金额', index: 'totalInvoicedAmount', render: 'totalInvoicedAmount', + className: 'text-right', + width: 150 }, { title: '当月已开票金额', index: 'invAmountMonth', render: 'invAmountMonth', + className: 'text-right', + width: 150 }, { title: '当月已开票张数', index: 'numInvAmountMonth', + className: 'text-right', + width: 150 }, { title: '已申请待开金额', index: 'applyWaitInvAmount', render: 'applyWaitInvAmount', + className: 'text-right', + width: 150 }, { title: '申请待开客户', index: 'applyWaitCustomer', + className: 'text-right', + width: 150 }, { title: '已开票金额', index: 'invoicedAmount', render: 'invoicedAmount', + className: 'text-right', + width: 150 }, { title: '未申请开票金额（历史）', index: 'unInvoicedAmountHistory', render: 'unInvoicedAmountHistory', + className: 'text-right', + width: 200 }, { title: '未申请开票金额（当月）', index: 'unInvoicedAmountCurMonth', render: 'unInvoicedAmountCurMonth', + className: 'text-right', + width: 200 }, + { + title: '当月发票张数', + index: 'unInvoicedAmountHistory1', + className: 'text-right', + width: 150 + }, + { + title: '剩余发票张数', + index: 'unInvoicedAmountCurMonth1', + className: 'text-right', + width: 150 + } ]; } - } From b8870850b4dfae4f0ca3d2c9dd168a1faa8ab8dd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 13:10:42 +0800 Subject: [PATCH 10/18] fix bug --- .../mancustomtable/mancustomtable.component.ts | 10 +++++++--- .../individual-collect/individual-collect.component.ts | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index f4db64b7..33d0efd4 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -12,7 +12,6 @@ import { DataService } from '../../../services/data.service'; providers: [DatePipe] }) export class DatatableMancustomtableComponent implements OnInit { - url = `/user`; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; _$expand = false; @@ -20,6 +19,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; + columns: STColumn[] =[]; resourceStatus: number = 1; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; @@ -61,7 +61,8 @@ export class DatatableMancustomtableComponent implements OnInit { } } }; - columns: STColumn[] = [ + initST() { + this.columns =[ { title: '部门', index: 'department', className: 'text-center', width: '200px' }, { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> { @@ -94,6 +95,7 @@ export class DatatableMancustomtableComponent implements OnInit { }, { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } ]; + } /** * 查询参数 */ @@ -121,6 +123,7 @@ export class DatatableMancustomtableComponent implements OnInit { constructor(public service: DataService, private datePipe: DatePipe) {} ngOnInit(): void { this.initSF(); + this.initST(); } /** * 初始化查询表单 @@ -239,7 +242,8 @@ export class DatatableMancustomtableComponent implements OnInit { this.resourceStatus = e + 1; // this.initST(); setTimeout(() => { - this.st.load(); + this.initST(); + // this.st.load(1); }, 500); } } diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 59dd9601..2ae3d17a 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -130,7 +130,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } } as SFDateWidgetSchema }, - enterpriseInfoId: { + nsrmc: { type: 'string', title: '网络货运人', ui: { From 3fb6937c877f4ecfb71f5b2aaab879ce5fe41ea7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 13:22:11 +0800 Subject: [PATCH 11/18] fix bug --- proxy.conf.js | 4 ++-- .../individual-collect/individual-collect.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3ec9b0fd..15faf001 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-18 16:40:52 + * @LastEditTime : 2022-04-19 13:17:35 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,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/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 2ae3d17a..f893b05a 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -140,7 +140,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - asyncData: () => this.service.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkEnterpriseName() } } } From 53872812102bafd81b1302c4a902f9c8a831cbad Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 13:56:26 +0800 Subject: [PATCH 12/18] fix bug --- .../components/customtable/owner/owner.component.ts | 12 ++++++------ src/app/routes/datatable/services/data.service.ts | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index f9660833..54549d42 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -39,9 +39,9 @@ export class DatatableOwnerComponent implements OnInit { { title: '合伙人', index: 'partnerName', className: 'text-center', width: '100px' }, { title: '客户状态', index: 'customerStatus', className: 'text-center', width: '100px', type: 'enum', enum: { 1: '未激活', - 2: '沉默', - 3: '流失', - 4: '活跃' + 2: '流失', + 3: '活跃', + 4: '沉默' } }, { title: '订单数', index: 'zsl', className: 'text-center', width: '100px' }, { title: '订单金额', index: 'ddje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ddje }) } }, @@ -117,9 +117,9 @@ export class DatatableOwnerComponent implements OnInit { }, enum: [ {label: '未激活', value: 1}, - {label: '沉默', value: 2}, - {label: '流失', value: 3}, - {label: '活跃', value: 4}, + {label: '流失', value: 2}, + {label: '活跃', value: 3}, + {label: '沉默', value: 4}, ] }, registerTime: { diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index a75ff652..609ed1b6 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -93,6 +93,15 @@ export class DataService extends BaseService { // 业务员-合规报表 $api_listPartComplianceReportPage = `/api/sdc/report/listPartComplianceReportPage`; + // 数据报表-订单类型比例 + $api_getBillTypeProportion = `/api/sdc/reportData/getBillTypeProportion`; + // 数据报表-运单直付比例 + $api_getWayBillDirectProportion = `/api/sdc/reportData/getWayBillDirectProportion`; + // 数据报表-统计订单金额-趋势 + $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + // // 数据报表-统计订单金额-趋势 + // $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + constructor(public injector: Injector) { From 40527cabc1e90293ad92d48b80eea9d900ec03b8 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 13:59:13 +0800 Subject: [PATCH 13/18] edit --- proxy.conf.js | 22 +++++++++---------- .../list/detail/detail.component.html | 4 ++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3ec9b0fd..0efd1a41 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -18,19 +18,9 @@ module.exports = { // secure: false, // Ignore invalid SSL certificates // changeOrigin: true // } - // '//api': { - // target: { - // host: 'tms-api.yunduoxing.com', - // protocol: 'https:', - // port: 443 - // }, - // secure: false, - // changeOrigin: true, - // logLevel: 'debug' - // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api.yunduoxing.com', protocol: 'https:', port: 443 }, @@ -38,4 +28,14 @@ module.exports = { changeOrigin: true, logLevel: 'debug' }, + // '//api': { + // target: { + // host: 'tms-api-dev.eascs.com', + // protocol: 'https:', + // port: 443 + // }, + // secure: false, + // changeOrigin: true, + // logLevel: 'debug' + // }, }; diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html index a7422e70..cc016948 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -101,6 +101,10 @@ + + + From a3b6ef258df736836ce59592fac8b30411747153 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 14:02:39 +0800 Subject: [PATCH 14/18] fix bug --- .../datatable/components/datascreen/datascreen.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 27fec9ba..e66a7862 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 15:48:32 + * @LastEditTime : 2022-04-19 14:01:38 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> From f5b0e5dac5847d91891d551a77a5dac6d84ef0dc Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 14:08:08 +0800 Subject: [PATCH 15/18] edit --- .../list/detail/detail.component.html | 241 +++++++++--------- 1 file changed, 114 insertions(+), 127 deletions(-) diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html index cc016948..56a65d87 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -1,4 +1,4 @@ - + @@ -8,84 +8,73 @@ - -
- - - - - - - -
- - + +
+ + + + + + + +
+ + - + 车辆基础信息 - - + - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + - - - - - - + + + + + - - + + @@ -93,28 +82,30 @@ 行驶证信息 + [placeholder]="isEdit?'':'-'"> + + + - - - + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - - - - + + + + + - + @@ -123,118 +114,114 @@ + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - + - - - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + + + + [placeholder]="isEdit?'':'-'"> + [placeholder]="isEdit?'':'-'"> - + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFrontWatermark,key:'certificatePhotoFrontWatermark',hover: 'FrontWatermark'}"> + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoBackWatermark,key:'certificatePhotoBackWatermark',hover: 'BackWatermark'}"> + 道路运输证信息 - + - + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhotoWatermark,key:'roadTransportPhotoWatermark', hover: 'Watermark'}"> + 认证司机 - - -
- 未上传 - 草稿 - 待审核 - 已审核 - 已驳回 - 证件过期 -
- - + + +
+ 未上传 + 草稿 + 待审核 + 已审核 + 已驳回 + 证件过期 +
+ + - + -
- 评分: -
评价内容：
-
+
+ 评分: +
评价内容：
+
-
- 暂无评价内容 -
+
+ 暂无评价内容 +
From e728f0346b5a2c7d6f6089370f3a0bf9dfb24668 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 14:13:44 +0800 Subject: [PATCH 16/18] edit --- proxy.conf.js | 2 +- .../requested-invoice-modal.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index cea0fccb..15faf001 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,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/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 64d2d120..a46d003c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -48,7 +48,7 @@ export class RequestedInvoiceModalComponent { * @returns */ removeOrder(item: any[]) { - if (this.st1.total <= 1) { + if (this.st1.total <= 1 || item?.length === this.st1.total) { this.service.msgSrv.warning('开票申请记录不能少于一个订单'); return; } From e3aab0fc5b96d07e4d8094309a52cbe5ff4e5503 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 14:24:00 +0800 Subject: [PATCH 17/18] fix bug --- proxy.conf.js | 4 ++-- .../individual-collect.component.ts | 16 ++++++---------- .../order-reporting/order-reporting.component.ts | 11 +++++++++++ .../services/tax-management.service.ts | 4 +++- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index cea0fccb..3639702c 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-19 13:17:35 + * @LastEditTime : 2022-04-19 14:20:28 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,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/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index f893b05a..032f85fe 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -285,16 +285,12 @@ export class TaxManagementIndividualCollectComponent implements OnInit { * @param params 更新数据 */ uploadSetting() { - if (this.selectedRows.length === 0) { - this.service.msgSrv.warning('请选择需要更新的数据'); - return; - } - // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - // if (res) { - // this.service.msgSrv.success('更新成功'); - // this.search(); - // } - // }) + this.service.request(this.service.$api_get_updateData).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('更新成功'); + this.search(); + } + }) } search() { 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 424f8f6f..0b7f33a6 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 @@ -413,10 +413,21 @@ export class TaxManagementOrderReportingComponent implements OnInit { * 上传 */ upload() { + let status = false if (this.selectedRows.length === 0) { this.openWainingModal('请选择需要上传的数据'); return; } + this.selectedRows.forEach(item => { + if (item?.putStatus != '0') { + status = true + } + + }); + if(status) { + this.service.msgSrv.warning('选择了已上传，请重新勾选！'); + return; + } let params: any[] = []; this.selectedRows.forEach(item => { params.push(item.id); 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 dcf02420..5cfd0639 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-04-09 14:22:35 + * @LastEditTime : 2022-04-19 14:19:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -50,6 +50,8 @@ export class TaxManagementService extends ShipperBaseService { $api_get_taxDeclaration = `/api/sdc/taxDeclaration/list/page`; // 更新所有税务申报 $api_get_taxDeclaration_updateAll = `/api/sdc/taxDeclaration/updateAll`; + // 更新所有个税汇总 + $api_get_updateData = `/api/sdc/taxSummary/updateData`; $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 From a5b97bc4edd28b61ca3dddf96df87d4af6851788 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 19 Apr 2022 14:27:11 +0800 Subject: [PATCH 18/18] edit --- .../withdrawals-detail.component.html | 6 +++--- .../withdrawals-detail.component.ts | 21 ++++++++++++------- .../services/freight-account.service.ts | 4 +++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html index f561427f..aa167bec 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html @@ -65,7 +65,7 @@
- +