diff --git a/src/app/routes/insurance-management/components/list/list.component.html b/src/app/routes/insurance-management/components/list/list.component.html index 6405c0a4..890e8902 100644 --- a/src/app/routes/insurance-management/components/list/list.component.html +++ b/src/app/routes/insurance-management/components/list/list.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-02-17 10:12:21 + * @LastEditTime : 2022-02-17 11:13:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -76,6 +76,9 @@ {{ item.premium | currency }} + + {{ item.processResult == '2' ? item.processMessage : '' }} +
{{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.carNo }}
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index 295e5b35..cd5107cc 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -426,7 +426,7 @@ export class insuranceManagementListComponent implements OnInit { title: '失败原因', width: '180px', className: 'text-left', - index: 'processMessage' + render: 'processMessage', // processResult=2 }, { diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html index f1cf0363..8ad65105 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 15:54:08 * @LastEditors : Shiming - * @LastEditTime : 2022-02-14 14:39:47 + * @LastEditTime : 2022-02-17 11:19:04 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -46,6 +46,11 @@ + +
+ +
+ +
{{item?.costRate ? item?.costRate + '%' : '' }}
+
+ +
货源单:{{item?.goodsSurchargeRatio ? item?.goodsSurchargeRatio + '%' : '' }}
+
合同单:{{item?.contractSurchargeRatio ? item?.contractSurchargeRatio + '%' : '' }}
+
+ +
{{item?.ticketEnable ? '已开启' : '未开启' }}
+
+ +
{{item?.insuranceEnable ? '已开启' : '未开启' }}
+
+ +
{{item?.pinganEnable ? '已开启' : '未开启' }}
+
+ +
{{item?.pufaEnable ? '已开启' : '未开启' }}
+
+ +
{{item?.pinganAccountEnable ? '已开启' : '未开启' }}
+
{{item?.pinganAccountEnable ? item?.pinganAccount : '' }}
+
+ +
{{item?.pufaAccountEnable ? '已开启' : '未开启' }}
+
{{item?.pufaAccountEnable ? item?.pufaAccount : '' }}
+
+ +
{{item?.invoiceEnable ? '已开启' : '未开启' }}
+
开通子账户 diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index 0719c4fd..b7e89d83 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -47,51 +47,51 @@ export class NetworkFreightComponent implements OnInit { { title: '成立日期', width: '150px', - index: 'createTime' + index: 'enterpriseRegistrationTime' }, { title: '成本费率', width: '150px', - render: 'electronicInvoiceAccount' + render: 'costRate' }, { title: '附加费率', width: '150px', - render: 'etcAccount' + render: 'goodsSurchargeRatio' }, { title: '云开票', width: '150px', - render: 'electronicContractAccount' + render: 'ticketEnable' }, { title: '保险', width: '150px', - render: 'electronicContractAccount' + render: 'insuranceEnable' }, { title: '平安银行', width: '150px', - render: 'bankName' }, + render: 'pinganEnable' }, { title: '浦发银行', width: '150px', - render: 'virtualAccount' + render: 'pufaEnable' }, { title: '平安电子账户', width: '150px', - render: 'virtualAccount' + render: 'pinganAccountEnable' }, { title: '浦发电子账户', width: '150px', - render: 'virtualAccount' + render: 'pufaAccountEnable' }, { title: '开票开关', width: '150px', - render: 'virtualAccount' + render: 'invoiceEnable' }, { title: '操作', @@ -101,7 +101,7 @@ export class NetworkFreightComponent implements OnInit { buttons: [ { text: '基础设置', - click: item => this.settingAction(item) + click: item => this.ticket(item) }, { text: '财务设置', @@ -117,7 +117,7 @@ export class NetworkFreightComponent implements OnInit { }, { text: '系统配置', - click: item => this.ticket(item) + click: item => this.settingAction(item) }, // { // text: '合同设置',