From 1c627d57057a284d9ba5e5b46dadec27346c4b92 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 24 Dec 2021 14:00:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/risk/risk.component.html | 2 +- .../components/risk/risk.component.ts | 18 ++++++++++++++++-- .../vehicle-detail.component.html | 16 ++++++++-------- .../vehicle-detail/vehicle-detail.component.ts | 11 ++++++++--- .../services/order-management.service.ts | 2 ++ 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index e1ff9bdb..908128a6 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -1,7 +1,7 @@ @@ -97,27 +97,27 @@
- +

计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}

- +

计划卸货时间：{{i?.goodsResource?.[0]?.unloadingTime}}

@@ -141,7 +141,7 @@ {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}} - {{i?.driverId}} + {{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 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 7d7ef975..57d3e80e 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 @@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core'; /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-23 16:35:59 + * @LastEditTime: 2021-12-24 13:58:21 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts @@ -22,8 +22,12 @@ import { OrderManagementService } from '../../services/order-management.service' export class OrderManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; - @ViewChild('distannce3', { static: false }) - i: any= {unLoadingPlaceList:[]}; + i: any= { + unLoadingPlaceList:[], + billExpenseDetails: [], + goodsInfoList:[], + goodsResource: [] + }; imges: any; isVisible = false; logColumns: STColumn[] = [ @@ -68,6 +72,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { console.log(res) if (res) { this.i =res; + console.log(this.i?.unLoadingPlaceList) } }) } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index b1ff6ebc..82b44c4f 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -24,6 +24,8 @@ export class OrderManagementService extends BaseService { // 风险单： // 风险单列表查询 $api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`; + // 风险单列表查询 + $api_get_listStatisticalStatus = `/api/sdc/billRiskOperate/listStatisticalStatus`; // 风险单详情查询 $api_get_getRiskDetail = `/api/sdc/billRiskOperate/getRiskDetail`; // 风险单审核 From 5fb5097acfce9e698d3a34edbf1370941f481961 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 24 Dec 2021 14:34:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle-detail-change.component.html | 3 +- .../vehicle-detail-change.component.ts | 96 ++++++++----------- .../vehicle-detail.component.html | 4 +- 3 files changed, 43 insertions(+), 60 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 a86f31d0..5ad7a904 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 @@ -1,7 +1,7 @@ 0) { this.listImagUrls?.forEach((res :any) => { @@ -397,15 +386,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { } }) } - console.log(imgList) - - if(typeof(this.validateForm1.value.unloadingTime) !== 'string' ) { - var c = new Date(this.validateForm1.value.unloadingTime); - this.validateForm1.value.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) + if(typeof(this.unloadingTime) !== 'string' ){ + var c = new Date(this.unloadingTime); + this.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) } - if(typeof(this.validateForm1.value.loadingTime) !== 'string' ) { - var c = new Date(this.validateForm1.value.loadingTime); - this.validateForm1.value.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) + if(typeof(this.loadingTime) !== 'string' ) { + var c = new Date(this.loadingTime); + this.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) } console.log(this.sf3.value) console.log(this.sf4.value) @@ -413,36 +400,33 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { id: this.id, unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], goodsResource: [{ - id: '', - enterpriseInfoId: 'xxx', - + id: this.i?.goodsResource?.id, + enterpriseInfoId: this.sf3.value?.enterpriseInfoId, }], receiptFilePath: imgList, goodsInfoList: [{ - id: '', - goodsName: 'xxx', - weight: '', - volume: '', - number: '', + id: this.i?.goodsInfoList?.[0].id, + goodsName: this.sf3.value?.goodsName, + ...this.sf4.value }], // 运费信息 - expenseList: this.i?.i?.billExpenseDetails, + expenseList: this.i?.billExpenseDetails, // 收款人 - payeeId: '', - 银行卡: '', + payeeId: this.dirverPhone, + dirverBankCard: this.dirverBankCard, // 银行卡 // 发车时间 - loadPlanTime: '', + loadPlanTime: this.loadingTime, // 到车时间 - unloadPlanTime: '', - loadingLadingBillFilePath: '', - loadingPeopleVehiclesGoodsFilePath: '', - unloadingLadingBillFilePath: '', - unloadingPeopleVehiclesGoodsFilePath: '', + unloadPlanTime: this.loadingTime, + loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath.data.fullFilePath, + loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath, + unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath, + unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath, } console.log(params) - // this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => { - // console.log(res) - // }) + this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => { + console.log(res) + }) } addPreZero(num: any){ if(num<10){ 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 8d28419f..f5d0249f 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 @@ -1,7 +1,7 @@ @@ -133,10 +133,10 @@ -