From 7b1728622262c5dcb28037177d85e91c5005f4df Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 13:48:52 +0800 Subject: [PATCH 1/5] fix bug --- .../components/busitable/busiindex/busiindex.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 1dbf859b..6a27ee0b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -37,7 +37,9 @@ export class DatatableBusiindexComponent implements OnInit { { title: '客户预存款', index: 'czcgje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.czcgje }) } }, { title: '业绩量', index: 'yisje', className: 'text-center' }, { title: '已收附加费', index: 'yisfjf', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } }, - { title: '平均附加费率', index: 'fjfl', className: 'text-center' }, + { title: '平均附加费率', index: 'fjfl', className: 'text-center',format: (item)=> { + return item.fjfl + '%' + } }, { title: '已开票金额', index: 'ykpje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } }, ]; /** From 50beff0bbb1f912b08042ffc7d56a401f1a3d08b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 13:51:50 +0800 Subject: [PATCH 2/5] fix bug --- .../components/risk/risk.component.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index c7ff2549..9f81f0fe 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 11:02:21 + * @LastEditTime : 2022-04-08 13:51:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -86,8 +86,12 @@
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
- -
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
+ +
+
{{item.payeeName}}
+
{{item.payeePhone}}
+
+
-
From bcba6058e15ab2a0e631cfd024f4d4d8c391d3c5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 14:03:54 +0800 Subject: [PATCH 3/5] edit --- .../individual-collect.component.ts | 71 ++++++++++++++----- 1 file changed, 53 insertions(+), 18 deletions(-) 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 30878968..2696463d 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 @@ -91,9 +91,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { placeholder: '请选择', widget: 'select', containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } }, default: '' }, @@ -109,20 +106,17 @@ export class TaxManagementIndividualCollectComponent implements OnInit { type: 'string', enum: [ { value: '', label: '全部' }, - { value: '0', label: '否' }, - { value: '1', label: '是' } + { value: false, label: '否' }, + { value: true, label: '是' } ], ui: { placeholder: '请选择', widget: 'select', containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } }, default: '' }, - createTime: { + skss: { title: '税款所属期', type: 'string', ui: { @@ -134,7 +128,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } } as SFDateWidgetSchema }, - createTime3: { + sbrq: { title: '申报日期', type: 'string', ui: { @@ -182,7 +176,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit { '3': { text: '不通过', color: 'error' } } }, - { title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } }, + { + title: '是否逾期', + index: 'overdueStatus', + className: 'text-center', + width: '120px', + type: 'enum', + enum: { false: '否', true: '是' } + }, { title: '税款所属期起', index: 'skssqq', @@ -197,12 +198,46 @@ export class TaxManagementIndividualCollectComponent implements OnInit { width: '180px' }, { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, - { title: '税率', index: 'sl', className: 'text-center', width: '150px' }, - { title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' }, - { title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' }, - { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, - { title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' }, - { title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' }, + { + title: '税率', + index: 'sl', + className: 'text-right', + width: '150px', + format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%` + }, + { title: '申报人数', index: 'sbrs', className: 'text-right', width: '150px' }, + { + title: '应税收入', + index: 'yssr', + className: 'text-right', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) } + }, + { + title: '应纳税额', + index: 'ynse', + className: 'text-right', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, + { + title: '累计已缴纳税额', + index: 'ljyjnse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) } + }, + { + title: '本期应补退税额', + index: 'bqybtse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) } + }, { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' } ]; } @@ -233,7 +268,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.name || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); }); From bba13a958d8123b544fc4a94388fb94d07a2eb24 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 14:04:28 +0800 Subject: [PATCH 4/5] fix bug --- .../vehicle-detail/vehicle-detail.component.html | 2 +- .../confir-receipt/confir-receipt.component.html | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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 52a85b12..9c1db1d5 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-04-06 15:39:20 + * @LastEditTime : 2022-04-08 14:01:28 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index bd2b7f0e..807acb0b 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -1,4 +1,14 @@ +货物单价 @@ -225,7 +225,6 @@ -
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
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 9c1db1d5..f9519e6c 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-04-08 14:01:28 + * @LastEditTime : 2022-04-08 14:06:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -249,7 +249,6 @@ -
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈