From 8311b7c7839976d76e50dd15ab1f899792050abe Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Mon, 14 Mar 2022 15:25:49 +0800 Subject: [PATCH 01/34] 'fixbug' --- .../bulk-detail/bulk-detail.component.html | 4 +-- .../components/vehicle/vehicle.component.ts | 10 ------ .../freight-people.component.ts | 4 +-- .../vehicle-detail.component.html | 31 +++++++++---------- .../services/waybill-management.service.ts | 2 +- 5 files changed, 19 insertions(+), 32 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 60108072..895ed730 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -94,8 +94,8 @@ {{ i?.unloadPlanTime }} --> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 - {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 + {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方

{ - // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { - // if (res) { - // this.service.msgSrv.success('变更运费成功'); - // modal.destroy(); - // this.st.reload(); - // } - // }); - // return false; - // } }); modal.afterClose.subscribe((result) => { if (result) { diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts index 186d9e9d..14065be9 100644 --- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts @@ -61,7 +61,7 @@ export class VehicleFreightPeopleComponent implements OnInit { }; this.ui = { '*': { - spanLabelFixed: 100, + spanLabelFixed: 130, grid: { span: 16 } } }; @@ -80,7 +80,7 @@ export class VehicleFreightPeopleComponent implements OnInit { console.log(params); this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => { if (res) { - this.modal.destroy(); + this.modal.destroy(true); this.service.msgSrv.success('变更运费成功'); } }); diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 4ca6d51d..5302dbeb 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -133,13 +133,13 @@ - {{i?.goodsResource?.insuranceTypeLabel}} + {{i?.insuranceTypeLabel}} - {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}} + {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} - {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}} + {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} @@ -181,28 +181,25 @@ - {{i?.receiptType == 1 ?'是':'否'}} + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} - - {{i?.receiptTypeLabel}} + + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - - {{i?.receiptUser}}{{ i?.receiptUserPhone ? ' /' + i?.receiptUserPhone : ''}} + {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + + {{ i?.supplementaryInformationVO?.area }} - - {{i?.receiptPlace}} + + {{ i?.supplementaryInformationVO?.address }} - - {{i?.receiptAddress}} - - - - + + - {{i?.goodsResource?.remarks}} + {{ i?.supplementaryInformationVO?.remarks }} diff --git a/src/app/routes/waybill-management/services/waybill-management.service.ts b/src/app/routes/waybill-management/services/waybill-management.service.ts index d4b60735..aeea4f10 100644 --- a/src/app/routes/waybill-management/services/waybill-management.service.ts +++ b/src/app/routes/waybill-management/services/waybill-management.service.ts @@ -56,7 +56,7 @@ export class WaybillManagementServe extends BaseService { // 获取轨迹 $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`; // 获取订单司机轨迹 - $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; + $api_get_getAppDriverPosition = `/api/sdc/wayBillOperate/getAppDriverPosition`; // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; constructor(public injector: Injector) { From d2bad049856d31ed6ba342caf2e0dd55a7fac229 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Mon, 14 Mar 2022 15:32:42 +0800 Subject: [PATCH 02/34] 'fixbug' --- .../modal/vehicle/freight-people/freight-people.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts index 14065be9..15410d98 100644 --- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts @@ -81,7 +81,7 @@ export class VehicleFreightPeopleComponent implements OnInit { this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => { if (res) { this.modal.destroy(true); - this.service.msgSrv.success('变更运费成功'); + this.service.msgSrv.success('修改网络货运人成功！'); } }); } From 8a80a1de3ccc4ae2d0f7139cd1c6853207d8707f Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Mon, 14 Mar 2022 16:14:31 +0800 Subject: [PATCH 03/34] edit --- .../invoice-requested.component.ts | 14 +++++--- .../requested-invoice-modal.component.html | 2 +- .../requested-invoice-modal.component.ts | 34 ++++++++++--------- .../amap-path-simplifier.component.ts | 24 +++++++------ 4 files changed, 41 insertions(+), 33 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 663c4091..50dc913b 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -1,12 +1,13 @@ import { query } from '@angular/animations'; import { CurrencyPipe } from '@angular/common'; -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; import { isTemplateRef } from 'ng-zorro-antd/core/util'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; + import { TicketService } from '../../services/ticket.service'; import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component'; import { RequestedInvoiceModalComponent } from './requested-invoice-modal/requested-invoice-modal.component'; @@ -16,7 +17,7 @@ import { RequestedInvoiceModalComponent } from './requested-invoice-modal/reques templateUrl: './invoice-requested.component.html', styleUrls: ['./invoice-requested.component.less', '../../../commom/less/box.less'] }) -export class InvoiceRequestedComponent implements OnInit { +export class InvoiceRequestedComponent { @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) @@ -33,8 +34,6 @@ export class InvoiceRequestedComponent implements OnInit { selectedRows: any[] = []; constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} - ngOnInit(): void {} - beforeReq = (requestOptions: STRequestOptions) => { if (this.resourceStatus) { Object.assign(requestOptions.body, { sts: this.resourceStatus }); @@ -219,6 +218,11 @@ export class InvoiceRequestedComponent implements OnInit { }, nzFooter: null }); + modal.afterClose.subscribe(res => { + if (res) { + this.st.load(1); + } + }); } /** @@ -421,7 +425,7 @@ export class InvoiceRequestedComponent implements OnInit { // }, { text: '订单明细
', - click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id], { queryParams: { sts: item.sts } }) + click: item => this.router.navigate([`/ticket/invoice-requested/detail/${item?.id}`], { queryParams: { sts: item.sts } }) }, { text: '查看原因
', diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index 8e20fb35..14c7d14d 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -12,7 +12,7 @@ { Object.assign(requestOptions.body, { vatappHId: this.id }); return requestOptions; @@ -33,6 +32,7 @@ export class RequestedInvoiceModalComponent implements OnInit { /** * 移除订单 + * * @returns */ removeOrder(item: any[]) { @@ -45,7 +45,7 @@ export class RequestedInvoiceModalComponent implements OnInit { this.service.request(this.service.$api_remove_bill, ids).subscribe(res => { if (res) { this.service.msgSrv.success('移除成功'); - this.modal.destroy(); + this.modal.destroy(true); } }); } @@ -57,7 +57,7 @@ export class RequestedInvoiceModalComponent implements OnInit { this.selectedRows = e.checkbox!; break; case 'filter': - this.st.load(); + this.st1.load(); break; } } @@ -78,7 +78,7 @@ export class RequestedInvoiceModalComponent implements OnInit { width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) } + widget: { type: 'currency-chy', params: ({ record }: any) => ({ value: record.billkpmoney }) } }, { title: '运输费', @@ -86,7 +86,7 @@ export class RequestedInvoiceModalComponent implements OnInit { width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney2 }) } + widget: { type: 'currency-chy', params: ({ record }: any) => ({ value: record.fjfmoney2 }) } }, { title: '附加费', @@ -94,7 +94,7 @@ export class RequestedInvoiceModalComponent implements OnInit { width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney }) } + widget: { type: 'currency-chy', params: ({ record }: any) => ({ value: record.fjfmoney }) } }, { title: '操作', @@ -104,7 +104,7 @@ export class RequestedInvoiceModalComponent implements OnInit { buttons: [ { text: '移除', - click: item => this.removeOrder([item]) + click: (item: any) => this.removeOrder([item]) } ] } @@ -116,17 +116,19 @@ export class RequestedInvoiceModalComponent implements OnInit { return; } const selectedRows = this.selectedRows.map(item => { - delete item._values; - return item; + return { ...item }; }); const params = { - ficoVatappBillVOList: selectedRows, + ficoVatappBillVOList: selectedRows.map(item => { + delete item._values; + return item; + }), id: this.id }; this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('开票成功'); - this.modal.destroy(); + 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 ccac8683..928a066f 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 @@ -1,8 +1,8 @@ -import { Component, Input, OnChanges, OnInit, Output, SimpleChanges, EventEmitter } from '@angular/core'; -import { BaseService } from 'src/app/shared/services'; -import { throwError } from 'rxjs'; import AMapLoader from '@amap/amap-jsapi-loader'; +import { Component, Input, OnChanges, OnInit, Output, SimpleChanges, EventEmitter, OnDestroy } from '@angular/core'; import { amapConf } from '@conf/amap.config'; +import { throwError } from 'rxjs'; +import { BaseService } from 'src/app/shared/services'; declare var AMap: any; declare var AMapUI: any; declare var Loca: any; @@ -13,7 +13,7 @@ const CONFIG = amapConf; templateUrl: './amap-path-simplifier.component.html', styleUrls: ['./amap-path-simplifier.component.less'] }) -export class AmapPathSimplifierComponent implements OnInit, OnChanges { +export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy { aMap: any; pathSimplifierIns: any; geocoder: any; @@ -32,7 +32,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { mapHeight = '500px'; @Output() - clcikPointEvent = new EventEmitter(); + readonly clcikPointEvent = new EventEmitter(); @Input() pois: any = []; @@ -45,7 +45,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', @@ -130,7 +130,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { getHoverTitle: function (pathData: any, pathIndex: any, pointIndex: any) { if (pointIndex >= 0) { //point - return pathData.name + '，' + pathData.points[pointIndex].name; + return `${pathData.name},${pathData.points[pointIndex].name}`; } return ''; }, @@ -147,7 +147,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { this.pathSimplifierIns.on('pointClick', (e: any, info: any) => { this.clcikPointEvent.emit({ e, info }); - console.log('Click: ' + info.pathData.points[info.pointIndex].name); + console.log(`Click: ${info.pathData.points[info.pointIndex].name}`); }); } @@ -202,7 +202,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { }); } - setData(pathList: Array) { + setData(pathList: any[]) { this.pathSimplifierIns.setData(pathList); } @@ -224,7 +224,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { } /** 根据经纬度获取地址信息 */ - getPoiByPositon(position: Array) { + getPoiByPositon(position: string[]) { this.geocoder.getAddress(position, (status: any, result: any) => { if (status === 'complete' && result.info === 'OK') { // result中对应详细地理坐标信息 @@ -239,6 +239,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { /** * 选中标点，设置窗口信息 + * * @param location */ selectedPOI(location: any) { @@ -250,6 +251,7 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { /** * 增加标记点 + * * @param poi */ setPOI(poi: POI) { @@ -278,5 +280,5 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { export interface POI { markerLabel: string; color: string; - position: Array; + position: string[]; } From 23226b2df0a27c0aa3dc39b73b6e8ec1053ab2a6 Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Mon, 14 Mar 2022 17:10:21 +0800 Subject: [PATCH 04/34] edit --- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7838d45d..3892a179 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 @@ -215,7 +215,7 @@

- +
From 9e473d2116648e2e139020b9bdd738847210e25e Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Mon, 14 Mar 2022 18:29:55 +0800 Subject: [PATCH 05/34] bugfix 5303 --- .../advance-collection.component.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index 7806bb1b..95c6ce06 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -151,12 +151,12 @@ export class AdvanceCollectionComponent implements OnInit { text: '浏览', click: item => this.router.navigate(['/financial-management/advance-collection/detail/' + item.id]) }, - { - text: '核销' - }, - { - text: '退款' - } + // { + // text: '核销' + // }, + // { + // text: '退款' + // } ] } ]; From 4aadbec7cc7f45e4039507a386fa9a53d81fdae6 Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Tue, 15 Mar 2022 11:21:57 +0800 Subject: [PATCH 06/34] edit --- .../advance-collection-detail.component.html | 6 +++--- .../advance-collection.component.ts | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html index b596784a..584da352 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html @@ -21,7 +21,7 @@ {{ costInfo?.artoname }} - {{ costInfo?.shipperId }} + {{ costInfo?.cnoName }} {{ costInfo?.ltdaccountId }} @@ -75,8 +75,8 @@ --> + [res]="{ reName: { list: 'data' } }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }" + class="mt-md"> {{index+1}} diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index 95c6ce06..3556e2d5 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -1,9 +1,9 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; + import { FreightAccountService } from '../../services/freight-account.service'; @Component({ @@ -11,7 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; templateUrl: './advance-collection.component.html', styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) -export class AdvanceCollectionComponent implements OnInit { +export class AdvanceCollectionComponent { @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) @@ -23,8 +23,6 @@ export class AdvanceCollectionComponent implements OnInit { constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} - ngOnInit(): void {} - beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); @@ -49,7 +47,7 @@ export class AdvanceCollectionComponent implements OnInit { } exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); } private initSF(): SFSchema { @@ -149,8 +147,8 @@ export class AdvanceCollectionComponent implements OnInit { buttons: [ { text: '浏览', - click: item => this.router.navigate(['/financial-management/advance-collection/detail/' + item.id]) - }, + click: item => this.router.navigate([`/financial-management/advance-collection/detail/${item.id}`]) + } // { // text: '核销' // }, From 5fcdba486e98ce6e399038b19f21b05cbf001440 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Tue, 15 Mar 2022 13:00:50 +0800 Subject: [PATCH 07/34] 'fixbug' --- .../modal/vehicle/sure-arrive/sure-arrive.component.ts | 7 ++++--- .../modal/vehicle/sure-depart/sure-depart.component.ts | 6 +++--- .../waybill-management/components/bulk/bulk.component.ts | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index 99899e08..9a58fc6c 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -407,7 +407,7 @@ export class VehicleSureArriveComponent implements OnInit { } as SFUploadWidgetSchema, } }, - required: ['time' ] + required: ['time','weight','volume' ] }; } this.ui = { @@ -434,6 +434,7 @@ export class VehicleSureArriveComponent implements OnInit { time: value?.time, } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') + this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => { if(res) { this.service.msgSrv.success('确认到车成功！') @@ -441,8 +442,8 @@ export class VehicleSureArriveComponent implements OnInit { } }) } else { - if(!value.time ) { - this.service.msgSrv.warning('卸货时间为空！') + if(!value.time || !this.data?.volume || !this.data?.weight) { + this.service.msgSrv.warning('卸货时间或卸货重量为空！') return; } const params = { diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts index 6bc299cf..927c3f9d 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts @@ -249,7 +249,7 @@ export class VehicleSureDepartComponent implements OnInit { } as SFUploadWidgetSchema, } }, - required: ['time'] + required: ['time','weight', 'volume'] }; } @@ -282,8 +282,8 @@ export class VehicleSureDepartComponent implements OnInit { } }) } else { - if(!value?.time) { - this.service.msgSrv.warning('装货时间为空！') + if(!value?.time || !this.data?.volume || !this.data?.weight) { + this.service.msgSrv.warning('装货时间或装货重量为空！') return; } console.log(value) diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index f4f45f08..bf20b5d7 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -283,8 +283,7 @@ tabs = { width: '200px', className: 'text-left', format: (item: any) => - `${item.settlementWeight || '0'}吨/ - ${item.settlementVolume || '0'}方` + `${item.settlementWeight || ''}` }, { title: '承运司机', From 70d1ad980eb821dc1f9cf771b940bc8c8aa392c4 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Tue, 15 Mar 2022 14:59:18 +0800 Subject: [PATCH 08/34] 'fixbug' --- .../components/bulk-detail/bulk-detail.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 425c6b1b..2fbc793b 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -29,7 +29,7 @@ {{ i?.shippername }} {{i?.enterpriseProject}} {{i?.serviceTypeLabel}} - {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} + {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} {{ i?.resourceCode }} {{ i?.wayBillCode }} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 5302dbeb..cf5fbd56 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -29,7 +29,7 @@ {{ i?.shippername }} {{i?.enterpriseProject}} {{i?.serviceTypeLabel}} - {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} + {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} {{ i?.resourceCode }} {{ i?.wayBillCode }} From 59dbb5443c47d16e09521049f4da6819f8027045 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Tue, 15 Mar 2022 15:12:26 +0800 Subject: [PATCH 09/34] 'fixbug' --- .../waybill-management/components/bulk/bulk.component.html | 2 +- .../components/vehicle/vehicle.component.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 422c36b5..01916faa 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -88,7 +88,7 @@

- {{ data.costCodeLabel }}：{{ data.price | currency }} + {{ data.costName }}：{{ data.price | currency }} {{ data.paymentStatusLabel }}

diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 1e50f7d4..a8ffa2a3 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -78,13 +78,13 @@
-

{{ data.costCodeLabel }}：{{ data.price | currency }}

-
+

{{ data.costName }}：{{ data.price | currency }}

+

- {{ data.costCodeLabel }}：{{ data.price | currency }} + {{ data.costName }}：{{ data.price | currency }} {{ data.paymentStatusLabel }}

From 5777290bf23c1b06cf29816bacd1b07d775b2b50 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Tue, 15 Mar 2022 15:18:18 +0800 Subject: [PATCH 10/34] 'fixbug' --- .../components/bulk-detail/bulk-detail.component.html | 5 ++--- .../components/bulk-detail/bulk-detail.component.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 2fbc793b..d6bd2f80 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -19,8 +19,8 @@
- - + +
@@ -224,7 +224,6 @@ -
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index a3117b3e..65f66053 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -72,7 +72,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { ngOnInit(): void { this.initData() - this.getDriverTrajectory() + this.getTrajectory() } initData() { const params = { From 376005df54e034d89e73a7d62a1b3d1b378881ad Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Wed, 16 Mar 2022 13:34:23 +0800 Subject: [PATCH 11/34] edit --- .../withdrawals-record.component.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 0bebf2f9..56205a3b 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -1,8 +1,9 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; + import { FreightAccountService } from '../../services/freight-account.service'; @Component({ @@ -10,7 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; templateUrl: './withdrawals-record.component.html', styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) -export class WithdrawalsRecordComponent implements OnInit { +export class WithdrawalsRecordComponent { @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) @@ -27,9 +28,8 @@ export class WithdrawalsRecordComponent implements OnInit { refundStatus: any = ''; msg = ''; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} - ngOnInit(): void {} + constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -66,7 +66,7 @@ export class WithdrawalsRecordComponent implements OnInit { auditAction(item?: any) { this.msg = ''; - let params: Array = []; + let params: string[] = []; if (item) { params = [item.id]; } else { @@ -78,6 +78,7 @@ export class WithdrawalsRecordComponent implements OnInit { nzFooter: [ { label: '拒绝', + loading: () => this.service.http.loading, type: 'default', onClick: () => { if (!this.msg) { @@ -101,6 +102,7 @@ export class WithdrawalsRecordComponent implements OnInit { }, { label: '通过', + loading: () => this.service.http.loading, type: 'primary', onClick: () => { this.service @@ -291,7 +293,7 @@ export class WithdrawalsRecordComponent implements OnInit { }, { text: '详情', - click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id]) + click: item => this.router.navigate([`/financial-management/withdrawals-record/detail/${item.id}`]) } ] } From 01ac9f4e9977cf0bd8d8d2d10eac92d1fbe0f0bd Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Wed, 16 Mar 2022 15:09:46 +0800 Subject: [PATCH 12/34] 'fixbug' --- .../bulk-detail/bulk-detail.component.html | 4 +- .../bulk-detail/bulk-detail.component.ts | 17 +- .../components/bulk/bulk.component.ts | 2 +- .../vehicle-detail.component.html | 2 +- .../vehicle-detail.component.ts | 2 +- .../sure-arrive/sure-arrive.component.html | 4 +- .../sure-arrive/sure-arrive.component.ts | 841 +++++++++--------- .../sure-depart/sure-depart.component.html | 4 +- .../sure-depart/sure-depart.component.ts | 150 ++-- .../bulk-detail/bulk-detail.component.html | 14 +- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 2 +- .../bulk-detail/bulk-detail.component.html | 6 +- 13 files changed, 544 insertions(+), 506 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 895ed730..a321842f 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -94,7 +94,7 @@ {{ i?.unloadPlanTime }} --> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 + {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
@@ -209,7 +209,7 @@
- +
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 2daee3a6..32ad9e11 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -28,6 +28,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { MapList: any[]=[]; id = this.route.snapshot.params.id; billExpenses: any[] = []; //运费信息表格信息 + pois: any[] = []; i: any; imges: any; totalObj: any; @@ -77,8 +78,22 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; - this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); + this.billExpenses = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TRA'); 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.service.request(this.service.$api_get_getRiskDetail, { id: this.id }).subscribe(res => { 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 2f56ef24..19636437 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -118,7 +118,7 @@ export class OrderManagementBulkComponent implements OnInit { }; } search() { - this.st?.load(1); + this.st?.load(); this.getGoodsSourceStatistical(); } getGoodsSourceStatistical() { 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 3892a179..f2855f77 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 @@ -216,7 +216,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 585e53cf..d05ad48a 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 @@ -94,7 +94,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { title: res.endPoint.detailedAddress } ]; - this.billExpenses = this.i?.billExpenseDetails?.filter( + this.billExpenses = this.i?.billExpenseDetailVOList?.filter( (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html index 16cdb712..5360747c 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html @@ -12,13 +12,13 @@
- +
吨
- +
方
 diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index 9a58fc6c..12b67875 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -1,4 +1,3 @@ - import { Component, OnInit, ViewChild } from '@angular/core'; import { DatePipe } from '@angular/common'; import { @@ -32,442 +31,455 @@ export class VehicleSureArriveComponent implements OnInit { i: any; formData: any; Status: any; - data: any ={ + data: any = { weight: 0, volume: 0 }; @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: WaybillManagementServe,private datePipe: DatePipe,private envSrv: EAEnvironmentService, ) {} + constructor( + private modal: NzModalRef, + private msgSrv: NzMessageService, + public http: _HttpClient, + public service: WaybillManagementServe, + private datePipe: DatePipe, + private envSrv: EAEnvironmentService + ) {} ngOnInit(): void { - console.log(this.i) - this.initData() + console.log(this.i); + this.initData(); this.i.time = this.i?.loadingTime; this.initSF(); } initSF() { - if(this.Status === 1) { - - this.schema = { - properties: { - time: { - type: 'string', - title: '卸货时间', - format: 'date-time', + if (this.Status === 1) { + this.schema = { + properties: { + time: { + type: 'string', + title: '卸货时间', + format: 'date-time' + }, + imgUrl3: { + type: 'string', + title: '装货凭证', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '提货单', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + imgUrl4: { + type: 'string', + title: '', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '人车货照片', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + no4: { + type: 'string', + title: '', + ui: { + widget: 'text' + }, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' + }, + imgUrl1: { + type: 'string', + title: '卸货凭证', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '提货单', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + imgUrl2: { + type: 'string', + title: '', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '人车货照片', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + } }, - imgUrl3: { - type: 'string', - title: '装货凭证', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '提货单', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); + required: ['time'] + }; + } else { + this.schema = { + properties: { + time: { + type: 'string', + title: '卸货时间', + format: 'date-time' + }, + weight: { + type: 'string', + title: '卸货重量', + ui: { + widget: 'custom' + } + }, + volume: { + type: 'string', + title: '卸货体积', + ui: { + widget: 'custom' + } + }, + imgUrl3: { + type: 'string', + title: '装货凭证', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '提货单', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + imgUrl4: { + type: 'string', + title: '', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '人车货照片', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + no4: { + type: 'string', + title: '', + ui: { + widget: 'text' }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' + }, + imgUrl1: { + type: 'string', + title: '卸货凭证', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '提货单', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + imgUrl2: { + type: 'string', + title: '', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: 'image/png,image/jpeg,image/jpg,image/gif', + limit: 1, + limitFileCount: 1, + resReName: 'data.fullFileWatermarkPath', + urlReName: 'data.fullFileWatermarkPath', + descriptionI18n: '人车货照片', + data: { + appId: this.envSrv.env.appId + }, + name: 'multipartFile', + beforeUpload: (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 5; + const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + this.service.msgSrv.warning('图片大小超过5M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + } }, - imgUrl4: { - type: 'string', - title: '', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '人车货照片', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - }, - no4: { - type: 'string', - title: '', - ui: { - widget: 'text', - }, - default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', - }, - imgUrl1: { - type: 'string', - title: '卸货凭证', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '提货单', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - }, - imgUrl2: { - type: 'string', - title: '', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '人车货照片', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - } - }, - required: ['time'] - }; - }else { - this.schema = { - properties: { - time: { - type: 'string', - title: '卸货时间', - format: 'date-time', - }, - weight: { - type: 'string', - title: '卸货重量', - ui: { - widget: 'custom', - } - }, - volume: { - type: 'string', - title: '卸货体积', - ui: { - widget: 'custom', - } - }, - imgUrl3: { - type: 'string', - title: '装货凭证', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '提货单', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - }, - imgUrl4: { - type: 'string', - title: '', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '人车货照片', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - }, - no4: { - type: 'string', - title: '', - ui: { - widget: 'text', - }, - default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', - }, - imgUrl1: { - type: 'string', - title: '卸货凭证', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '提货单', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - }, - imgUrl2: { - type: 'string', - title: '', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: 'image/png,image/jpeg,image/jpg,image/gif', - limit: 1, - limitFileCount: 1, - resReName: 'data.fullFileWatermarkPath', - urlReName: 'data.fullFileWatermarkPath', - descriptionI18n: '人车货照片', - data: { - appId: this.envSrv.env.appId, - }, - name: 'multipartFile', - beforeUpload: (file: any, fileList: any) => { - return new Observable((observer: Observer) => { - const isLt1M = file.size / 1024 / 1024 < 5; - const fileType = 'image/png,image/jpeg,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); - observer.complete(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); - observer.complete(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); - }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, - } - }, - required: ['time','weight','volume' ] - }; - } + required: ['time', 'weight', 'volume'] + }; + } this.ui = { '*': { spanLabelFixed: 100, grid: { span: 20 } }, - $imgUrl1: { grid: { span: 12} }, - $imgUrl2: { grid: { span: 12} }, - $imgUrl3: { grid: { span: 12} }, - $imgUrl4: { grid: { span: 12} }, + $imgUrl1: { grid: { span: 12 } }, + $imgUrl2: { grid: { span: 12 } }, + $imgUrl3: { grid: { span: 12 } }, + $imgUrl4: { grid: { span: 12 } } }; } save(value: any): void { - if(this.Status === 1) { - if(!value.time) { - this.service.msgSrv.warning('卸货时间为空！') + if (this.Status === 1) { + if (!value.time) { + this.service.msgSrv.warning('卸货时间为空！'); return; - } - const params = { + } + const params = { id: this.i.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, imgUrl2: value?.imgUrl2?.data?.fullFilePath, - time: value?.time, - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - - this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认到车成功！') - this.modal.destroy(true); - } - }) - } else { - if(!value.time || !this.data?.volume || !this.data?.weight) { - this.service.msgSrv.warning('卸货时间或卸货重量为空！') - return; - } - const params = { - id: this.i?.id, - imgUrl1: value?.imgUrl1?.data?.fullFilePath, - imgUrl2: value?.imgUrl2?.data?.fullFilePath, - time: value?.time, - volume: this.data?.volume, - weight: this.data?.weight - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认到车成功！') - this.modal.destroy(true); - } - }) - } + time: value?.time + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认到车成功！'); + this.modal.destroy(true); + } + }); + } else { + if (!value?.time) { + this.service.msgSrv.warning('装货时间为空！'); + return; + } + if (!this.data?.volume) { + this.service.msgSrv.warning('装货重量为空！'); + return; + } + if (!this.data?.weight) { + this.service.msgSrv.warning('装货体积为空！'); + return; + } + const params = { + id: this.i?.id, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, + volume: this.data?.volume, + weight: this.data?.weight + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认到车成功！'); + this.modal.destroy(true); + } + }); + } } - // 确认到车界面信息(两个只能看的图片) + // 确认到车界面信息(两个只能看的图片) initData() { - this.service.request(this.service.$api_get_getUnloadCarInfo, { id : this.i?.id}).subscribe((res) => { - console.log(res) + this.service.request(this.service.$api_get_getUnloadCarInfo, { id: this.i?.id }).subscribe(res => { + console.log(res); if (res.imgUrl1) { this.formData = { imgUrl3: [ @@ -477,10 +489,10 @@ export class VehicleSureArriveComponent implements OnInit { status: 'done', url: res.imgUrl1, response: { - url: res.imgUrl1, - }, - }, - ], + url: res.imgUrl1 + } + } + ], imgUrl4: [ { uid: 'logo', @@ -488,16 +500,15 @@ export class VehicleSureArriveComponent implements OnInit { status: 'done', url: res.imgUrl2, response: { - url: res.imgUrl2, - }, - }, - ], + url: res.imgUrl2 + } + } + ] }; } - }) + }); } close(): void { this.modal.destroy(true); } - } diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html index 6da96d05..3c703e39 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html @@ -12,13 +12,13 @@
- +
吨
- +
方
 diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts index 927c3f9d..c51480bf 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts @@ -1,4 +1,3 @@ - import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, @@ -31,37 +30,44 @@ export class VehicleSureDepartComponent implements OnInit { record: any = {}; i: any; Status: any; - data: any ={ + data: any = { weight: '', volume: '' }; @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: WaybillManagementServe, private envSrv: EAEnvironmentService,private datePipe: DatePipe) {} + constructor( + private modal: NzModalRef, + private msgSrv: NzMessageService, + public http: _HttpClient, + public service: WaybillManagementServe, + private envSrv: EAEnvironmentService, + private datePipe: DatePipe + ) {} ngOnInit(): void { this.initSF(); - console.log(this.i) - this.data.weight = this.i?.weight + console.log(this.i); + this.data.weight = this.i?.weight; this.i.time = this.i.loadingTime; } initSF() { - if(this.Status === 1) { + if (this.Status === 1) { this.schema = { properties: { time: { type: 'string', title: '装货时间', - format: 'date-time', + format: 'date-time' }, no4: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + widget: 'text' + }, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' }, imgUrl1: { type: 'string', @@ -76,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '提货单', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -98,8 +104,8 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, imgUrl2: { type: 'string', @@ -114,7 +120,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '人车货照片', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -136,8 +142,8 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema } }, required: ['time'] @@ -148,29 +154,29 @@ export class VehicleSureDepartComponent implements OnInit { time: { type: 'string', title: '装货时间', - format: 'date-time', + format: 'date-time' }, weight: { type: 'string', title: '装货重量', ui: { - widget: 'custom', - } + widget: 'custom' + } }, volume: { type: 'string', title: '装货体积', ui: { - widget: 'custom', - } + widget: 'custom' + } }, no4: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + widget: 'text' + }, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' }, imgUrl1: { type: 'string', @@ -185,7 +191,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '提货单', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -207,8 +213,8 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, imgUrl2: { type: 'string', @@ -223,7 +229,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '人车货照片', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -245,69 +251,75 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema } }, - required: ['time','weight', 'volume'] + required: ['time', 'weight', 'volume'] }; } - + this.ui = { '*': { spanLabelFixed: 100, grid: { span: 20 } }, - $imgUrl1: { grid: { span: 12} }, - $imgUrl2: { grid: { span: 12} }, + $imgUrl1: { grid: { span: 12 } }, + $imgUrl2: { grid: { span: 12 } } }; } save(value: any): void { - if(this.Status === 1) { - if(!value?.time) { - this.service.msgSrv.warning('装货时间为空！') + if (this.Status === 1) { + if (!value?.time) { + this.service.msgSrv.warning('装货时间为空！'); return; - } - const params = { + } + const params = { + id: this.i.id, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认发车成功！'); + this.modal.destroy(true); + } + }); + } else { + if (!value?.time) { + this.service.msgSrv.warning('装货时间为空！'); + return; + } + if (!this.data?.volume) { + this.service.msgSrv.warning('装货重量为空！'); + return; + } + if (!this.data?.weight) { + this.service.msgSrv.warning('装货体积为空！'); + return; + } + console.log(value); + const params = { id: this.i.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, imgUrl2: value?.imgUrl2?.data?.fullFilePath, time: value?.time, - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认发车成功！') - this.modal.destroy(true); + volume: this.data?.volume, + weight: this.data?.weight + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认发车成功！'); + this.modal.destroy(true); } - }) - } else { - if(!value?.time || !this.data?.volume || !this.data?.weight) { - this.service.msgSrv.warning('装货时间或装货重量为空！') - return; - } - console.log(value) - const params = { - id: this.i.id, - imgUrl1: value?.imgUrl1?.data?.fullFilePath, - imgUrl2: value?.imgUrl2?.data?.fullFilePath, - time: value?.time, - volume: this.data?.volume, - weight: this.data?.weight - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认发车成功！') - this.modal.destroy(true); - } - }) + }); } - } close(): void { this.modal.destroy(true); } - } 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 ac00d884..c9467c22 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 @@ -40,14 +40,14 @@
- - - + + + [nzDescription]="i?.endTime"> +
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index 3aa2e92f..4c731269 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -73,7 +73,7 @@ [req]="{ process: beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="loading" + [loading]="false" >
{{ item?.createUserName }}/{{ item?.createUserPhone }}
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index d5af46f3..26bda239 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -98,7 +98,7 @@ export class SupplyManagementBulkComponent implements OnInit { return requestOptions; }; search() { - this.st?.load(1); + this.st?.load(); this.getGoodsSourceStatistical() } afterRes = (data: any[], rawData?: any) => { diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index d6bd2f80..4b2cbcc9 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -92,13 +92,13 @@ {{i?.unloadPlanTime}} --> - {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 - {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 + { i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
From 48d7a9ba789ca2ae12c0f0e53bd897be73739261 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Wed, 16 Mar 2022 15:14:39 +0800 Subject: [PATCH 13/34] 'fixbug' --- .../components/bulk-detail/bulk-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 4b2cbcc9..7b7a1301 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -98,7 +98,7 @@ {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 - { i?.settlementWeight }}吨,{{ i?.settlementVolume }}方 + {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
From b394d976a04072c44423190092189e7073e0e987 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Wed, 16 Mar 2022 15:36:35 +0800 Subject: [PATCH 14/34] 'fixbug' --- .../waybill-management/components/bulk/bulk.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 01916faa..0e381f1e 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -86,7 +86,7 @@
{{item?.settlementBasisLabel}}
-
+

{{ data.costName }}：{{ data.price | currency }} {{ data.paymentStatusLabel }} From c0336eb26a93b9dc8ce4773c8a4403e009663554 Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Thu, 17 Mar 2022 13:30:07 +0800 Subject: [PATCH 15/34] bugfix --- .../components/crm-management/crm-management.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/sys-setting/components/crm-management/crm-management.component.html b/src/app/routes/sys-setting/components/crm-management/crm-management.component.html index d1956b9a..50f3f30b 100644 --- a/src/app/routes/sys-setting/components/crm-management/crm-management.component.html +++ b/src/app/routes/sys-setting/components/crm-management/crm-management.component.html @@ -29,7 +29,7 @@

+ [loading]="false" [scroll]="{ y: '370px' }" (change)="stChange($event)" [page]="{}" >
客户 From 17420e5351932db66e5c7ca84e6cb568d751d519 Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Thu, 17 Mar 2022 15:15:44 +0800 Subject: [PATCH 16/34] bugfix --- .../invoice-requested/invoice-requested.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 50dc913b..1f97a7fd 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -300,7 +300,11 @@ export class InvoiceRequestedComponent { otherremarks: { type: 'string', title: '其他需求', - enum: [{ label: '全部', value: '' }], + enum: [ + { label: '全部', value: '' }, + { label: '是', value: true }, + { label: '否', value: false } + ], ui: { widget: 'select', placeholder: '请选择', From a59df85c64eda4ad4ee0e186a4093f2efca75a72 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Thu, 17 Mar 2022 17:01:37 +0800 Subject: [PATCH 17/34] 'fixbug' --- .../components/vehicle/vehicle.component.ts | 11 ++++++----- .../model/import-supply/import-supply.component.ts | 9 ++++++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index aac4fc47..0c284b32 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -179,11 +179,12 @@ export class SupplyManagementVehicleComponent implements OnInit { label: '下载失败数据', type: 'primary', onClick: () => { - this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => { - if (res) { - console.log(res); - } - }); + this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids); + // this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => { + // if (res) { + // console.log(res); + // } + // }); console.log(111); } } diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts index 2fba6e5b..3f3a4613 100644 --- a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts +++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts @@ -154,13 +154,20 @@ export class SupplyManagementImportSupplyComponent implements OnInit { }); } save(): void { + console.log(this?.networkTransporter) + console.log(this.sf.value) + if(!this.sf.value?.shipperAppUserId || !this?.networkTransporter || !this.sf.value?.enterpriseProjectId || !this.sf.value?.fileName) { + this.service.msgSrv.error('请填写必填项并上传文件！') + return + } const formData : any= new FormData(); - this.files.forEach((file: any) => { + this.files?.forEach((file: any) => { formData.append('file', file); formData.append('shipperAppUserId', this.sf.value?.shipperAppUserId); formData.append('enterpriseInfoId', this?.networkTransporter); formData.append('enterpriseProjectId', this.sf.value?.enterpriseProjectId); }); + console.log(formData) this.service.request(this.service.$api_goodsResourceOperateImport, formData).subscribe(res => { if (res) { From 46bfecfdc2aa4f6ea8bae47148cfbc947fd26f4b Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Thu, 17 Mar 2022 17:11:06 +0800 Subject: [PATCH 18/34] 'fixbug' --- .../components/bulk-detail/bulk-detail.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index a321842f..56293af8 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -24,7 +24,7 @@ From b49480ef7bc519905c3af8550cca3b6f74487392 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Thu, 17 Mar 2022 17:59:34 +0800 Subject: [PATCH 19/34] 'fixbug' --- .../components/vehicle/vehicle.component.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 2a43997c..377959b6 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -86,13 +86,26 @@
{{ item?.createUserName }}/{{ item?.createUserPhone }}
- + + +
+
+ {{ data.expenseName }}：{{ data.price | currency }} + 待申请 + 已支付 + 已拒绝 + 申请中 + 退款中 + 退款成功 +
+
From bdd3b9cc3b3b880d998bfb89c0189ef42282e453 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 00:34:45 +0800 Subject: [PATCH 20/34] 'fixbug' --- .../bulk-publish/bulk-publish.component.html | 7 +++---- .../bulk-publish/bulk-publish.component.ts | 12 +++++++++++- .../services/supply-management.service.ts | 5 +++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 8b82b607..7e3d5937 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -126,13 +126,12 @@ - + - - - + 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 80830828..438f255a 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 @@ -41,6 +41,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit { totalTime = 0.0; //路程总时间 currentGoodsTypeName: any; enterpriseProjectIds: any; + freightTypeOptions: any; + ruleOptions: any; id = this.route.snapshot.params.id; // 传参id // // 单位 startInfo: any = []; @@ -104,6 +106,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.initSF4(); this.initSF6(); this.initdata(); + this.initDict(); this.getLimitvalue(); } initSF1() { @@ -301,7 +304,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }, default: '1' }, - rule: { type: 'string', title: '', @@ -531,6 +533,14 @@ export class SupplyManagementBulkPublishComponent implements OnInit { Number(this.sf7?.value?.prePay) + Number(this.sf7?.value?.receiptPay) + Number(this.sf7?.value?.toPay); + } + initDict() { + this.service.getDictByKey('freight:type').subscribe(res => { + this.freightTypeOptions = res; + }); + this.service.getDictByKey('goodresource:rounding:rules').subscribe(res => { + this.ruleOptions = res; + }); } // 获取城市列表 getRegionCode(regionCode: any) { diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 166c3390..1a69f9cd 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -175,4 +175,9 @@ export class SupplyManagementService extends BaseService { $api_asyncExportWholeList = '/api/sdc/goodsResourceOperate/asyncExportWholeList'; // 根据货主ID查询合同签署属性 public $api_getContractAtr = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getContractAtr'; + + getDictByKey(dictKey: string) { + const params = { dictKey: dictKey }; + return this.request(this.$api_getDictValue, params); + } } From d9d9ea27333578b207357816248e6535f2afb487 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 00:41:03 +0800 Subject: [PATCH 21/34] 'fixbug' --- .../routes/order-management/components/bulk/bulk.component.html | 2 +- .../order-management/components/vehicle/vehicle.component.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 83f89142..3a746c56 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -242,7 +242,7 @@
-
+
- + {{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }} + （附加费率{{i?.rate * 100 | number: '0.2-2'}}%）
- + ({{ item?.count }}) 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 89abb343..b2a27627 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 @@ -991,9 +991,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ]; // 运费信息 const expenseList = [ - { expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay || 0, id: this.sf7data?.prePayId || '' }, - { expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay || 0, id: this.sf7data?.toPayId || '' }, - { expenseCode: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '' } + { expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay || 0, id: this.sf7data?.prePayId || '' ,resourceId: this.sf7data?.PREresourceId || '' }, + { expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay || 0, id: this.sf7data?.toPayId || '' ,resourceId: this.sf7data?.RECEresourceId || ''}, + { expenseCode: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '' ,resourceId: this.sf7data?.BACKresourceId || ''} ]; // 从“再下一单”过来，将所有的子参数内的id都删除 if (this.PageStatus === '整车下一单') { @@ -1288,14 +1288,28 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { receiptAddress: res?.supplementaryInformationVO.address || '', remarks: res?.supplementaryInformationVO?.remarks || '' }; + // this.sf7data = { + // prePay: res?.shippingInformationVO?.prePay, + // toPay: res?.shippingInformationVO?.toPay, + // // oilCardPay: 0, + // receiptPay: res?.shippingInformationVO?.receiptPay, + // total: res?.shippingInformationVO?.totalFee, + // appendFee: res?.shippingInformationVO?.appendFee, + // paymentDays: res?.paymentDays + // }; this.sf7data = { - prePay: res?.shippingInformationVO?.prePay, - toPay: res?.shippingInformationVO?.toPay, - // oilCardPay: 0, - receiptPay: res?.shippingInformationVO?.receiptPay, - total: res?.shippingInformationVO?.totalFee, - appendFee: res?.shippingInformationVO?.appendFee, - paymentDays: res?.paymentDays + prePay: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'PRE')[0]?.price || null, + toPay: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'RECE')[0]?.price || null, + receiptPay: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'BACK')[0]?.price || null, + appendFee: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]?.price || 0, + paymentDays: res?.paymentDays || '', + prePayId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'PRE')[0]?.id || '', + PREresourceId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'PRE')[0]?.resourceId || '', + RECEresourceId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'RECE')[0]?.resourceId || '', + BACKresourceId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'BACK')[0]?.resourceId || '', + toPayId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'RECE')[0]?.id || '', + receiptPayId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'BACK')[0]?.id || '', + appendFeeId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]?.id || '' }; this.sf7.setValue('/prePay', this.sf7data.prePay); this.sf7.setValue('/toPay', this.sf7data.toPay); From 8396fa724ca035c1f18a34598a464e00ab3f3585 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 01:28:25 +0800 Subject: [PATCH 25/34] 'fixbug' --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- .../components/bulk-detail/bulk-detail.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 56293af8..1e8b09a2 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -24,7 +24,7 @@ @@ -47,7 +47,7 @@ {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} {{ i?.externalBillCode }} {{ i?.goodsResource?.resourceCode }} - {{ i?.wayBillCode }} + {{ i?.wayBill?.wayBillCode }} {{ i?.goodsResource?.paymentDays }}
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 7b7a1301..5be7f348 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -32,7 +32,7 @@ {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} {{ i?.resourceCode }} - {{ i?.wayBillCode }} + {{ i?.wayBill?.wayBillCode }} {{ i?.paymentDays }} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index cf5fbd56..673afcc1 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -32,7 +32,7 @@ {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} {{ i?.resourceCode }} - {{ i?.wayBillCode }} + {{ i?.wayBill?.wayBillCode }} {{ i?.paymentDays }} From 4b89007ea60161f6f75e72d804f392f8483fecf9 Mon Sep 17 00:00:00 2001 From: TaricXin <583259872@qq.com> Date: Fri, 18 Mar 2022 15:03:40 +0800 Subject: [PATCH 26/34] edit --- .../platform-account-detail.component.ts | 19 +++++++++++++++++++ .../transaction-flow.component.ts | 11 +++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts index f8d865dd..8c4575d4 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; + import { FreightAccountService } from '../../../services/freight-account.service'; @Component({ @@ -134,6 +135,24 @@ export class PlatformAccountDetailComponent implements OnInit { }, default: '' }, + channelSource: { + type: 'string', + title: '账户类型', + enum: [ + { value: '', label: '全部' }, + { value: '1', label: '货主账户' }, + { value: '2', label: '司机账户' }, + { value: '3', label: '运营商账户' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + }, + default: '' + }, incomeType: { type: 'string', title: '收支类型', diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 44732a5f..a2bbd47c 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -1,10 +1,11 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { CurrencyPipe } from '@angular/common'; +import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; + import { FreightAccountService } from '../../services/freight-account.service'; -import { CurrencyPipe } from '@angular/common'; @Component({ selector: 'app-transaction-flow', @@ -12,7 +13,7 @@ import { CurrencyPipe } from '@angular/common'; styleUrls: ['./transaction-flow.component.less'], providers: [CurrencyPipe] }) -export class TransactionFlowComponent implements OnInit { +export class TransactionFlowComponent { @ViewChild('st', { static: true }) st!: STComponent; @ViewChild('sf', { static: false }) @@ -29,8 +30,6 @@ export class TransactionFlowComponent implements OnInit { private currencyPipe: CurrencyPipe ) {} - ngOnInit(): void {} - beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { @@ -162,7 +161,7 @@ export class TransactionFlowComponent implements OnInit { } } }, - orderSn221f: { + projectId: { type: 'string', title: '所属项目', ui: { From 7cdb840b5a4dff52b6d93a0c5b0f25b09e682210 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:15:13 +0800 Subject: [PATCH 27/34] 'fixbug' --- .../modal/vehicle/modify-rate/modify-rate.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3c3fa764..6e61d083 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 @@ -29,7 +29,7 @@ export class VehicleModifyRateComponent implements OnInit { { title: '订单号', index: 'billCode' }, { title: '原附加费率', render: 'oldAdditionalRate' }, { title: '原附加费', render: 'oldSurcharge' }, - { title: '新附加费', render: 'newSurcharge' }, + // { title: '新附加费', render: 'newSurcharge' }, ]; aggreechecked = false; From 567cf4b15a4de303438d92f0059da165d8206a88 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:21:44 +0800 Subject: [PATCH 28/34] 'fixbug' --- .../vehicle-detail-change/vehicle-detail-change.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bb79f5ec..bf1d876f 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 @@ -37,7 +37,7 @@ {{ i?.externalBillCode }} {{ i?.resourceCode }} {{ i?.wayBillId }} - {{ i?.goodsResource?.dispatchName }} + {{ i?.goodsResource?.paymentDays }} 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 f2855f77..f2da050b 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 @@ -48,7 +48,7 @@ {{ i?.externalBillCode }} {{ i?.resourceCode }} {{ i?.wayBillId }} - {{ i?.goodsResource?.dispatchName }} + {{ i?.goodsResource?.paymentDays }} From 4f220563a103cb6b8d69362d9c78f182cea61788 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:23:50 +0800 Subject: [PATCH 29/34] 'fixbug' --- .../vehicle-detail-change/vehicle-detail-change.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 bf1d876f..91ee9a8e 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 @@ -35,7 +35,7 @@ {{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} {{ i?.externalBillCode }} - {{ i?.resourceCode }} + {{ i?.goodsResource?.resourceCode }} {{ i?.wayBillId }} {{ i?.goodsResource?.paymentDays }} 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 f2da050b..f36d0693 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 @@ -46,7 +46,7 @@ {{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} {{ i?.externalBillCode }} - {{ i?.resourceCode }} + {{ i?.goodsResource?.resourceCode }} {{ i?.wayBillId }} {{ i?.goodsResource?.paymentDays }} From 68ab611223d8581097fcc6f0da470ceeea3600c4 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:28:37 +0800 Subject: [PATCH 30/34] 'fixbug' --- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 3 files changed, 3 insertions(+), 3 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 f36d0693..0132ecbd 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 @@ -140,7 +140,7 @@ {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}} - + {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}} 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 fe6f7d7f..b3aeafc6 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 @@ -162,7 +162,7 @@ {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} - + {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 673afcc1..6a5d17b4 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -138,7 +138,7 @@ {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}} - + {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}} From f298ead5bbd3d88bad7fd9956967ab858003a226 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:42:50 +0800 Subject: [PATCH 31/34] 'fixbug' --- .../bulk-detail-change.component.html | 3 +- .../bulk-detail-change.component.ts | 6 +- .../bulk-detail/bulk-detail.component.html | 3 +- .../bulk-detail/bulk-detail.component.ts | 6 +- .../vehicle-detail-change.component.html | 3 +- .../vehicle-detail-change.component.ts | 6 +- .../vehicle-detail.component.html | 3 +- .../vehicle-detail.component.ts | 6 +- .../bulk-detail/bulk-detail.component.html | 3 +- .../bulk-detail/bulk-detail.component.ts | 12 +-- .../vehicle-detail.component.html | 3 +- .../vehicle-detail.component.ts | 100 ++++++++---------- 12 files changed, 59 insertions(+), 95 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index b345a0b4..fc988391 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -281,7 +281,7 @@ 查看附件     - 补充协议 + 补充协议 @@ -360,6 +360,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 9d9756a2..540b5f26 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -908,11 +908,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { }); }; agreement(value: any) { - if (value === '1') { - this.imges = this.i?.supplementAgreement; - } else if (value === '2') { - this.imges = this.i?.supplementAgreement; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 1e8b09a2..277877f9 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -162,7 +162,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -248,6 +248,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 32ad9e11..330ddbb0 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -112,11 +112,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.router.navigate(['order-management/bulk-detailChange', this.id]); } agreement(value: any) { - if (value === '1') { - this.imges = this.i?.supplementAgreement; - } else if (value === '2') { - this.imges = this.i?.supplementAgreement; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { 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 91ee9a8e..b5c99884 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 @@ -256,7 +256,7 @@ 查看附件     - 补充协议 + 补充协议 @@ -333,6 +333,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index ad8c312e..98579deb 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -855,11 +855,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { }); }; agreement(value: any) { - if (value === '1') { - this.imges = this.i?.supplementAgreement; - } else if (value === '2') { - this.imges = this.i?.supplementAgreement; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { 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 0132ecbd..5505d9f2 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 @@ -168,7 +168,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -230,6 +230,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 d05ad48a..02f7ca45 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 @@ -124,11 +124,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.router.navigate(['order-management/vehicle-detailChange', this.id]); } agreement(value: any) { - if (value === '1') { - this.imges = this.i?.agreementFilePath; - } else if (value === '2') { - this.imges = this.i?.agreementFilePath; - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 5be7f348..5b80e49d 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -182,7 +182,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -248,6 +248,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index 65f66053..6b296b13 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -102,17 +102,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { window.history.go(-1); } agreement(value: any) { - console.log('123') - console.log(value) - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.loadingCertificate - } else if (value === '3') { - this.imges = this.i?.unLoadingCertificate - } else if (value === '4') { - this.imges = this.i?.receiptCertificate - } + this.imges = this.i?.agreementFilePath this.isVisible = true; } handleCancel() { diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 6a5d17b4..90e6e556 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -164,7 +164,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -228,6 +228,7 @@ +
暂无附件信息
 diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index 19af415f..bd34a6f3 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -24,12 +24,11 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic styleUrls: ['./vehicle-detail.component.less'] }) export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestroy { - id = this.route.snapshot.params.id; - MapList: any[]=[]; + MapList: any[] = []; trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 i: any; totalObj: any; attObj: any; @@ -50,7 +49,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro { title: '支付状态', className: 'text-center', - index: 'paymentStatusLabel', + index: 'paymentStatusLabel' } ]; @@ -60,19 +59,16 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro private route: ActivatedRoute, private msgSrv: NzMessageService, private service: WaybillManagementServe, - private modal: NzModalService, - ) { - - } + private modal: NzModalService + ) {} ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } - ngOnInit(): void { - this.initData() - this.getTrajectory() + this.initData(); + this.getTrajectory(); this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => { this.scrollTop = document.documentElement.scrollTop; }); @@ -80,48 +76,38 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro initData() { const params = { id: this.id - } - this.service.request(this.service.$api_get_getWholeDetail, params).subscribe((res) => { - console.log(res) - this.unLoadingPlaceVOList.push(...res.loadingPlace) - this.unLoadingPlaceVOList.push(...res.dischargePlace) - console.log(this.unLoadingPlaceVOList) + }; + this.service.request(this.service.$api_get_getWholeDetail, params).subscribe(res => { + console.log(res); + this.unLoadingPlaceVOList.push(...res.loadingPlace); + this.unLoadingPlaceVOList.push(...res.dischargePlace); + console.log(this.unLoadingPlaceVOList); this.i = res; this.billExpenses = this.i?.billExpenseDetailVOList?.filter( (data: any) => data.costCode === 'PRE' || data.costCode === 'RECE' || data.costCode === 'BACK' ); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); - }) + }); } goBack() { window.history.go(-1); } agreement(value: any) { - console.log('123') - console.log(value) - if(value === '1') { - this.imges = this.i?.supplementAgreement - } else if (value === '2') { - this.imges = this.i?.loadingCertificate - } else if (value === '3') { - this.imges = this.i?.unLoadingCertificate - } else if (value === '4') { - this.imges = this.i?.receiptCertificate - } + this.imges = this.i?.agreementFilePath; this.isVisible = true; } handleCancel() { - this.isVisible = false -} -handleOK() { - this.isVisible = false -} -goDistance(elf: NzCardComponent) { - if (elf) { - elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + this.isVisible = false; + } + handleOK() { + this.isVisible = false; + } + goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + } } -} // *确认发车 sureDepart(item: any) { @@ -136,9 +122,8 @@ goDistance(elf: NzCardComponent) { nzFooter: null }); modalRef.afterClose.subscribe((result: any) => { - this.initData() - - }); + this.initData(); + }); } // 确认到车 sureArrive(item: any) { @@ -153,17 +138,16 @@ goDistance(elf: NzCardComponent) { nzFooter: null }); modalRef.afterClose.subscribe((result: any) => { - this.initData() - - }); + this.initData(); + }); } // 获取车辆轨迹 - 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.hgt, @@ -172,7 +156,7 @@ goDistance(elf: NzCardComponent) { }); 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); }); @@ -181,12 +165,12 @@ goDistance(elf: NzCardComponent) { }); } - // 获取司机轨迹 - 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, @@ -195,7 +179,7 @@ goDistance(elf: NzCardComponent) { }); 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; @@ -203,14 +187,14 @@ goDistance(elf: NzCardComponent) { } } }); - } - 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'); } From 4ac1eeab2460a05cf902a1162fcbde24c1919741 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 15:57:00 +0800 Subject: [PATCH 32/34] 'fixbug' --- .../bulk-detail-change/bulk-detail-change.component.html | 2 +- .../components/bulk-detail/bulk-detail.component.html | 2 +- .../vehicle-detail-change/vehicle-detail-change.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- .../modal/vehicle/view-track/view-track.component.html | 2 +- .../components/bulk-detail/bulk-detail.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index fc988391..32112159 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -341,7 +341,7 @@
- +
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 277877f9..1a61499f 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -205,7 +205,7 @@
- +
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 b5c99884..77137160 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 @@ -315,7 +315,7 @@
- +
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 5505d9f2..8681f08d 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 @@ -211,7 +211,7 @@
- +
diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index 0f8c89b3..c7c4dbbd 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -12,7 +12,7 @@
- +
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 5b80e49d..bda12764 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -229,7 +229,7 @@
- +
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 90e6e556..c3aa6526 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -209,7 +209,7 @@
- +
From e259f53bc2a34ed62bacfe810a52074a5a9a66b2 Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 16:13:59 +0800 Subject: [PATCH 33/34] 'fixbug' --- .../order-management/components/bulk/bulk.component.ts | 5 ++++- .../components/vehicle/vehicle.component.ts | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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 e9287a4d..822a88b5 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -181,7 +181,10 @@ export class OrderManagementBulkComponent implements OnInit { _$expand: { type: 'boolean', ui: { hidden: true } }, billCode: { type: 'string', - title: '订单号' + title: '订单号', + ui: { + placeholder: '最多100个单号，空号隔开', + } }, resourceCode: { type: 'string', 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 8279073e..f4866cae 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -191,8 +191,10 @@ resourceStatus: any; _$expand: { type: 'boolean', ui: { hidden: true } }, billCode: { type: 'string', - title: '订单号' - + title: '订单号', + ui: { + placeholder: '最多100个单号，空号隔开', + } }, resourceCode: { type: 'string', From ace758617fd29baf5826fe50da26dfa1b86ae71e Mon Sep 17 00:00:00 2001 From: 1107302052 <1107302052@qq.com> Date: Fri, 18 Mar 2022 18:33:19 +0800 Subject: [PATCH 34/34] 'fixbug' --- .../components/bulk-detail/bulk-detail.component.ts | 2 +- .../components/vehicle-detail/vehicle-detail.component.ts | 2 +- .../components/bulk-detail/bulk-detail.component.ts | 2 +- .../components/vehicle-detail/vehicle-detail.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 330ddbb0..affa9e98 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -78,7 +78,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; - this.billExpenses = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TRA'); + this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); this.pois = [ { 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 02f7ca45..7e30c011 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 @@ -94,7 +94,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { title: res.endPoint.detailedAddress } ]; - this.billExpenses = this.i?.billExpenseDetailVOList?.filter( + 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'); diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index 6b296b13..2345b5b4 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -84,7 +84,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { this.unLoadingPlaceVOList.push(...res.dischargePlace) console.log(this.unLoadingPlaceVOList) this.i = res; - this.billExpenses = this.i?.billExpenseDetailVOList?.filter((data: any) => data.costCode === 'TRA'); + this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.costCode === 'TRA'); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); }) } diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index bd34a6f3..861a7995 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -83,7 +83,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro this.unLoadingPlaceVOList.push(...res.dischargePlace); console.log(this.unLoadingPlaceVOList); this.i = res; - this.billExpenses = this.i?.billExpenseDetailVOList?.filter( + this.billExpenses = this.i?.billExpenseDetails?.filter( (data: any) => data.costCode === 'PRE' || data.costCode === 'RECE' || data.costCode === 'BACK' ); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE');