From 93b3e54035f65bc511dc36ce32ff75575bde7612 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 14 Apr 2022 20:04:00 +0800 Subject: [PATCH 01/22] fix bug --- .../bulk-detail/bulk-detail.component.html | 35 +++++++++++++++++-- .../individual-declare.component.ts | 9 +++-- 2 files changed, 39 insertions(+), 5 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 8109f880..3a0d5d54 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-04-14 10:08:12 + * @LastEditTime : 2022-04-14 20:03:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -127,7 +127,7 @@ - + + + + + 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 + +
+ {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ + i?.settlementBasisLabel }}，{{ + i?.ruleLabel + }}） +
+ + + {{ item.price + item.surcharge | currency }} + + 到付 + {{item.price | currency}} + {{item.surcharge | currency}} + +
+ 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） +
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
 diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 0f7c54a0..39d9db59 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -53,9 +53,12 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { * 查询参数 */ get reqParams() { - const params = Object.assign({}, this.sf?.value || {}, { - declareStatus: this.selectedIndex - }); + console.log(); + + const params = Object.assign({}, this.sf?.value || {}); + if(this.selectedIndex) { + params.declareStatus = this.selectedIndex + } delete params._$expand; return { ...params }; } From fbc133f96db5d4797dc321ff67e8bce981150716 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 09:39:47 +0800 Subject: [PATCH 02/22] edit --- .../cancellation-invoice.component.html | 43 ++++++++++++------- .../cancellation-invoice.component.ts | 1 - 2 files changed, 27 insertions(+), 17 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 84bf6e93..bd28cc3d 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 @@ -56,37 +56,48 @@
-
- -

公司名： {{openInfo?.artoname}}

-

税号： {{openInfo?.artotaxno}}

-

注册地址： {{openInfo?.artoadd}}

-

注册电话： {{openInfo?.artotel}}

-

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

+
+ + {{openInfo?.artoname}} - + + {{openInfo?.artotaxno}} + + + {{openInfo?.artoadd}} + + + {{openInfo?.artotel}} + + + {{openInfo?.artobank}} + + + {{openInfo?.artoacc}} + + {{openInfo?.vatnameLabel}} - + {{openInfo?.vatremarks}} - + {{openInfo?.otherremarks}} - + {{openInfo?.isdetail?'需要':'不需要'}} - + {{openInfo?.vatmoney | currency}} - - + + - + - +
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index a9d95464..f38bbe2b 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -89,7 +89,6 @@ export class CancellationInvoiceComponent implements OnInit { this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null }; this.service.request(this.service.$api_get_apply_fico_info, { id: item.vatappHId }).subscribe(info => { if (info) { - console.log(info); Object.assign(this.openInfo, { ...info }); const modal = this.nzModalService.create({ nzTitle: '发票确认', From a2f7ba9a4f417e6632693ffb7df09a3b089568d6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 10:06:35 +0800 Subject: [PATCH 03/22] fix bug --- .../bulk-detail-change.component.html | 55 +++++++++++-------- .../bulk-detail/bulk-detail.component.html | 29 +--------- .../vehicle-detail.component.html | 4 +- .../bulk-detail/bulk-detail.component.html | 54 +++++++++++------- 4 files changed, 68 insertions(+), 74 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 38b54fcb..85febdb2 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 15:40:05 + * @LastEditTime : 2022-04-15 09:58:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -254,31 +254,38 @@ - - -

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

- - 到付 - - {{ item.price | currency }} - - - {{ item.price + item.surcharge | currency }} - - - {{ item.surcharge | currency }} - - -
-
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%） -
-
-
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" + i?.payeePhone : ''}}
+ + + + 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 + +
+ {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ + i?.settlementBasisLabel }}，{{ + i?.ruleLabel + }}） +
+ + + {{ item.price + item.surcharge | currency }} + + 到付 + {{item.price | currency}} + {{item.surcharge | currency}} + +
+ 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） +
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }}
 - 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 3a0d5d54..3d25c047 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-04-14 20:03:33 + * @LastEditTime : 2022-04-15 09:58:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -127,31 +127,6 @@
- @@ -158,7 +158,7 @@ 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + - i?.payeePhone : '' }}
+ i?.payeePhone : '' }}/{{ i?.payeeIdNo }} 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 b49c9148..b075743d 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 @@ - + + + + + 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 + +
+ {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ + i?.settlementBasisLabel }}，{{ + i?.ruleLabel + }}） +
+ + + {{ item.price + item.surcharge | currency }} + + 到付 + {{item.price | currency}} + {{item.surcharge | currency}} + +
+ 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） +
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
 - From f7953889ba0cb8a2f624aeb8d85dbb9f58cba447 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 10:07:25 +0800 Subject: [PATCH 04/22] fix bug --- .../vehicle-detail-change.component.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index 33d7ebdc..6598a126 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 11:08:44 + * @LastEditTime : 2022-04-15 10:07:20 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -243,17 +243,19 @@ {{ item.price | currency }} - {{ item.price + item.surcharge | currency }} + {{ item.price + item.surcharge | currency }} {{ item.surcharge | currency }}
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ） + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
-
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" + i?.payeePhone : ''}}
+
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + + i?.payeePhone : '' }}/{{ i?.payeeIdNo }}
 From 4a2d6de9f5dcdc86addc879dddfead9e991eaa5e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 10:35:14 +0800 Subject: [PATCH 05/22] edit --- .../freight/list/detail/detail.component.html | 66 ++++++++++--------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 43c5bfe0..056ca944 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -234,7 +234,9 @@ [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'"> - {{detailData.enterpriseAddress}} + {{ detailData?.fullRegionVO?.provinceName }}{{ + detailData?.fullRegionVO?.cityName }}{{ + detailData?.fullRegionVO?.areaName }}{{detailData.enterpriseAddress}} @@ -370,16 +372,16 @@ {{partnerInfo.partnerEnterpriseName}} - + - + - + - - - - - {{ item.remark }} - -- - - - - - - - {{ item.remark }} - -- - - - - + + + + + {{ item.remark + }} + -- + + + + + + + {{ item.remark + }} + -- + + + +
From 0a94c81031e1ad481597443bfee1b5b2943d0950 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 11:08:31 +0800 Subject: [PATCH 06/22] edit --- .../voucher-summary/voucher-list/voucher-list.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts index a8422946..328056b4 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts @@ -217,7 +217,7 @@ export class VoucherListComponent implements OnInit { buttons: [ { text: '浏览', - click: (item: any) => this.router.navigate(['/voucher-summary/list/detail/' + item.id]) + click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]) } ] } From 389a92c738f0735b21986e328a67366c3127a978 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 11:10:07 +0800 Subject: [PATCH 07/22] edit --- .../voucher-summary/voucher-list/voucher-list.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html index 27bd4068..09835d0d 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html @@ -11,8 +11,8 @@
- - + - - + + + @@ -44,54 +48,42 @@ - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + - - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + + - - - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + + + - - - + [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> + + + - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.carFrontPhotoWatermark,key:'carFrontPhotoWatermark',hover: 'PhotoWatermark2'}"> + @@ -100,26 +92,26 @@ 行驶证信息 + [placeholder]="isEdit?'':'-'"> + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> - - - - - + - + @@ -128,11 +120,11 @@ + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> - + + [placeholder]="isEdit?'':'-'"> + [placeholder]="isEdit?'':'-'"> - + @@ -162,7 +154,7 @@ - @@ -172,28 +164,28 @@ 道路运输证信息 + [placeholder]="isEdit?'':'-'"> - + + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> + [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"> - + *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhotoWatermark,key:'roadTransportPhotoWatermark', hover: 'Watermark'}"> + @@ -201,8 +193,7 @@ 认证司机
From d6c66a21a216da5c42bb8aaf5757109d19a11a4f Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 14:33:22 +0800 Subject: [PATCH 14/22] edit --- .../invoice-requested-detail.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 7700b77c..b02371b5 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 @@ -342,7 +342,9 @@ export class InvoiceRequestedDetailComponent implements OnInit { title: '税率', index: 'billvatrate', width: 90, - format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` + format: item => `9.00%` + // bugfix 6976 + // format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` }, { title: '发票号码', index: 'vatinvcode', width: 100 }, { title: '开票日期', index: 'vatinvtime', type: 'date', width: 150 } From aacf116e4bafe8c56abc09f897e4820ac1770627 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 15:05:46 +0800 Subject: [PATCH 15/22] edit --- .../payable-order.component.html | 20 ++++++++++++++ .../payable-order/payable-order.component.ts | 13 +++++++++- .../receivable-order.component.html | 20 ++++++++++++++ .../receivable-order.component.ts | 26 ++++++++++++++----- .../services/freight-account.service.ts | 4 +++ 5 files changed, 75 insertions(+), 8 deletions(-) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html index bc0c5c7b..ed91bd00 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html @@ -11,6 +11,26 @@ + + + + + + + + + + + + + + + + +
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 64c951c6..f5fac6ee 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -23,6 +23,7 @@ export class PayableOrderComponent implements OnInit { _$expand = false; selectedRows: any[] = []; + info: any = {}; constructor( public service: FreightAccountService, private nzModalService: NzModalService, @@ -30,7 +31,16 @@ export class PayableOrderComponent implements OnInit { private currencyPipe: CurrencyPipe ) {} - ngOnInit(): void {} + ngOnInit(): void { + } + + loadInfo() { + this.service.request(this.service.$api_get_fico_ph_sum).subscribe(res => { + if (res) { + this.info = res; + } + }); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -54,6 +64,7 @@ export class PayableOrderComponent implements OnInit { }); } } + this.loadInfo(); return requestOptions; }; diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index 63041216..0755a3f3 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -10,6 +10,26 @@ --> + + + + + + + + + + + + + + + + +
diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 3732bc49..38da87bb 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -24,6 +24,8 @@ export class ReceivableOrderComponent implements OnInit { _$expand = false; selectedRows: any[] = []; + + info: any = {}; constructor( public service: FreightAccountService, private nzModalService: NzModalService, @@ -31,7 +33,16 @@ export class ReceivableOrderComponent implements OnInit { private currencyPipe: CurrencyPipe ) {} - ngOnInit(): void {} + ngOnInit(): void { + } + + loadInfo() { + this.service.request(this.service.$api_get_fico_sum).subscribe(res => { + if (res) { + this.info = res; + } + }); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -55,6 +66,7 @@ export class ReceivableOrderComponent implements OnInit { }); } } + this.loadInfo(); return requestOptions; }; @@ -260,23 +272,23 @@ export class ReceivableOrderComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 }, - { title: '订单号', index: 'billHCode', type: 'link', width: 140 }, - { title: '网络货运人', index: 'ltdName', width: 160 }, + { title: '核销单号', index: 'ahxcode', type: 'link', width: 210 }, + { title: '订单号', index: 'billHCode', type: 'link', width: 180 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, - { title: '收款账户', index: 'ltdaccountId', width: 160 }, + { title: '收款账户', index: 'ltdaccountId', width: 200 }, { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 }, { title: '核销金额', index: 'ahxmoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.ahxmoney)}` }, { title: '应收金额', index: 'armoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.armoney)}` }, diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 21879053..a149cb77 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -88,6 +88,8 @@ export class FreightAccountService extends ShipperBaseService { // 查询应收核销抬头 $api_get_fico_page = '/api/fcc/ficoAhxH/list/page'; + // 应收核销汇总 + $api_get_fico_sum = '/api/fcc/ficoAhxH/getSum'; // 获取应收核销抬头 $api_get_fico_header = '/api/fcc/ficoAhxH/get'; // 查询应收核销明细 @@ -95,6 +97,8 @@ export class FreightAccountService extends ShipperBaseService { // 查询应付核销抬头 $api_get_fico_ph_page = '/api/fcc/ficoPhxH/list/page'; + // 应付核销汇总 + $api_get_fico_ph_sum = '/api/fcc/ficoPhxH/getSum'; // 获取应付核销抬头 $api_get_fico_ph_header = '/api/fcc/ficoPhxH/get'; // 查询应付核销明细 From 450892e79d885483f9f05b3c149f9a6a53c8ddc5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 15:16:31 +0800 Subject: [PATCH 16/22] fix bug --- .../release-publish/release-publish.component.ts | 15 +++++++++++---- .../tran-agreement/tran-agreement.component.ts | 4 ++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 6683e303..d82b9567 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -173,9 +173,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - allowClear: true + allowClear: true, } as SFSelectWidgetSchema }, + enterpriseInfoNamer: { + type: 'string', + title: '', + ui: { hidden: true } + }, enterpriseInfoName: { type: 'string', title: '网络货运人', @@ -184,7 +189,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.shipperSrv.getNetworkFreightForwarder(), - change: () => this.payChange() + change: (q: any, qs: any) => { + console.log(qs.label); + this.sf1.setValue('/enterpriseInfoNamer', qs.label); + this.payChange() + } } }, externalResourceCode: { @@ -753,8 +762,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { resourcetype: '1' }; this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => { - console.log('999'); - console.log(this?.sf1.value); if (res) { this.sf7.setValue('/appendFee', res.surcharge); this.sf7.setValue('/subtotal', subtotal); diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index a70664c4..8cfa9ca5 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:19:51 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 19:57:34 + * @LastEditTime : 2022-04-15 15:15:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -60,7 +60,7 @@ export class TranAgreementComponent { shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人 carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 shipperName: this?.shipperName || '', //托运人 - carrierName: this.object?.enterpriseInfoName || '', //承运人 + carrierName: this.object?.enterpriseInfoNamer || this.object?.enterpriseInfoName || '', //承运人 consignorInfo: `${this.object?.unLoadingPlaceDTOList[0]?.appUserName || ''} ${ this.object?.unLoadingPlaceDTOList[0]?.contractTelephone || '' }`, // 发货信息 From fe7010f227c075d99ce5a0b6a5be3428f0ce756f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 15:19:20 +0800 Subject: [PATCH 17/22] fix bug --- .../bulk-release-publish.component.ts | 18 +++++++++--------- .../tran-agreement.component.html | 10 ++++++++++ .../tran-agreement/tran-agreement.component.ts | 4 ++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index d7383ec2..789f2339 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -160,14 +160,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { allowClear: true, } as SFSelectWidgetSchema }, - // enterpriseInfoName: { - // type: 'string', - // title: '网络货运人', - // ui: { - // widget: 'custom' - // }, - // default: '天津市怡亚通XXXX有限公司' - // }, + enterpriseInfoNamer: { + type: 'string', + title: '', + ui: { hidden: true } + }, enterpriseInfoId: { type: 'string', title: '网络货运人', @@ -175,7 +172,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperSrv.getNetworkFreightForwarder() + asyncData: () => this.shipperSrv.getNetworkFreightForwarder(), + change: (q: any, qs: any) => { + this.sf1.setValue('/enterpriseInfoNamer', qs.label); + } } }, deadlineTime: { diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html index bbe21f8f..25ed7a44 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html @@ -1,3 +1,13 @@ +
diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index 8cfa9ca5..d49c407e 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:19:51 * @LastEditors : Shiming - * @LastEditTime : 2022-04-15 15:15:13 + * @LastEditTime : 2022-04-15 15:18:29 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -98,7 +98,7 @@ export class TranAgreementComponent { parametersDTO: { contractCode: '', shipperName: this?.shipperName || '', //托运人 - carrierName: this.object?.enterpriseInfoName || '', //承运人 + carrierName: this.object?.enterpriseInfoNamer || this.object?.enterpriseInfoName || '', //承运人 shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人 carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人 consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''} ${ From 5b1d849d31fddcb69495b920e200e1b17aecce9f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 15:38:41 +0800 Subject: [PATCH 18/22] fix bug --- .../individual-declare.component.ts | 55 +++++++++++++++---- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 39d9db59..95bd1a94 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -54,10 +54,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ get reqParams() { console.log(); - + const params = Object.assign({}, this.sf?.value || {}); - if(this.selectedIndex) { - params.declareStatus = this.selectedIndex + if (this.selectedIndex) { + params.declareStatus = this.selectedIndex; } delete params._$expand; return { ...params }; @@ -265,7 +265,14 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { { title: '所属行业', index: 'hy', className: 'text-center', width: '200px' }, { title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' }, { title: '征收品目', index: 'zsmp', className: 'text-center', width: '200px' }, - { title: '计税依据', index: 'jsyj', className: 'text-center', width: '200px' }, + { + title: '计税依据', + index: 'jsyj', + className: 'text-center', + width: '200px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, { title: '税率', index: 'sl', @@ -282,14 +289,38 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } }, - { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' , type: 'widget', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jmse }) } }, - { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px', type: 'widget', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yjnse }) } }, - { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px', type: 'widget', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dzse }) } }, - { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px', type: 'widget', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ydzse }) } }, + { + title: '减免税额', + index: 'jmse', + className: 'text-center', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jmse }) } + }, + { + title: '已缴纳税额', + index: 'yjnse', + className: 'text-center', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yjnse }) } + }, + { + title: '应代征税额', + index: 'dzse', + className: 'text-center', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dzse }) } + }, + { + title: '已代征税额', + index: 'ydzse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ydzse }) } + }, { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' } ]; } From 792598efd4885f0647efffc22082212b70161f84 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 15:56:00 +0800 Subject: [PATCH 19/22] fix bug --- .../individual-collect/individual-collect.component.ts | 4 ++++ 1 file changed, 4 insertions(+) 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 8876c702..a22ef126 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 @@ -298,6 +298,10 @@ 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('更新成功'); From ff7a5a80fc9b5b611e9c1ba71b582e740eede660 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 15 Apr 2022 16:49:09 +0800 Subject: [PATCH 20/22] fix bug --- .../customer/customer.component.html | 44 +++++++++- .../compliance/customer/customer.component.ts | 84 +++++++++++++++---- .../routes/datatable/services/data.service.ts | 5 +- .../abnormal-appear.component.html | 8 +- .../abnormal-appear.component.ts | 13 ++- 5 files changed, 128 insertions(+), 26 deletions(-) diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html index 56092666..45f01672 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.html +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -1,6 +1,46 @@ + - - + +
+ + +
+ + + {{ item.freightPrice | currency }} + + diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts index 1546a048..2971ed5b 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.ts +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts @@ -1,39 +1,89 @@ +import { SFComponent } from '@delon/form'; +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-30 13:55:41 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-15 16:35:10 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, ViewChild } from '@angular/core'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } 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-compliance-customer', templateUrl: './customer.component.html', }) export class DatatableComplianceCustomerComponent implements OnInit { - url = `/user`; + @ViewChild('sf', {static: false}) sf!: SFComponent + mode = 'year'; + date: any = null; + defineDate = []; + time: any = ['2022-01-01 00:00:00'] + dateFormat = 'yyyy'; + dateNext: any = null; + modeNext = 'year'; + timeNext: any = ['2022-01-01 00:00:00'] + today = new Date(); searchSchema: SFSchema = { properties: { no: { type: 'string', - title: '编号' - } + title: '客户名称' + }, + no2: { + type: 'string', + title: '业务员' + }, + no3: { + type: 'string', + title: '合伙人名称' + }, } }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = [ - { title: '编号', index: 'no' }, - { title: '调用次数', type: 'number', index: 'callNo' }, - { title: '头像', type: 'img', width: '50px', index: 'avatar' }, - { title: '时间', type: 'date', index: 'updatedAt' }, - { - title: '', - buttons: [ - // { text: '查看', click: (item: any) => `/form/${item.id}` }, - // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, - ] - } + { title: '公司名称', index: 'enterpriseName' ,}, + { title: '注册时间', index: 'registerTime' }, + { title: '客户类型', width: '100px', index: 'customerType' }, + { title: '业务员', index: 'salesmanName' }, + { title: '合伙人', index: 'partnerName' }, + { title: '订单数', index: 'billCounts' }, + { title: '订单不合格数', index: 'billQuaCounts' }, + { title: '订单不合格率', index: 'billQuaCountsPer' }, + { title: '货源单订单数', index: 'gsourceCounts' }, + { title: '合同单数', index: 'billConCounts' }, + { title: '货源单个', index: 'gsourceCounts' }, + { title: '运费直付单数', index: 'freightDirPayCounts' }, + { title: '运费代收单数', index: 'freightRepPayCounts' }, + { title: '手机直付', index: 'updatedAt' }, + { title: '汇款单数', index: 'updatedAt' }, + { title: '及时付款', index: 'timelyPayPer' }, + ]; - constructor(private http: _HttpClient, private modal: ModalHelper) { } - + constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,) { } + beforeReq = (requestOptions: STRequestOptions) => { + const params: any = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + console.log(params); + if (this.sf) { + Object.assign(requestOptions.body, { + ...params, + }); + } + return requestOptions; + }; + afterRes = (data: any[], rawData?: any) => { + return data.map(item => ({ + ...item, + })); + }; ngOnInit(): void { } add(): void { diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index e7443148..117ac0d8 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 15:07:27 + * @LastEditTime : 2022-04-15 16:03:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\services\\data.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -85,6 +85,9 @@ export class DataService extends BaseService { // 数据大屏-交易分布 $api_getTransactionDistribution = `/api/sdc/reportDataLargeScreen/getTransactionDistribution`; + // 客户-合规报表 + $api_listCusComplianceReportPage = `/api/sdc/report/listCusComplianceReportPage`; + constructor(public injector: Injector) { diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index 393c74d6..a85f4bdc 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@ - +
- - +
diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.less b/src/app/routes/datatable/components/compliance/customer/customer.component.less new file mode 100644 index 00000000..6b4b1cba --- /dev/null +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.less @@ -0,0 +1,11 @@ +.chooseBox{ + display: flex; +} +.timeBox{ + display: flex; + margin: 0 0 0 10px; +} +.dateBox{ + display: inline-block; + margin: 0 0 0 10px; +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts index 2971ed5b..72bd8ee4 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.ts +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts @@ -5,26 +5,31 @@ import { SFComponent } from '@delon/form'; * @Author : Shiming * @Date : 2022-03-30 13:55:41 * @LastEditors : Shiming - * @LastEditTime : 2022-04-15 16:35:10 + * @LastEditTime : 2022-04-15 17:13:03 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFSchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; +import { ModalHelper, _HttpClient ,DatePipe} from '@delon/theme'; import { DataService } from '../../../services/data.service'; +import { differenceInCalendarDays } from 'date-fns'; @Component({ selector: 'app-datatable-compliance-customer', templateUrl: './customer.component.html', + styleUrls: ['./customer.component.less'], + providers: [DatePipe] + }) export class DatatableComplianceCustomerComponent implements OnInit { @ViewChild('sf', {static: false}) sf!: SFComponent mode = 'year'; + type = 1; date: any = null; defineDate = []; - time: any = ['2022-01-01 00:00:00'] + time: any = ['2022'] dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; @@ -67,29 +72,49 @@ export class DatatableComplianceCustomerComponent implements OnInit { ]; - constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,) { } - beforeReq = (requestOptions: STRequestOptions) => { + constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,private datePipe: DatePipe) { } + /** + * 查询参数 + */ + get reqParams() { + if (this.mode === 'year') { + this.type = 1 + } else if (this.mode === 'month') { + this.type = 2 + } else if (this.mode === 'date') { + this.type = 3 + } else { + this.type = 4 + } const params: any = Object.assign({}, this.sf?.value || {}); - delete params._$expand; - console.log(params); - if (this.sf) { - Object.assign(requestOptions.body, { - ...params, - }); + params.type = this.type + params.queryTime = this.time + delete params._$expand; + return { ...params }; } - return requestOptions; - }; - afterRes = (data: any[], rawData?: any) => { - return data.map(item => ({ - ...item, - })); - }; ngOnInit(): void { } - - add(): void { - // this.modal - // .createStatic(FormEditComponent, { i: { id: 0 } }) - // .subscribe(() => this.st.reload()); + onChange(result: any) { + if (this.mode === 'year') { + this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] + } else if (this.mode === 'month') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] + } 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.st.reload({ ...this.reqParams }); } - + changeData() { + if (this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if (this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } else { + this.dateFormat = 'yyyy-MM-dd' + } + } + disabledDate = (current: Date): boolean => + // Can not select days before today and today + differenceInCalendarDays(current, this.today) > 0; }