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 7806bb1b..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,14 +147,14 @@ export class AdvanceCollectionComponent implements OnInit { buttons: [ { text: '浏览', - click: item => this.router.navigate(['/financial-management/advance-collection/detail/' + item.id]) - }, - { - text: '核销' - }, - { - text: '退款' + click: item => this.router.navigate([`/financial-management/advance-collection/detail/${item.id}`]) } + // { + // text: '核销' + // }, + // { + // text: '退款' + // } ] } ]; 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: { 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}`]) } ] } 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 dedfa680..4a204913 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 @@ -284,7 +284,7 @@ 查看附件     - 补充协议 + 补充协议 @@ -344,7 +344,7 @@
- +
@@ -363,6 +363,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 3cd3eacc..fce3e71c 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 c97d1c30..f1fc2836 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 }}
@@ -94,8 +94,8 @@ {{ i?.unloadPlanTime }} --> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 - {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 + {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方

查看附件      - 补充协议 + 补充协议 @@ -208,11 +208,11 @@
- +
- +
@@ -251,6 +251,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 8e3d91c1..cffb6933 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; @@ -79,6 +80,20 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.i = res; 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 = [ + { + 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 => { @@ -97,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/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 @@

-
+
@@ -259,7 +259,7 @@ 查看附件     - 补充协议 + 补充协议 @@ -318,7 +318,7 @@
- +
@@ -336,6 +336,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 658824ae..3f77e312 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 aa95f16a..5f2cc64f 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,9 +46,9 @@ {{ 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?.dispatchName }} + {{ i?.goodsResource?.paymentDays }}
@@ -140,7 +140,7 @@ {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}} - + {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}} @@ -171,7 +171,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -214,12 +214,12 @@
- +
- -
+ +
@@ -233,6 +233,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 bdf357a9..db20b7d4 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/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 2a43997c..792b0d3b 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 }} + 待申请 + 已支付 + 已拒绝 + 申请中 + 退款中 + 退款成功 +
+
@@ -201,6 +214,7 @@
- + ({{ item?.count }}) 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..57f100ae 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() { @@ -190,10 +193,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit { type: 'string', title: '调度员手机号', maxLength: 30, - ui: { + ui: { placeholder: '请输入' } - }, + } }, required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', 'deadlineTime'] }; @@ -201,7 +204,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { '*': { spanLabelFixed: 115, grid: { span: 12 } - }, + } }; } initSF3() { @@ -272,7 +275,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } } }, - required: ['goodsTypeId', 'goodsName', 'goodsNameId','goodsName1'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId', 'goodsName1'] }; this.ui3 = { '*': { @@ -301,7 +304,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }, default: '1' }, - rule: { type: 'string', title: '', @@ -532,6 +534,14 @@ export class SupplyManagementBulkPublishComponent implements OnInit { 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) { return this.service @@ -706,7 +716,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { unLoadingPlaceDTOList: LoadingList, goodsInfoDTOList: goodsInfoDTOList, estimatedKilometers: this.totalDistance, - estimatedTravelTime: this.totalTime, + estimatedTravelTime: this.totalTime }; params.freightPrice = this.totalFees; const modalRef = this.modalService.create({ @@ -714,7 +724,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { nzContent: TranAgreementComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { object: params, shipperName: this.shipperName , type:'bulk'} + nzComponentParams: { object: params, shipperName: this.shipperName, type: 'bulk' } }); modalRef.afterClose.subscribe(result => { if (result) { @@ -1001,13 +1011,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { if (this.PageStatus === '大宗修改') { this.sf4data.id = res?.goodsInfoVOList[0]?.id; } - // 计算里程，时间 - if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } this.totalFees = res?.freightPrice || '0'; this.sf7data = { stateReceipt: res?.stateReceipt, @@ -1080,13 +1090,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { element.type = '2'; }); - // 计算里程，时间 - if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); - } + // 计算里程，时间 + if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } getLimitvalue() { const getlimitvaluesParms = [ diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index c77af698..db754dcf 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -134,20 +134,12 @@ - + - + diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index b4fbcb67..78ce97a5 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -39,6 +39,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { creatTime: any; // 货源单设置回显 modifyTime: any; // 货源单设置回显 totalFees: any; // 总数信息 + ruleOptions: any; id = ''; type = 'add'; limitValues = { @@ -89,6 +90,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.initSF4(); this.initSF6(); this.getLimitvalue(); + this.initDict(); this.startInfo = [ { detailedAddress: '', @@ -538,6 +540,14 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } }; } + initDict() { + this.service.getDictByKey('freight:type').subscribe(res => { + this.freightTypeOptions = res; + }); + this.service.getDictByKey('goodresource:rounding:rules').subscribe(res => { + this.ruleOptions = res; + }); + } //指派熟车 chooseFamifiar(item: any) { const modalRef = this.modalService.create({ 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..716541ae 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) => { @@ -323,7 +323,7 @@ export class SupplyManagementBulkComponent implements OnInit { title: '操作', fixed: 'right', width: '110px', - className: 'text-center', + className: 'text-center block-td', buttons: [ { text: '货源审核', @@ -332,7 +332,7 @@ export class SupplyManagementBulkComponent implements OnInit { acl: { ability: ['SUPPLY-INDEX-bulkBatchAudit'] }, }, { - text: '二维码　', + text: '二维码', click: (_record) => this.assignedQrcode(_record), iif: item => item.resourceStatus == 1, }, 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); 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/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index aac4fc47..6236d83a 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); } } @@ -595,7 +596,7 @@ export class SupplyManagementVehicleComponent implements OnInit { title: '操作', fixed: 'right', width: '110px', - className: 'text-center', + className: 'text-center block-td', buttons: [ { text: '货源审核', @@ -626,7 +627,7 @@ export class SupplyManagementVehicleComponent implements OnInit { acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] } }, { - text: '重新指派　', + text: '重新指派', click: _record => this.assignedCar(_record), iif: item => item.resourceStatus === '1' && item.serviceType === '2', acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] } 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) { 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); + } } 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]="{}" >
客户 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 c2480bd3..e9f144f7 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); + } + }); } /** @@ -296,6 +300,14 @@ export class InvoiceRequestedComponent implements OnInit { otherremarks: { type: 'string', title: '其他需求', +<<<<<<< HEAD +======= + enum: [ + { label: '全部', value: '' }, + { label: '是', value: true }, + { label: '否', value: false } + ], +>>>>>>> ace758617fd29baf5826fe50da26dfa1b86ae71e ui: { visibleIf: { expand: (value: boolean) => value @@ -427,7 +439,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 e11a18af..acde105a 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/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 5a32ae81..3367a989 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -377,12 +377,11 @@ export class FreightComponentsListComponent implements OnInit { { title: '操作', width: '110px', - className: 'text-center', + className: 'text-center block-td', fixed: 'right', buttons: [ - { type: 'divider' }, { - text: '查看　　
', + text: '查看', acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, click: item => { this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); 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..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 @@ -19,8 +19,8 @@
- - + +
@@ -29,10 +29,10 @@ {{ i?.shippername }} {{i?.enterpriseProject}} {{i?.serviceTypeLabel}} - {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} + {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} {{ i?.resourceCode }} - {{ i?.wayBillCode }} + {{ i?.wayBill?.wayBillCode }} {{ i?.paymentDays }}
@@ -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 }}方
@@ -182,7 +182,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -224,13 +224,12 @@ -
- +
@@ -249,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 a3117b3e..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 @@ -72,7 +72,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { ngOnInit(): void { this.initData() - this.getDriverTrajectory() + this.getTrajectory() } initData() { const params = { @@ -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"); }) } @@ -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/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 422c36b5..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,9 +86,9 @@
{{item?.settlementBasisLabel}}
 -
+

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

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: '承运司机', 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..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 @@ -29,10 +29,10 @@ {{ i?.shippername }} {{i?.enterpriseProject}} {{i?.serviceTypeLabel}} - {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} + {{i?.dispatchName}} /{{i?.dispatchPhone}} {{ i?.externalBillCode }} {{ i?.resourceCode }} - {{ i?.wayBillCode }} + {{ i?.wayBill?.wayBillCode }} {{ i?.paymentDays }}
@@ -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)+'元':'-'}} @@ -164,7 +164,7 @@ 查看附件      - 补充协议 + 补充协议 @@ -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 }} @@ -212,7 +209,7 @@
- +
@@ -231,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..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 @@ -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( + 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'); - }) + }); } 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'); } 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 5457c9b8..bb6339c8 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@