From ed84583bacaab50ed420d926a693909991e9b6b7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 9 Mar 2022 15:25:26 +0800 Subject: [PATCH 01/13] fix bug --- .../vehicle/confir-receipt/confir-receipt.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html index d4e298cb..0ee649ed 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 13:50:12 + * @LastEditTime : 2022-03-09 15:24:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -33,10 +33,10 @@ -
{{ dataInfo?.driverName }} / {{ dataInfo?.driverPhone }}/ {{ dataInfo?.carNo }}
+
{{ dataInfo?.driverName|| '-' }} / {{dataInfo?.driverTelephone || '-' }}/ {{ dataInfo?.carNo || '-' }}
 -
{{ dataInfo?.payeeName }} / {{ dataInfo?.payeePhone }}
+
{{ i?.payeeName || '-'}} / {{ i?.payeePhone || '-'}}
 Date: Wed, 9 Mar 2022 16:00:58 +0800 Subject: [PATCH 02/13] edit --- .../vehicle-detail.component.html | 2 +- .../vehicle-detail.component.ts | 57 ++-- .../amap-path-simplifier.component.ts | 270 ++++-------------- .../shared/components/amap/amap.service.ts | 11 +- 4 files changed, 95 insertions(+), 245 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 da73e8e5..0b55fc05 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 @@ -203,7 +203,7 @@
- +
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index d9110498..53737f03 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -24,8 +24,9 @@ import { OrderManagementService } from '../../services/order-management.service' export class OrderManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + pois: any[] = []; + addressItems: any[] = []; //打点地址数据组 i: any = { unLoadingPlaceList: [], billExpenseDetails: [], @@ -40,7 +41,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { isVisible = false; logColumns2: STColumn[] = [ { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '地点', index: 'cityName' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -72,15 +73,33 @@ export class OrderManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.initData(); - this.getTrajectory() + this.getTrajectory(); } initData() { this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { if (res) { + console.log(res); + this.i = res; - this.billExpenses = this.i?.billExpenseDetails?.filter((data:any)=>data.expenseCode ==="PRE" || data.expenseCode ==="RECE" ||data.expenseCode ==="BACK" ) - this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); + this.pois = [ + { + markerLabel: '起', + color: 'blue', + position: [res.startingPoint.longitude, res.startingPoint.latitude], + title: res.startingPoint.detailedAddress + }, + { + markerLabel: '终', + color: 'red', + position: [res.endPoint.longitude, res.endPoint.latitude], + title: res.endPoint.detailedAddress + } + ]; + this.billExpenses = this.i?.billExpenseDetails?.filter( + (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' + ); + this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); } }); } @@ -128,11 +147,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit { } } // 获取车辆轨迹 - getTrajectory(){ + getTrajectory() { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { if (res) { const points = res.trackArray; - let list :any[] = []; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: `${item.spd}km/h`, @@ -141,7 +160,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); this.mapList = list; this.addressItems = res.cityArray; - if(this.addressItems && this.addressItems.length > 0){ + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.vinOutTime); }); @@ -150,12 +169,12 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); } - // 获取司机轨迹 - getDriverTrajectory(){ + // 获取司机轨迹 + getDriverTrajectory() { this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { if (res) { const points = res.tracks; - let list :any[] = []; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -164,7 +183,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); this.mapList = list; this.addressItems = [...res.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.gtm); item.cityName = item.appAdress; @@ -172,14 +191,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit { } } }); - } - trajectoryChange(event:any){ - if(event ==='car'){ - this.getTrajectory() - }else if(event ==='driver'){ + } + trajectoryChange(event: any) { + if (event === 'car') { + this.getTrajectory(); + } else if (event === 'driver') { this.getDriverTrajectory(); } - } + } getLocalTime(time: any) { return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); } diff --git a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts index 6071a0b7..fa6af579 100644 --- a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts +++ b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts @@ -17,6 +17,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { aMap: any; pathSimplifierIns: any; navigator: any; + infoWindow: any; + markerList: any; @Input() pathList: any = []; @Input() @@ -31,40 +33,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { clcikPointEvent = new EventEmitter(); @Input() - pois: any = [ - { - id: 'A', - position: [116.020764, 39.904989], - markerLabel: 'X_A', - infoWinContent: 'Hello! A', - listDesc: '起', - color: '#F5222D' - }, - { - id: 'B', - position: [116.405285, 39.904989], - markerLabel: 'X_B', - infoWinContent: 'Hello! B', - listDesc: '终', - color: '#1890ff' - }, - { - id: 'C', - position: [116.789806, 39.904989], - markerLabel: 'X_C', - infoWinContent: 'Hello! C', - listDesc: '卸', - color: '#1890ff' - }, - { - id: 'C', - position: [116.789806, 39.904989], - markerLabel: 'X_C', - infoWinContent: 'Hello! C', - listDesc: '装', - color: '#F5222D' - } - ]; + pois: any = []; constructor(public service: BaseService) {} ngOnChanges(changes: SimpleChanges): void { @@ -73,7 +42,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { this.setPathIndex(this.selectedIndex); } if (changes?.MapList?.currentValue && this?.pathSimplifierIns && changes.MapList?.currentValue.length > 0) { - console.log(this.MapList); + // console.log(this.MapList); this.pathList = [ { name: '路线1', @@ -83,6 +52,11 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { this.setData(this.pathList); this.setPathIndex(this.selectedIndex); } + if (changes?.pois?.currentValue && this?.markerList && changes.pois?.currentValue.length > 0) { + // console.log(this.pois); + this.pois = changes?.pois?.currentValue; + this.markerList.render(this.pois); + } } ngOnInit(): void { this.mapInit(); @@ -99,7 +73,8 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { version: CONFIG.version, plugins: [ // 需要使用的的插件列表，如比例尺'AMap.Scale'等 - 'AMap.PathSimplifier' + 'AMap.PathSimplifier', + 'AMap.InfoWindow' ], AMapUI: { version: CONFIG.AMapUIVersion, @@ -112,10 +87,13 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { }); this.aMap.on('complete', () => { + // 信息窗口 + this.infoWindow = new AMap.InfoWindow({ + offset: new AMap.Pixel(0, -40) + }); // this.service.msgSrv.info('地图加载完成 !'); this.pathInit(); - // this.setPOIS(); - // this.loadPOIS(); + this.setPOIS(); }); }) .catch(e => { @@ -123,88 +101,6 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { }); } - loadPOIS() { - AMapUI.loadUI(['overlay/SvgMarker'], (SvgMarker: any) => { - if (!SvgMarker.supportSvg) { - //当前环境并不支持SVG，此时SvgMarker会回退到父类，即SimpleMarker - alert('当前环境不支持SVG'); - } - - //just some colors - var colors = ['#F5222D', '#1890ff']; - - //SvgMarker.Shape下的Shape - var shapeKeys = ['WaterDrop']; - - var colNum = 2, - rowNum = shapeKeys.length; - const markers: any[] = []; - - this.pois.forEach((d: any) => { - //创建shape - const shape = new SvgMarker.Shape['WaterDrop']({ - height: 40, - strokeWidth: 1, - strokeColor: '#ccc', - fillColor: '#F5222D' - }); - - markers.push( - new SvgMarker(shape, { - map: this.aMap, - position: d.position, - containerClassNames: 'shape-' + 'WaterDrop', - iconLabel: { - innerHTML: d.listDesc, - style: { - top: 7 + 'px' - } - }, - showPositionPoint: true - }) - ); - }); - console.log(markers); - - // var pxCenter = this.aMap.lnglatToPixel(this.aMap.getCenter()); - - // var startX = pxCenter.getX(), - // startY = pxCenter.getY(); - - // for (var c = 0; c < colNum; c++) { - // for (var r = 0; r < rowNum; r++) { - // var idx = r * colNum + c; - - // if (!colors[idx]) { - // continue; - // } - - // var x = startX + (c - colNum / 2) * 70; - // var y = startY + 50 + (r - rowNum / 2) * 80; - - // var labelCenter = shape.getCenter(); - - // var position = this.aMap.pixelToLngLat(new AMap.Pixel(x, y)); - - // markers.push( - // new SvgMarker(shape, { - // map: this.aMap, - // position: position, - // containerClassNames: 'shape-' + shapeKeys[r], - // iconLabel: { - // innerHTML: String.fromCharCode('A'.charCodeAt(0) + c), - // style: { - // top: labelCenter[1] - 9 + 'px' - // } - // }, - // showPositionPoint: true - // }) - // ); - // } - // } - }); - } - pathInit() { this.pathSimplifierIns = new AMapUI.PathSimplifier({ zIndex: 100, @@ -222,8 +118,6 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { return lnglatList; }, getHoverTitle: function (pathData: any, pathIndex: any, pointIndex: any) { - console.log(pathData, pointIndex); - if (pointIndex >= 0) { //point return pathData.name + '，' + pathData.points[pointIndex].name; @@ -248,126 +142,53 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { } setPOIS() { - AMapUI.loadUI(['misc/MarkerList'], (MarkerList: any) => { - var markerList = new MarkerList({ + AMapUI.loadUI(['misc/MarkerList', 'overlay/SimpleMarker'], (MarkerList: any, SimpleMarker: any) => { + this.markerList = new MarkerList({ //关联的map对象 map: this.aMap, - - //选中状态（通过点击列表或者marker）时在Marker和列表节点上添加的class，可以借此编写css控制选中时的展示效果 - selectedClassNames: 'selected', - - //返回数据项的Id - getDataId: (dataItem: any, index: any) => { - //index表示该数据项在数组中的索引位置，从0开始，如果确实没有id，可以返回index代替 - return dataItem.id; - }, //返回数据项的位置信息，需要是AMap.LngLat实例，或者是经纬度数组，比如[116.789806, 39.904989] getPosition: (dataItem: any) => { - console.log(dataItem); - return dataItem.position; }, //返回数据项对应的Marker getMarker: (dataItem: any, context: any, recycledMarker: any) => { - //marker的标注内容 - var content = dataItem.markerLabel; - - var label = { - offset: new AMap.Pixel(16, 18), //修改label相对于marker的位置 - content: content - }; - //存在可回收利用的marker if (recycledMarker) { //直接更新内容返回 - recycledMarker.setLabel(label); + recycledMarker.setIconLabel(context.id); + recycledMarker.setIconStyle(dataItem.iconStyle); return recycledMarker; } //返回一个新的Marker - return new AMap.Marker({ - label: label + return new SimpleMarker({ + //普通文本 + iconLabel: { + //普通文本 + innerHTML: dataItem.markerLabel, + //设置样式 + style: { + color: '#fff', + fontSize: '110%', + marginTop: '2px' + } + }, + iconStyle: dataItem.color, + map: this.aMap, + position: dataItem.position }); }, //返回数据项对应的infoWindow getInfoWindow: (dataItem: any, context: any, recycledInfoWindow: any) => { - var tpl = '

<%- dataItem.id %>：<%- dataItem.infoWinContent %>

'; - - //MarkerList.utils.template支持underscore语法的模板 - var content = MarkerList.utils.template(tpl, { - dataItem: dataItem, - dataIndex: context.index - }); - - if (recycledInfoWindow) { - //存在可回收利用的infoWindow, 直接更新内容返回 - recycledInfoWindow.setContent(content); - return recycledInfoWindow; - } - - //返回一个新的InfoWindow - return new AMap.InfoWindow({ - offset: new AMap.Pixel(0, -32), - content: content - }); - }, - //返回数据项对应的列表节点 - getListElement: (dataItem: any, context: any, recycledListElement: any) => { - var tpl = '

<%- dataItem.id %>：<%- dataItem.listDesc %>

'; - - var content = MarkerList.utils.template(tpl, { - dataItem: dataItem, - dataIndex: context.index - }); - - if (recycledListElement) { - //存在可回收利用的listElement, 直接更新内容返回 - recycledListElement.innerHTML = content; - return recycledListElement; - } - - //返回一段html，MarkerList将利用此html构建一个新的dom节点 - return '

  • ' + content + '
    • '; + this.selectedPOI(dataItem); + return null; } }); - //监听选中改变 - markerList.on('selectedChanged', (event: any, info: any) => { - console.log(event, info); - }); - - //监听Marker和ListElement上的点击 - markerList.on('markerClick listElementClick', (event: any, record: any) => { - //console.log(event, record); - }); - - //构建一个数据项数组，数据项本身没有格式要求，但需要支持getDataId和getPosition - var data = [ - { - id: 'A', - position: [116.020764, 39.904989], - markerLabel: 'X_A', - infoWinContent: 'Hello! A', - listDesc: '店铺 A' - }, - { - id: 'B', - position: [116.405285, 39.904989], - markerLabel: 'X_B', - infoWinContent: 'Hello! B', - listDesc: '店铺 B' - }, - { - id: 'C', - position: [116.789806, 39.904989], - markerLabel: 'X_C', - infoWinContent: 'Hello! C', - listDesc: '店铺 C' - } - ]; - - //展示该数据 - markerList.render(data); + if (this.pois?.length > 0) { + //展示该数据 + this.markerList.render(this.pois); + } }); } @@ -377,7 +198,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { setPathIndex(index: number) { this.pathSimplifierIns.setSelectedPathIndex(index); - // this.startNav(); + this.startNav(); } startNav() { @@ -391,4 +212,11 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { this.navigator?.start(); } } + + selectedPOI(location: any) { + this.infoWindow.setContent(`地址: 
    ${location.title}
    `); + this.infoWindow.open(this.aMap, location.position); + this.infoWindow.setPosition(location.position); + this.aMap.setCenter(location.position); + } } diff --git a/src/app/shared/components/amap/amap.service.ts b/src/app/shared/components/amap/amap.service.ts index 4a08b43f..ce1a801e 100644 --- a/src/app/shared/components/amap/amap.service.ts +++ b/src/app/shared/components/amap/amap.service.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-24 15:37:00 @@ -24,8 +24,8 @@ export class AmapService { sub = new Subject(); currentSub = new Subject(); - //计算路径驾车最优路线的长度与所需时间 - drivingCompute(starts: any[], ends: any[]): Observable { + //计算路径驾车最优路线的长度与所需时间 + drivingCompute(starts: any[], ends: any[]): Observable { AMap.plugin('AMap.Driving', () => { let driving = new AMap.Driving({ // 驾车路线规划策略，AMap.DrivingPolicy.LEAST_TIME是最快捷模式 @@ -35,7 +35,10 @@ export class AmapService { return { keyword: item.detailedAddress, city: item.city }; }); driving.search(points, (status: any, result: any) => { - const repData = { distance: (result?.routes?.[0]?.distance / 1000).toFixed(2), time: (result?.routes?.[0]?.time / 60 / 60).toFixed(2) }; + const repData = { + distance: (result?.routes?.[0]?.distance / 1000).toFixed(2), + time: (result?.routes?.[0]?.time / 60 / 60).toFixed(2) + }; this.sub.next(repData); }); }); From 206ffaa9b9e477f4f247becc548b0dd135c5499f Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 9 Mar 2022 16:12:37 +0800 Subject: [PATCH 03/13] edit --- .../invoiced-list/invoiced-list.component.html | 2 +- .../invoiced-list/invoiced-list.component.ts | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index a0b80dae..a917295f 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -13,7 +13,7 @@
    -
    value } @@ -167,7 +165,7 @@ export class InvoicedListComponent implements OnInit { visibleIf: { expand: (value: boolean) => value }, - asyncData: () => this.service.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkFreightForwarder({}, true) }, default: '' } From 44ae7f40c13ce504413cfc2e22c691cd371de4f1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 9 Mar 2022 16:17:56 +0800 Subject: [PATCH 04/13] fix bug --- .../driver-config/driver-config.component.html | 6 +++--- .../driver-config/driver-config.component.ts | 15 ++++++++------- .../dynamic-setting-h5.component.html | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html index f6bd64aa..cbd8e205 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html @@ -1,7 +1,7 @@ - +
    {{item?.monthFreightAmount | currency}}
     diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index c399257e..3ae0c418 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -103,16 +103,17 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { private initST(): STColumn[] { return [ // { title: '', type: 'checkbox', className: 'text-center' }, - { title: '司机姓名', className: 'text-center', index: 'name' }, - { title: '手机号', className: 'text-center', index: 'mobile' }, - { title: '类型', className: 'text-center', render: 'isCaptain' }, - { title: '月承运金额上限（元）', className: 'text-center', render: 'monthFreightAmount' }, - { title: '日提现金额上限（元）', className: 'text-center', render: 'dayWithdrawalAmount' }, - { title: '月提现金额上限（元）', className: 'text-center', render: 'monthWithdrawalAmount' }, - { title: '月收款金额上限（元）', className: 'text-center', render: 'monthReceivableAmount' }, + { title: '司机姓名', className: 'text-center', width: '170px', index: 'name' }, + { title: '手机号', className: 'text-center', width: '170px', index: 'mobile' }, + { title: '类型', className: 'text-center', width: '170px',render: 'isCaptain' }, + { title: '月承运金额上限（元）', className: 'text-center', width: '200px', render: 'monthFreightAmount' }, + { title: '日提现金额上限（元）', className: 'text-center', width: '200px', render: 'dayWithdrawalAmount' }, + { title: '月提现金额上限（元）', className: 'text-center', width: '200px', render: 'monthWithdrawalAmount' }, + { title: '月收款金额上限（元）', className: 'text-center', width: '200px', render: 'monthReceivableAmount' }, { title: '操作', width: '170px', + fixed: 'right', className: 'text-center', buttons: [ { 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 06381609..2936fbff 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 16:03:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-01 15:31:23 + * @LastEditTime : 2022-03-09 16:17:28 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -30,7 +30,7 @@ - + From 95604e68dfa40c6b9ebe169502c56b61d4f181a7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 9 Mar 2022 16:26:01 +0800 Subject: [PATCH 05/13] fix bug --- .../captain/captain-detail/captain-detail.component.html | 4 ++-- .../usercenter/components/driver/detail/detail.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html index faa34e76..001fdc2e 100644 --- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html +++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html @@ -12,8 +12,8 @@

    {{ userDetail?.realName }} - - + +

    -
    diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html index f4ace5d8..fe19627a 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html @@ -51,7 +51,6 @@ + [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ }" [loading]="service.http.loading" + class="mt-md"> \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index fdd1d5bf..bd97cadf 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -85,7 +85,7 @@
    - @@ -103,11 +103,11 @@
    - - Date: Thu, 10 Mar 2022 09:11:02 +0800 Subject: [PATCH 12/13] edit --- .../components/payment-record/payment-record.component.html | 5 ++--- .../components/payment-record/payment-record.component.ts | 6 +----- .../network-freight/network-freight.component.html | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html index 5d57d415..9e0d9a94 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html @@ -36,9 +36,8 @@ {{ item.orderPaymentCode }}
    {{ item.paymentStatusLabel }}     - {{item.costName}}:{{ item.price | currency }}
    - - 附加费: {{ item.surcharge| currency }} + + {{detail.costName}}:{{ detail.surcharge | currency }}
         diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 39524123..4de1e25f 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -252,13 +252,9 @@ export class PaymentRecordComponent implements OnInit { render: 'amountDetails', width: 160, format: item => { - let surcharge = 0; (item.amountDetails as Array).forEach(detail => { - surcharge += detail.surcharge || 0; + detail.surcharge = ((detail.price + (detail.surcharge || 0)) as number).toFixed(2); }); - item.surcharge = surcharge.toFixed(2); - item.price = item.amountDetails?.[0]?.price || 0; - item.costName = item.amountDetails?.[0]?.costName; return ''; } }, 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 0fd711da..41e4adf1 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 @@ -55,7 +55,7 @@ [scroll]="{ x: '2000px' }" [data]="service.$api_networkTransporter_page" [columns]="columns" - [req]="{ params: reqParams }" + [req]="{ params: reqParams }" [page]="{}" [loading]="service.http.loading" (change)="stChange($event)" > From 18fc33ad0091ea3257c6bee1a7667b2a90c47e60 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 10 Mar 2022 09:13:35 +0800 Subject: [PATCH 13/13] edit --- .../payment-record/payment-record.component.html | 2 +- .../payment-record/payment-record.component.ts | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html index 9e0d9a94..854b1278 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html @@ -37,7 +37,7 @@ - {{detail.costName}}:{{ detail.surcharge | currency }}
    + {{detail.costName}}:{{ detail.price | currency }}
         diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 4de1e25f..4d32ab42 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -251,12 +251,14 @@ export class PaymentRecordComponent implements OnInit { title: '运费明细', render: 'amountDetails', width: 160, - format: item => { - (item.amountDetails as Array).forEach(detail => { - detail.surcharge = ((detail.price + (detail.surcharge || 0)) as number).toFixed(2); - }); - return ''; - } + // format: item => { + // (item.amountDetails as Array).forEach(detail => { + // detail.surcharge = detail.price + (detail.surcharge || 0); + // }); + // console.log(item.amountDetails); + + // return ''; + // } }, { title: '支付类型',