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 af0b072e..226346c3 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-10 10:40:17 + * @LastEditTime : 2022-02-14 13:29:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -60,27 +60,24 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="service.http.loading" > - - {{ item.freightPrice | currency}} + + {{ item.resourceCode | currency}} - -
装 | {{item?.loadPlanTime}}
-
卸 | {{item?.unloadPlanTime}}
+ + {{ item.practicalPremium | currency}} + + + {{ item.premium | currency}}
- {{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}} + {{item?.driverName}}/{{item?.driverTelephone}}/{{item?.carNo}}
- + +
{{item.insureCode}}
- {{item?.payeeName}}/{{item?.payeePhone}} -
-
- - {{item.billCode}} -
- {{item?.billStatusLabel}} + {{item?.insureStatusLabel}}
@@ -92,7 +89,7 @@ -
+

{{ data.expenseName }}:{{ data.price | currency }} {{ data.paymentStatusLabel }} 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 acf45810..842b16a8 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -328,25 +328,25 @@ export class insuranceManagementListComponent implements OnInit { width: '180px', fixed: 'left', className: 'text-left', - render: 'billCode' + render: 'insureCode' }, { title: '保单号', width: '250px', className: 'text-right', - render: 'mybidDetailInfo' + render: 'policyNo' }, - { title: '类型', index: 'enterpriseInfoName', width: '220px', className: 'text-left' }, - { title: '始发地', index: 'shipperAppUserName', width: '220px', className: 'text-left' }, - { title: '目的地', index: 'enterpriseProjectName', width: '220px', className: 'text-left' }, - { title: '距离', index: 'wayBillCode', width: '180px', className: 'text-left' }, + { title: '类型', index: 'insureTypeLabel', width: '220px', className: 'text-left' }, + { title: '始发地', index: 'startAddress', width: '220px', className: 'text-left' }, + { title: '目的地', index: 'endAddress', width: '220px', className: 'text-left' }, + { title: '距离', index: 'distance', width: '180px', className: 'text-left' }, { title: '保额(元)', index: 'resourceCode', width: '180px', className: 'text-left' }, - { title: '保费(元)', index: 'loadingAddressArr', width: '180px', className: 'text-left' }, + { title: '保费(元)', render: 'premium', width: '180px', className: 'text-left' }, { title: '实际保费(元)', className: 'text-left', width: '180px', - index: 'unloadingAddressArr' + render: 'practicalPremium' }, { title: '货物信息', @@ -358,7 +358,7 @@ export class insuranceManagementListComponent implements OnInit { title: '车牌号', className: 'text-right', width: '180px', - render: 'freightPrice' + render: 'driverName' }, { title: '关联订单号', @@ -369,46 +369,44 @@ export class insuranceManagementListComponent implements OnInit { { title: '货源编号', className: 'text-right', - index: 'settlementWeight', + index: 'resourceCode', width: '150px' }, { title: '网络货运人', className: 'text-left', width: '250px', - index: 'driverName', - render: 'driverName' + index: 'enterpriseInfoName', }, { title: '货主', className: 'text-left', width: '180px', - index: 'payeeName', - render: 'payeeName' + index: 'shipperAppUserName', }, { title: '所属项目', width: '200px', className: 'text-left', - render: 'loadingTime' + render: 'enterpriseProjectName' }, { title: '投保时间', width: '180px', className: 'text-left', - index: 'createTime' + index: 'insureTime' }, { title: '生效时间', width: '180px', className: 'text-left', - index: 'createTime' + index: 'effectTime' }, { title: '录单时间', width: '180px', className: 'text-left', - index: 'createTime' + index: 'recordTime' }, { title: '创建时间', @@ -420,7 +418,7 @@ export class insuranceManagementListComponent implements OnInit { title: '失败原因', width: '180px', className: 'text-left', - index: 'createTime' + index: 'processMessage' }, { title: '操作', 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 c5430704..3b0216e5 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-01-20 20:28:15 + * @LastEditTime : 2022-02-14 10:33:38 * @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. --> 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 4e65ce4e..f1cf0363 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-11 15:36:29 + * @LastEditTime : 2022-02-14 14:39:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -55,15 +55,6 @@ [loading]="service.http.loading" (change)="stChange($event)" > - - 设置 - - - 设置 - - - 设置 - 开通子账户 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 d1d297a4..0719c4fd 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 @@ -45,24 +45,30 @@ export class NetworkFreightComponent implements OnInit { index: 'taxCode' }, { - title: '发票税率', + title: '成立日期', width: '150px', - - index: 'invoiceTaxRate' }, + index: 'createTime' + }, { - title: '云开票', + title: '成本费率', width: '150px', render: 'electronicInvoiceAccount' }, { - title: 'e签宝', + title: '附加费率', width: '150px', render: 'etcAccount' }, + { + title: '云开票', + width: '150px', + render: 'electronicContractAccount' + }, { title: '保险', width: '150px', - render: 'electronicContractAccount' }, + render: 'electronicContractAccount' + }, { title: '平安银行', width: '150px', @@ -72,36 +78,52 @@ export class NetworkFreightComponent implements OnInit { width: '150px', render: 'virtualAccount' }, + { + title: '平安电子账户', + width: '150px', + render: 'virtualAccount' + }, + { + title: '浦发电子账户', + width: '150px', + render: 'virtualAccount' + }, + { + title: '开票开关', + width: '150px', + render: 'virtualAccount' + }, { title: '操作', - width: '', + width: '110px', fixed: 'right', className: 'text-left', buttons: [ { - text: '银行设置 ', + text: '基础设置', + click: item => this.settingAction(item) + }, + { + text: '财务设置', click: item => this.roleAction(item, 2) }, { - text: '系统配置 ', - click: item => this.roleAction(item, 2) + text: '充值账户', + click: item => this.settingPay(item) }, { - text: '银行卡管理', - click: item => this.roleAction(item, 2) + text: '应用设置', + click: item => this.settingApp(item) + }, + { + text: '系统配置', + click: item => this.ticket(item) }, - // { - // text: '票务设置', - // click: item => this.ticket(item) - // }, // { // text: '合同设置', // click: item => this.roleAction(item, 2) // }, - { - text: '基础设置 ', - click: item => this.settingAction(item) - } + ] } ]; @@ -329,7 +351,7 @@ export class NetworkFreightComponent implements OnInit { nzOnOk: () => {} }); } - +// 基础设置 settingAction(item?: any) { this.nzModalService.create({ nzTitle: '基础设置', @@ -337,7 +359,35 @@ export class NetworkFreightComponent implements OnInit { nzWidth: 900, nzComponentParams: { extendType: '1', - businessId: item.id + businessId: item.id, + }, + nzFooter: null + }); + } + // 应用设置 + settingApp(item?: any) { + this.nzModalService.create({ + nzTitle: '基础设置', + nzContent: DynamicSettingModalComponent, + nzWidth: 900, + nzComponentParams: { + extendType: '1', + businessId: item.id, + configvalue: 'app' + }, + nzFooter: null + }); + } + // 重置账户 + settingPay(item?: any) { + this.nzModalService.create({ + nzTitle: '基础设置', + nzContent: DynamicSettingModalComponent, + nzWidth: 900, + nzComponentParams: { + extendType: '1', + businessId: item.id, + configvalue: 'bankcard' }, nzFooter: null }); @@ -411,16 +461,16 @@ export class NetworkFreightComponent implements OnInit { getRegionDetailByCode(regionCode: any) { return this.service.request(this.service.$api_get_region_by_code, { regionCode }); } - setMakeInvoice2(item:any) { - this.nzModalService.create({ - nzTitle: '基础设置', - nzContent: SinglepageSettingModalComponent, - nzWidth: 900, - nzComponentParams: { - extendType: '1', - businessId: item.id - }, - nzFooter: null - }); - } + // setMakeInvoice2(item:any) { + // this.nzModalService.create({ + // nzTitle: '基础设置', + // nzContent: SinglepageSettingModalComponent, + // nzWidth: 900, + // nzComponentParams: { + // extendType: '1', + // businessId: item.id + // }, + // nzFooter: null + // }); + // } } diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index 2eb2dd34..8c7d5a06 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -209,12 +209,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { fixed: 'right', width: '180px', className: 'text-center', - buttons: [ - { text: '审核', - click: _record => this.ViewAdimin(_record), iif: (item: any) => item.approvalStatus === 10, - acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-adminAudit'] }, - } - ] + buttons: [{ + text: '审核', + click: _record => this.ViewAdimin(_record), + iif: (item: any) => item.approvalStatus === 10, + // acl: { ability: ['USERCENTER-FREIGHT-ENTERPRISE-view'] }, + }] } ]; } diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 5aa60dc9..0d088999 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -1,3 +1,13 @@ +

@@ -62,8 +72,13 @@ + + + + + -
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 7bd096d5..d22bc5f1 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-25 16:03:45 + * @LastEditors : Shiming + * @LastEditTime : 2022-02-14 14:54:08 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core'; import { BaseService } from '@shared'; @@ -29,7 +39,9 @@ export class DynamicSettingH5Component implements OnInit { constructor(public service: BaseService) {} - ngOnInit() {} + ngOnInit() { + console.log(this.tabs) + } changeType(type: any): void { this.selectedTab = type; @@ -42,7 +54,7 @@ export class DynamicSettingH5Component implements OnInit { if (this.configList?.length < 0) { return; } - + console.log(this.configList) let params = [...this.configList]; params = params.map((item: any) => { if (JSONTYPE.has(item.itemType)) { diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts index fed36e60..97880c4f 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-10 16:06:17 + * @LastEditors : Shiming + * @LastEditTime : 2022-02-14 16:19:54 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-modal\\dynamic-setting-modal.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, Input, OnInit } from '@angular/core'; import { ModalHelper } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -11,30 +21,37 @@ import { BaseService } from 'src/app/shared/services'; export class DynamicSettingModalComponent implements OnInit { tabs: any[] = []; selectedTab: any = null; - + configFullKey = 'sys.config' configList: any = []; @Input() extendType!: string; @Input() businessId!: string; + @Input() + configvalue!: string; constructor(public service: BaseService, private modalHelp: NzModalRef) {} ngOnInit() { + if(this.configvalue) { + console.log(this.configvalue) + this.configFullKey = this.configvalue + } this.getTypeList(); } getTypeList() { + this.service .request('/api/mdc/pbc/sysConfigItemExtend/getSysConfigExtend', { - configFullKey: 'sys.config', + configFullKey: this.configFullKey, extendType: this.extendType, businessId: this.businessId }) .subscribe((res: Array) => { if (res?.length > 0) { - const typeData = res.find(config => config.configFullKey === 'sys.config'); + const typeData = res.find(config => config.configFullKey === this.configFullKey); if (typeData) { this.tabs = typeData.children; this.selectedTab = typeData.children[0]; @@ -78,12 +95,13 @@ export class DynamicSettingModalComponent implements OnInit { itemData: item.extendItemData || item.itemData, itemValue: item.extendItemValue || item.itemValue })) - .map(item => ({ + .map(item => ( + { ...item, - remark: item.remark ? JSON.parse(item.remark) : null, - extend: item.extend ? JSON.parse(item.extend) : [], + remark: item?.remark ? JSON.parse(item?.remark) : null, + extend: item?.extend ? JSON.parse(item?.extend) : [], // itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData, - itemValue: item.itemValue ? JSON.parse(item.itemValue) : item.itemValue + itemValue: item?.itemValue ? item?.itemType === 1? JSON.parse(item?.itemValue) : item?.itemValue : item?.itemValue })); } return []; diff --git a/src/app/shared/components/insurance-table/insurance-table.component.ts b/src/app/shared/components/insurance-table/insurance-table.component.ts index 73a6139b..6529426f 100644 --- a/src/app/shared/components/insurance-table/insurance-table.component.ts +++ b/src/app/shared/components/insurance-table/insurance-table.component.ts @@ -153,6 +153,10 @@ export class InsuranceTableComponent implements OnInit { console.log(this.data); console.log(this.minInsurancePrice); console.log(this.sf.value); + if(!this.minInsurancePrice) { + this.service.msgSrv.error('必填项为空!') + return + } let params= { minInsurancePrice: this.minInsurancePrice, insuranceConfigDTOS: this.data