From 2c46fd77bd2956f7c929082ac8c887ac0aa8e1af Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 15:08:30 +0800 Subject: [PATCH 1/2] fix bug --- .../modify-rate/modify-rate.component.html | 10 +++ .../modify-rate/modify-rate.component.ts | 15 +++- .../bulk-detail/bulk-detail.component.html | 2 +- .../onecar-publish.component.html | 17 ++-- .../onecar-publish.component.ts | 90 +++++++++++-------- .../release-publish.component.html | 16 ++-- .../release-publish.component.ts | 73 +++++++++------ .../update-price/update-price.component.html | 9 +- .../vehicle-detail.component.html | 2 +- 9 files changed, 143 insertions(+), 91 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html index fb348ad7..fa6106e2 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -10,6 +10,16 @@ --> + + + + {{item?.operator}}/{{item.telephone}} + +
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index cf23c82c..2a3c201b 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -4,12 +4,13 @@ * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 11:10:33 + * @LastEditTime : 2022-03-04 14:45:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Component, Input, OnInit, ViewChild } from '@angular/core'; +import { STColumn } from '@delon/abc/st'; import { SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -24,7 +25,11 @@ export class VehicleModifyRateComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - + columns: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', index: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; aggreechecked = false; @Input() @@ -36,6 +41,12 @@ export class VehicleModifyRateComponent implements OnInit { console.log(this.data); this.initSF(); } + get reqParams() { + return { + // operateObject: this.i?.resourceCode, + // operateType: 4, + }; + } initSF() { this.schema = { properties: { diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 5d118b1f..21a1b485 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -171,7 +171,7 @@ diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index ee5b6177..a3fc1b2d 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -228,13 +228,15 @@ -
服务信息
- + + + + 推荐投保，填写货值自动估保费，司机接单后不可退保。详见《投保告知》 @@ -243,10 +245,10 @@
@@ -258,9 +260,10 @@ >

注意事项:

-

①请仔细阅读《投保告知》

-

②港澳台、西藏不在投保范围内，不予承保

-

③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。

+

①请仔细阅读《投保告知函》；

+

②香港、澳门、台湾、西藏、新疆不在投保范围内，不予承保；

+

③最低保费12元/每单；单次运输保额仅限200万元以内；

+

④本保险只限于货物起运前投保，起运后投保无效，保险人不负赔偿责任;
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index bb53ace9..b2ee178e 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -411,7 +411,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { properties: { insuranceType: { type: 'string', - title: '增值服务套餐', + title: '服务包', ui: { widget: 'select', asyncData: () => { @@ -419,10 +419,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { map((res: any) => { return [...res]; }) - ); + ) }, change: (tag: any, org: any) => { - this.getInsurersPrice(tag); + if(tag === '3'){ + this.sf5.setValue('/insurancePremium', null); + this.sf5.setValue('/insuranceRate', null); + }else { + this.getInsurersPrice(tag); + } } }, default: '3' @@ -430,31 +435,39 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { type1: { type: 'string', title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'], + enum: ['资源曝光率 +10', '车源匹配率 +10'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: { insuranceType: (value: string) => value === '0' } + } as SFCheckboxWidgetSchema, + default: ['资源曝光率 +10', '车源匹配率 +10'] + }, + type2: { + type: 'string', + title: '', + enum: ['资源曝光率 +20', '车源匹配率 +20'], readOnly: true, ui: { widget: 'checkbox', visibleIf: { insuranceType: (value: string) => value === '1' } } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'] + default: ['资源曝光率 +20', '车源匹配率 +20'] }, - type2: { + freeInsurance1: { type: 'string', - title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'], - readOnly: true, - ui: { - widget: 'checkbox', - visibleIf: { insuranceType: (value: string) => value === '2' } - } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'] - }, - freeInsurance: { - type: 'string', - title: '赠送保险', + title: '赠送基本险', ui: { widget: 'custom', - visibleIf: { insuranceType: (value: string) => value !== '3' } + visibleIf: { insuranceType: (value: string) => value === '0' } + } + }, + freeInsurance2: { + type: 'string', + title: '赠送综合险', + ui: { + widget: 'custom', + visibleIf: { insuranceType: (value: string) => value === '1' } } }, insurancePackagedGoods: { @@ -480,7 +493,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { title: '货物价值', ui: { widget: 'custom', - descriptionI18n: '输入50000-3000000之间数值', visibleIf: { insuranceType: (value: string) => value !== '3' } } }, @@ -514,7 +526,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { $type2: { grid: { span: 24 } }, - $freeInsurance: { + $freeInsurance1: { + grid: { span: 24 } + }, + $freeInsurance2: { grid: { span: 24 } } }; @@ -1199,13 +1214,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required)); } - // 计算里程，时间 - if (this.startInfo?.[0]?.area && this.endInfo?.[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); //计算保费金额 + }); + } }); this.sf3data = { @@ -1314,14 +1330,14 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { default: break; } - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - this.getInsurersPrice(); //计算保费金额 - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); //计算保费金额 + }); + } } }); } @@ -1365,7 +1381,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); }); // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { this.totalDistance = res.distance; this.totalTime = res.time; diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index 0a0bbca3..5981b49e 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -238,7 +238,10 @@
- + + + + 推荐投保，填写货值自动估保费，司机接单后不可退保。详见《投保告知》 @@ -247,10 +250,10 @@
@@ -262,9 +265,10 @@ >

注意事项:

-

①请仔细阅读《投保告知》

-

②港澳台、西藏不在投保范围内，不予承保

-

③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。

+

①请仔细阅读《投保告知函》；

+

②香港、澳门、台湾、西藏、新疆不在投保范围内，不予承保；

+

③最低保费12元/每单；单次运输保额仅限200万元以内；

+

④本保险只限于货物起运前投保，起运后投保无效，保险人不负赔偿责任;
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 69b40452..6db5bdf8 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 @@ -411,7 +411,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { properties: { insuranceType: { type: 'string', - title: '增值服务套餐', + title: '服务包', ui: { widget: 'select', asyncData: () => { @@ -419,10 +419,15 @@ export class SupplyManagementReleasePublishComponent implements OnInit { map((res: any) => { return [...res]; }) - ); + ) }, change: (tag: any, org: any) => { - this.getInsurersPrice(tag); + if(tag === '3'){ + this.sf5.setValue('/insurancePremium', null); + this.sf5.setValue('/insuranceRate', null); + }else { + this.getInsurersPrice(tag); + } } }, default: '3' @@ -430,31 +435,39 @@ export class SupplyManagementReleasePublishComponent implements OnInit { type1: { type: 'string', title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'], + enum: ['资源曝光率 +10', '车源匹配率 +10'], + readOnly: true, + ui: { + widget: 'checkbox', + visibleIf: { insuranceType: (value: string) => value === '0' } + } as SFCheckboxWidgetSchema, + default: ['资源曝光率 +10', '车源匹配率 +10'] + }, + type2: { + type: 'string', + title: '', + enum: ['资源曝光率 +20', '车源匹配率 +20'], readOnly: true, ui: { widget: 'checkbox', visibleIf: { insuranceType: (value: string) => value === '1' } } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'] + default: ['资源曝光率 +20', '车源匹配率 +20'] }, - type2: { + freeInsurance1: { type: 'string', - title: '', - enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'], - readOnly: true, - ui: { - widget: 'checkbox', - visibleIf: { insuranceType: (value: string) => value === '2' } - } as SFCheckboxWidgetSchema, - default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'] - }, - freeInsurance: { - type: 'string', - title: '赠送保险', + title: '赠送基本险', ui: { widget: 'custom', - visibleIf: { insuranceType: (value: string) => value !== '3' } + visibleIf: { insuranceType: (value: string) => value === '0' } + } + }, + freeInsurance2: { + type: 'string', + title: '赠送综合险', + ui: { + widget: 'custom', + visibleIf: { insuranceType: (value: string) => value === '1' } } }, insurancePackagedGoods: { @@ -480,7 +493,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { title: '货物价值', ui: { widget: 'custom', - descriptionI18n: '输入50000-3000000之间数值', visibleIf: { insuranceType: (value: string) => value !== '3' } } }, @@ -514,7 +526,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit { $type2: { grid: { span: 24 } }, - $freeInsurance: { + $freeInsurance1: { + grid: { span: 24 } + }, + $freeInsurance2: { grid: { span: 24 } } }; @@ -1176,14 +1191,14 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.validateForm1.addControl(`unloadName${index}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`unloadPhone${index}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])); }); - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - this.getInsurersPrice(); //计算保费金额 - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); //计算保费金额 + }); + } } // 计算保价费金额 getInsurersPrice(insuranceType = this.sf5.value.insuranceType) { diff --git a/src/app/routes/supply-management/components/update-price/update-price.component.html b/src/app/routes/supply-management/components/update-price/update-price.component.html index 34fbb438..490015a8 100644 --- a/src/app/routes/supply-management/components/update-price/update-price.component.html +++ b/src/app/routes/supply-management/components/update-price/update-price.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 14:34:57 + * @LastEditTime : 2022-03-04 14:37:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\update-price\\update-price.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,18 +25,11 @@

变更日志

- - {{item?.operator}}/{{item.telephone}} diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 0d9643ed..9429b4ee 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -213,7 +213,7 @@ From ea95821644aa9aada1030c422a09ed1a19eb0c88 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 15:12:13 +0800 Subject: [PATCH 2/2] fix bug --- .../bulk-publish/bulk-publish.component.ts | 18 +++++++++--------- .../bulk-release-publish.component.ts | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 89fc5b4b..07b45ea3 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -1024,8 +1024,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit { if (this.PageStatus === '大宗修改') { this.sf4data.id = res?.goodsInfoVOList[0]?.id; } - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { this.totalDistance = res.distance; this.totalTime = res.time; @@ -1103,13 +1103,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { element.type = '2'; }); - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } getLimitvalue() { const getlimitvaluesParms = [ 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 53858ad0..9804987e 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 @@ -839,13 +839,13 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { element.type = '2'; }); - // 计算里程，时间 - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } getLimitvalue() { const getlimitvaluesParms = [