diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 4815d172..6dfb8176 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -473,7 +473,7 @@ export class OrderManagementBulkComponent implements OnInit { { text: '变更运费 ', click: _record => this.updateFreight(_record), - iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' + iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2' }, { text: '确认签收 ', diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 08d9fb51..bb72f8fc 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -424,7 +424,7 @@ resourceStatus: any; { text: '变更运费 ', click: (_record) => this.updateFreight(_record), - iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', + iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', }, { text: '确认签收 ', diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index bb7b9cd2..60ed2901 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-11 11:06:40 + * @LastEditTime : 2022-02-14 09:34:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -126,6 +126,7 @@ export class VehicleUpdateFreightComponent implements OnInit { this.service.msgSrv.error('请填写必填项!'); return; } + console.log(this.getParams()) this.service.request(this.service.$api_get_insertFreightChangeWhole, this.getParams()).subscribe(res => { if (res) { this.modal.destroy(true); 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 e645e58f..1d1e57d8 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 @@ -44,8 +44,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { ngOnInit(): void { this.mapInit(); const points = - [{"agl":"0","gtm":"20210818/143018","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143018","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143019","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143020","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143104","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143105","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143106","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143106","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143110","hgt":"500","lat":"23986841","lon":"69807550","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143113","hgt":"500","lat":"23986841","lon":"69807549","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143114","hgt":"500","lat":"23986841","lon":"69807549","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143115","hgt":"500","lat":"23986841","lon":"69807549","mlg":"1002.0","spd":"60.0"},{"agl":"0","gtm":"20210818/143116","hgt":"500","lat":"23986841","lon":"69807549","mlg":"1002.0","spd":"60.0"},{"agl":"213","gtm":"20210818/145810","hgt":"500","lat":"18249159","lon":"69784998","mlg":"1913.0","spd":"75.0"},{"agl":"201","gtm":"20210818/145820","hgt":"500","lat":"18241809","lon":"69781350","mlg":"1916.0","spd":"104.0"},{"agl":"201","gtm":"20210818/145830","hgt":"500","lat":"18234378","lon":"69777969","mlg":"1919.0","spd":"79.0"},{"agl":"226","gtm":"20210818/145840","hgt":"500","lat":"18227730","lon":"69773709","mlg":"1922.0","spd":"80.0"},{"agl":"244","gtm":"20210818/145850","hgt":"500","lat":"18223848","lon":"69765879","mlg":"1925.0","spd":"76.0"},{"agl":"237","gtm":"20210818/145900","hgt":"500","lat":"18220848","lon":"69759309","mlg":"1928.0","spd":"62.0"},{"agl":"223","gtm":"20210818/145910","hgt":"500","lat":"18216108","lon":"69752670","mlg":"1931.0","spd":"90.0"},{"agl":"215","gtm":"20210818/145920","hgt":"500","lat":"18210438","lon":"69747369","mlg":"1934.0","spd":"80.0"},{"agl":"223","gtm":"20210818/145930","hgt":"500","lat":"18204129","lon":"69741948","mlg":"1937.0","spd":"76.0"},{"agl":"229","gtm":"20210818/145940","hgt":"500","lat":"18199218","lon":"69735558","mlg":"1940.0","spd":"84.0"},{"agl":"197","gtm":"20210818/145950","hgt":"500","lat":"18193989","lon":"69730818","mlg":"1943.0","spd":"76.0"},{"agl":"207","gtm":"20210818/150000","hgt":"500","lat":"18178518","lon":"69724290","mlg":"1949.0","spd":"101.0"},{"agl":"221","gtm":"20210818/150010","hgt":"500","lat":"18172389","lon":"69719379","mlg":"1952.0","spd":"84.0"},{"agl":"231","gtm":"20210818/150020","hgt":"500","lat":"18167088","lon":"69712380","mlg":"1955.0","spd":"91.0"},{"agl":"224","gtm":"20210818/150030","hgt":"500","lat":"18161859","lon":"69705558","mlg":"1958.0","spd":"81.0"},{"agl":"225","gtm":"20210818/150040","hgt":"500","lat":"18156309","lon":"69699270","mlg":"1961.0","spd":"90.0"},{"agl":"227","gtm":"20210818/150050","hgt":"500","lat":"18151590","lon":"69692910","mlg":"1964.0","spd":"82.0"},{"agl":"224","gtm":"20210818/150100","hgt":"500","lat":"18146079","lon":"69687138","mlg":"1967.0","spd":"85.0"},{"agl":"233","gtm":"20210818/150110","hgt":"500","lat":"18141198","lon":"69680229","mlg":"1970.0","spd":"90.0"},{"agl":"231","gtm":"20210818/150120","hgt":"500","lat":"18136299","lon":"69673020","mlg":"1973.0","spd":"88.0"},{"agl":"198","gtm":"20210818/150130","hgt":"500","lat":"18130170","lon":"69668670","mlg":"1976.0","spd":"80.0"},{"agl":"191","gtm":"20210818/150140","hgt":"500","lat":"18123399","lon":"69666309","mlg":"1979.0","spd":"77.0"},{"agl":"183","gtm":"20210818/150150","hgt":"500","lat":"18116928","lon":"69665250","mlg":"1982.0","spd":"73.0"},{"agl":"184","gtm":"20210818/150200","hgt":"500","lat":"18110490","lon":"69664770","mlg":"1985.0","spd":"55.0"},{"agl":"0","gtm":"20210818/150210","hgt":"500","lat":"18108669","lon":"69664578","mlg":"1988.0","spd":"0.0"},{"agl":"184","gtm":"20210818/150220","hgt":"500","lat":"18108639","lon":"69664578","mlg":"1991.0","spd":"3.0"},{"agl":"184","gtm":"20210818/150230","hgt":"500","lat":"18108639","lon":"69664578","mlg":"1994.0","spd":"3.0"},{"agl":"0","gtm":"20210818/150240","hgt":"500","lat":"18108579","lon":"69664569","mlg":"1997.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150250","hgt":"500","lat":"18108588","lon":"69664590","mlg":"2000.0","spd":"0.0"},{"agl":"186","gtm":"20210818/150300","hgt":"500","lat":"18108570","lon":"69664590","mlg":"2003.0","spd":"3.0"},{"agl":"0","gtm":"20210818/150310","hgt":"500","lat":"18108480","lon":"69664590","mlg":"2006.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150320","hgt":"500","lat":"18108348","lon":"69664560","mlg":"2009.0","spd":"2.0"},{"agl":"0","gtm":"20210818/150330","hgt":"500","lat":"18108330","lon":"69664560","mlg":"2012.0","spd":"2.0"},{"agl":"0","gtm":"20210818/150340","hgt":"500","lat":"18108330","lon":"69664548","mlg":"2015.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150350","hgt":"500","lat":"18108390","lon":"69664560","mlg":"2018.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150400","hgt":"500","lat":"18108369","lon":"69664548","mlg":"2021.0","spd":"3.0"},{"agl":"0","gtm":"20210818/150410","hgt":"500","lat":"18108348","lon":"69664548","mlg":"2024.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150420","hgt":"500","lat":"18108330","lon":"69664539","mlg":"2027.0","spd":"3.0"},{"agl":"189","gtm":"20210818/150430","hgt":"500","lat":"18107700","lon":"69664509","mlg":"2030.0","spd":"23.0"},{"agl":"0","gtm":"20210818/150440","hgt":"500","lat":"18107328","lon":"69664449","mlg":"2033.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150450","hgt":"500","lat":"18107298","lon":"69664449","mlg":"2036.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150500","hgt":"500","lat":"18107298","lon":"69664449","mlg":"2039.0","spd":"0.0"},{"agl":"0","gtm":"20210818/150510","hgt":"500","lat":"18107310","lon":"69664458","mlg":"2042.0","spd":"0.0"},{"agl":"183","gtm":"20210818/150520","hgt":"500","lat":"18107298","lon":"69664449","mlg":"2045.0","spd":"7.0"},{"agl":"192","gtm":"20210818/150530","hgt":"500","lat":"18105558","lon":"69664200","mlg":"2048.0","spd":"52.0"},{"agl":"196","gtm":"20210818/150540","hgt":"500","lat":"18099798","lon":"69662679","mlg":"2051.0","spd":"73.0"},{"agl":"199","gtm":"20210818/150550","hgt":"500","lat":"18092538","lon":"69659478","mlg":"2054.0","spd":"84.0"},{"agl":"187","gtm":"20210818/150600","hgt":"500","lat":"18085290","lon":"69657000","mlg":"2057.0","spd":"83.0"},{"agl":"184","gtm":"20210818/150610","hgt":"500","lat":"18078798","lon":"69656340","mlg":"2060.0","spd":"64.0"},{"agl":"219","gtm":"20210818/150620","hgt":"500","lat":"18072798","lon":"69654069","mlg":"2063.0","spd":"83.0"},{"agl":"273","gtm":"20210818/150630","hgt":"500","lat":"18071670","lon":"69646119","mlg":"2066.0","spd":"71.0"},{"agl":"273","gtm":"20210818/150640","hgt":"500","lat":"18072078","lon":"69638340","mlg":"2069.0","spd":"79.0"},{"agl":"274","gtm":"20210818/150650","hgt":"500","lat":"18072090","lon":"69638208","mlg":"2072.0","spd":"78.0"},{"agl":"257","gtm":"20210818/150700","hgt":"500","lat":"18071898","lon":"69631200","mlg":"2075.0","spd":"69.0"},{"agl":"246","gtm":"20210818/150710","hgt":"500","lat":"18068829","lon":"69623100","mlg":"2078.0","spd":"86.0"},{"agl":"265","gtm":"20210818/150720","hgt":"500","lat":"18067518","lon":"69619899","mlg":"2081.0","spd":"6.0"},{"agl":"0","gtm":"20210818/150730","hgt":"500","lat":"18067458","lon":"69619680","mlg":"2084.0","spd":"0.0"},{"agl":"230","gtm":"20210818/150740","hgt":"500","lat":"18067449","lon":"69619650","mlg":"2087.0","spd":"3.0"},{"agl":"0","gtm":"20210818/150750","hgt":"500","lat":"18067410","lon":"69619560","mlg":"2090.0","spd":"0.0"} - ] + [{"gtm":"20210818/143018","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143018","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143019","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143020","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143104","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143105","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143106","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143106","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143110","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807550","lat":"23986841"},{"gtm":"20210818/143113","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807549","lat":"23986841"},{"gtm":"20210818/143114","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807549","lat":"23986841"},{"gtm":"20210818/143115","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807549","lat":"23986841"},{"gtm":"20210818/143116","hgt":"500","spd":"60.0","agl":"0","mlg":"1002.0","lon":"69807549","lat":"23986841"},{"gtm":"20210818/145810","hgt":"500","spd":"75.0","agl":"213","mlg":"1913.0","lon":"69784998","lat":"18249159"},{"gtm":"20210818/145820","hgt":"500","spd":"104.0","agl":"201","mlg":"1916.0","lon":"69781350","lat":"18241809"},{"gtm":"20210818/145830","hgt":"500","spd":"79.0","agl":"201","mlg":"1919.0","lon":"69777969","lat":"18234378"},{"gtm":"20210818/145840","hgt":"500","spd":"80.0","agl":"226","mlg":"1922.0","lon":"69773709","lat":"18227730"},{"gtm":"20210818/145850","hgt":"500","spd":"76.0","agl":"244","mlg":"1925.0","lon":"69765879","lat":"18223848"},{"gtm":"20210818/145900","hgt":"500","spd":"62.0","agl":"237","mlg":"1928.0","lon":"69759309","lat":"18220848"},{"gtm":"20210818/145910","hgt":"500","spd":"90.0","agl":"223","mlg":"1931.0","lon":"69752670","lat":"18216108"},{"gtm":"20210818/145920","hgt":"500","spd":"80.0","agl":"215","mlg":"1934.0","lon":"69747369","lat":"18210438"},{"gtm":"20210818/145930","hgt":"500","spd":"76.0","agl":"223","mlg":"1937.0","lon":"69741948","lat":"18204129"},{"gtm":"20210818/145940","hgt":"500","spd":"84.0","agl":"229","mlg":"1940.0","lon":"69735558","lat":"18199218"},{"gtm":"20210818/145950","hgt":"500","spd":"76.0","agl":"197","mlg":"1943.0","lon":"69730818","lat":"18193989"},{"gtm":"20210818/150000","hgt":"500","spd":"101.0","agl":"207","mlg":"1949.0","lon":"69724290","lat":"18178518"},{"gtm":"20210818/150010","hgt":"500","spd":"84.0","agl":"221","mlg":"1952.0","lon":"69719379","lat":"18172389"},{"gtm":"20210818/150020","hgt":"500","spd":"91.0","agl":"231","mlg":"1955.0","lon":"69712380","lat":"18167088"},{"gtm":"20210818/150030","hgt":"500","spd":"81.0","agl":"224","mlg":"1958.0","lon":"69705558","lat":"18161859"},{"gtm":"20210818/150040","hgt":"500","spd":"90.0","agl":"225","mlg":"1961.0","lon":"69699270","lat":"18156309"},{"gtm":"20210818/150050","hgt":"500","spd":"82.0","agl":"227","mlg":"1964.0","lon":"69692910","lat":"18151590"},{"gtm":"20210818/150100","hgt":"500","spd":"85.0","agl":"224","mlg":"1967.0","lon":"69687138","lat":"18146079"},{"gtm":"20210818/150110","hgt":"500","spd":"90.0","agl":"233","mlg":"1970.0","lon":"69680229","lat":"18141198"},{"gtm":"20210818/150120","hgt":"500","spd":"88.0","agl":"231","mlg":"1973.0","lon":"69673020","lat":"18136299"},{"gtm":"20210818/150130","hgt":"500","spd":"80.0","agl":"198","mlg":"1976.0","lon":"69668670","lat":"18130170"},{"gtm":"20210818/150140","hgt":"500","spd":"77.0","agl":"191","mlg":"1979.0","lon":"69666309","lat":"18123399"},{"gtm":"20210818/150150","hgt":"500","spd":"73.0","agl":"183","mlg":"1982.0","lon":"69665250","lat":"18116928"},{"gtm":"20210818/150200","hgt":"500","spd":"55.0","agl":"184","mlg":"1985.0","lon":"69664770","lat":"18110490"},{"gtm":"20210818/150210","hgt":"500","spd":"0.0","agl":"0","mlg":"1988.0","lon":"69664578","lat":"18108669"},{"gtm":"20210818/150220","hgt":"500","spd":"3.0","agl":"184","mlg":"1991.0","lon":"69664578","lat":"18108639"},{"gtm":"20210818/150230","hgt":"500","spd":"3.0","agl":"184","mlg":"1994.0","lon":"69664578","lat":"18108639"},{"gtm":"20210818/150240","hgt":"500","spd":"0.0","agl":"0","mlg":"1997.0","lon":"69664569","lat":"18108579"},{"gtm":"20210818/150250","hgt":"500","spd":"0.0","agl":"0","mlg":"2000.0","lon":"69664590","lat":"18108588"},{"gtm":"20210818/150300","hgt":"500","spd":"3.0","agl":"186","mlg":"2003.0","lon":"69664590","lat":"18108570"},{"gtm":"20210818/150310","hgt":"500","spd":"0.0","agl":"0","mlg":"2006.0","lon":"69664590","lat":"18108480"},{"gtm":"20210818/150320","hgt":"500","spd":"2.0","agl":"0","mlg":"2009.0","lon":"69664560","lat":"18108348"},{"gtm":"20210818/150330","hgt":"500","spd":"2.0","agl":"0","mlg":"2012.0","lon":"69664560","lat":"18108330"},{"gtm":"20210818/150340","hgt":"500","spd":"0.0","agl":"0","mlg":"2015.0","lon":"69664548","lat":"18108330"},{"gtm":"20210818/150350","hgt":"500","spd":"0.0","agl":"0","mlg":"2018.0","lon":"69664560","lat":"18108390"},{"gtm":"20210818/150400","hgt":"500","spd":"3.0","agl":"0","mlg":"2021.0","lon":"69664548","lat":"18108369"},{"gtm":"20210818/150410","hgt":"500","spd":"0.0","agl":"0","mlg":"2024.0","lon":"69664548","lat":"18108348"},{"gtm":"20210818/150420","hgt":"500","spd":"3.0","agl":"0","mlg":"2027.0","lon":"69664539","lat":"18108330"},{"gtm":"20210818/150430","hgt":"500","spd":"23.0","agl":"189","mlg":"2030.0","lon":"69664509","lat":"18107700"},{"gtm":"20210818/150440","hgt":"500","spd":"0.0","agl":"0","mlg":"2033.0","lon":"69664449","lat":"18107328"},{"gtm":"20210818/150450","hgt":"500","spd":"0.0","agl":"0","mlg":"2036.0","lon":"69664449","lat":"18107298"},{"gtm":"20210818/150500","hgt":"500","spd":"0.0","agl":"0","mlg":"2039.0","lon":"69664449","lat":"18107298"},{"gtm":"20210818/150510","hgt":"500","spd":"0.0","agl":"0","mlg":"2042.0","lon":"69664458","lat":"18107310"},{"gtm":"20210818/150520","hgt":"500","spd":"7.0","agl":"183","mlg":"2045.0","lon":"69664449","lat":"18107298"},{"gtm":"20210818/150530","hgt":"500","spd":"52.0","agl":"192","mlg":"2048.0","lon":"69664200","lat":"18105558"},{"gtm":"20210818/150540","hgt":"500","spd":"73.0","agl":"196","mlg":"2051.0","lon":"69662679","lat":"18099798"},{"gtm":"20210818/150550","hgt":"500","spd":"84.0","agl":"199","mlg":"2054.0","lon":"69659478","lat":"18092538"},{"gtm":"20210818/150600","hgt":"500","spd":"83.0","agl":"187","mlg":"2057.0","lon":"69657000","lat":"18085290"},{"gtm":"20210818/150610","hgt":"500","spd":"64.0","agl":"184","mlg":"2060.0","lon":"69656340","lat":"18078798"},{"gtm":"20210818/150620","hgt":"500","spd":"83.0","agl":"219","mlg":"2063.0","lon":"69654069","lat":"18072798"},{"gtm":"20210818/150630","hgt":"500","spd":"71.0","agl":"273","mlg":"2066.0","lon":"69646119","lat":"18071670"},{"gtm":"20210818/150640","hgt":"500","spd":"79.0","agl":"273","mlg":"2069.0","lon":"69638340","lat":"18072078"},{"gtm":"20210818/150650","hgt":"500","spd":"78.0","agl":"274","mlg":"2072.0","lon":"69638208","lat":"18072090"},{"gtm":"20210818/150700","hgt":"500","spd":"69.0","agl":"257","mlg":"2075.0","lon":"69631200","lat":"18071898"},{"gtm":"20210818/150710","hgt":"500","spd":"86.0","agl":"246","mlg":"2078.0","lon":"69623100","lat":"18068829"},{"gtm":"20210818/150720","hgt":"500","spd":"6.0","agl":"265","mlg":"2081.0","lon":"69619899","lat":"18067518"},{"gtm":"20210818/150730","hgt":"500","spd":"0.0","agl":"0","mlg":"2084.0","lon":"69619680","lat":"18067458"},{"gtm":"20210818/150740","hgt":"500","spd":"3.0","agl":"230","mlg":"2087.0","lon":"69619650","lat":"18067449"},{"gtm":"20210818/150750","hgt":"500","spd":"0.0","agl":"0","mlg":"2090.0","lon":"69619560","lat":"18067410"}] points.forEach(item => { this.pathList[0].points.push({ diff --git a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html index 224b4551..5eb963e1 100644 --- a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html +++ b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.html @@ -4,7 +4,6 @@ - diff --git a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts index 3a5acc5f..511dda1e 100644 --- a/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts +++ b/src/app/shared/components/dynamic-setting/freight-table/freight-table.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-25 16:03:45 + * @LastEditors : Shiming + * @LastEditTime : 2022-02-11 17:12:52 + * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\freight-table\\freight-table.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit } from '@angular/core'; import { BaseService } from '@shared'; diff --git a/src/app/shared/components/insurance-table/insurance-table.component.html b/src/app/shared/components/insurance-table/insurance-table.component.html index efed41fb..211d6576 100644 --- a/src/app/shared/components/insurance-table/insurance-table.component.html +++ b/src/app/shared/components/insurance-table/insurance-table.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 20:18:52 * @LastEditors : Shiming - * @LastEditTime : 2022-02-09 14:57:23 + * @LastEditTime : 2022-02-14 09:49:45 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -14,28 +14,28 @@ - +
+ + + + + + + + + + + +
险种 - 普货-基本险 普货-综合险 操作 - @@ -55,7 +55,6 @@ -
`${value} (含)`; - + price: number = 0; changeSub = new Subject(); constructor(public service: BaseService, private cdr: ChangeDetectorRef) {} ngOnInit(): void { this.loadData(); + this.initSF() this.changeEndKmAction(); + this.price = 1000 } loadData() { @@ -31,7 +39,31 @@ export class InsuranceTableComponent implements OnInit { } }); } - + initSF() { + this.schema = { + properties: { + freightPrice: { + type: 'string', + title: '单票投保最低保费', + ui: { + widget: 'custom', + placeholder: '请输入', + errors: { required: '请填写' } + } + }, + }, + required: ['freightPrice'] + }; + this.ui = { + '*': { + spanLabelFixed: 140, + grid: { span: 24 } + }, + $freightPrice: { + grid: { span: 8 } + }, + }; + } /** * 修改结束车长 * @param event 车长 @@ -111,6 +143,8 @@ export class InsuranceTableComponent implements OnInit { save() { console.log(this.data); + console.log(this.price); + console.log(this.sf.value); // this.service.request('/api/mdc/cuc/freightConfig/saveBatch', this.data).subscribe(res => { // if (res) { // console.log(res); diff --git a/src/app/shared/components/insurance-table/insurance-table.module.ts b/src/app/shared/components/insurance-table/insurance-table.module.ts index 48c95fa5..2c72ccee 100644 --- a/src/app/shared/components/insurance-table/insurance-table.module.ts +++ b/src/app/shared/components/insurance-table/insurance-table.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 20:23:54 * @LastEditors : Shiming - * @LastEditTime : 2022-02-09 14:57:05 + * @LastEditTime : 2022-02-11 17:20:49 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -15,17 +15,18 @@ import { NzInputNumberModule } from 'ng-zorro-antd/input-number'; import { NzTableModule } from 'ng-zorro-antd/table'; import { InsuranceTableComponent } from './insurance-table.component'; import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; - -const COMPONENTS = [InsuranceTableComponent]; +import { SHARED_ZORRO_MODULES } from '../../shared-zorro.module'; +import { SHARED_DELON_MODULES } from '../../shared-delon.module'; +const COMPONENTS = [InsuranceTableComponent,]; const COMPONENTSs = [ NzTableModule, NzInputNumberModule, - NzPopconfirmModule + NzPopconfirmModule, ]; @NgModule({ declarations: COMPONENTS, - imports: [CommonModule, FormsModule,COMPONENTSs], + imports: [CommonModule, FormsModule,COMPONENTSs,SHARED_ZORRO_MODULES, SHARED_DELON_MODULES], exports: COMPONENTS }) export class InsuranceTableModule {}