From 94e76d3eac24317275ed8ae75681a5b3feb56fba Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 27 Dec 2021 15:15:31 +0800 Subject: [PATCH] =?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 --- .../bulk-detail-change.component.html | 18 +++++++++-------- .../bulk-detail-change.component.ts | 20 ++++++++++++------- .../bulk-detail/bulk-detail.component.html | 4 ++-- .../vehicle-detail-change.component.html | 11 ++++++++-- .../onecar-publish.component.ts | 7 ++----- .../vehicle-detail.component.html | 4 ++-- 6 files changed, 38 insertions(+), 26 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 43dd586c..adc90205 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 @@ -1,7 +1,7 @@
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
收款人： @@ -268,6 +262,14 @@
+ --> + +

{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）

+ + + +
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
+
收款人：
 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 fe50066b..66a34516 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 @@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core'; /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-24 17:55:35 + * @LastEditTime: 2021-12-27 14:38:15 * @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 @@ -300,8 +300,13 @@ loadTime: any; // 货源单设置回显 uid: index }) }); + this.sf4data this.listImagUrls = arr; - this.sf4data = res?.goodsInfoList?.[0] + // this.sf4data = res?.goodsInfoList?.[0] + this.sf4data = { + ...res, + ...res?.goodsInfoList?.[0] + } // 对装卸货信息进行初始化 res?.unLoadingPlaceList.forEach((element: any) => { if(element.type === 1 || element.type === '1') { @@ -423,9 +428,6 @@ loadTime: any; // 货源单设置回显 var c = new Date(this.loadTime); this.loadTime = 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('dirvingMessage=>>>>>>'+ this.dirvingMessage) - console.log( this.dirvingMessage) - console.log( this.st._data) const params = { id: this.id, unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,], @@ -440,9 +442,13 @@ loadTime: any; // 货源单设置回显 payeeId: this.dirverPhone, dirverBankCard: this.dirverBankCard, // 银行卡 // 发车时间 - loadTime: this.loadTime, + loadTime: this.loadTime, // 到车时间 unloadTime: this.unloadTime, + acceptWeight: this.sf4.value?.acceptWeight, + acceptVolume: this.sf4.value?.acceptVolume, + settlementWeight: this.sf4.value?.settlementWeight, + settlementVolume: this.sf4.value?.settlementVolume, loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url, loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, @@ -456,7 +462,7 @@ loadTime: any; // 货源单设置回显 console.log(res) if(res) { this.service.msgSrv.success('修改成功！'); - this.router.navigate(['/order-management/vehicle']); + this.router.navigate(['/order-management/bulk']); } else { this.service.msgSrv.error(res?.msg); } 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 7a4c5ac2..a2cffcab 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 @@ -1,7 +1,7 @@ + + + + +
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
+
收款人：
 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 36d0d00d..93a9437f 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 @@ -398,12 +398,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { receiptType: { type: 'string', title: '回单类型', - enum: [ - { label: '电子回单', value: 1 }, - { label: '纸质回单', value: 2 } - ], ui: { - widget: 'select', + widget: 'dict-select', + params: { dictKey: 'receipt:type' }, placeholder: '请选择', errors: { required: '请选择' }, visibleIf: { 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 e3eebd6d..6a13a421 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 @@ -11,7 +11,7 @@

货源编码 : {{ i?.resourceCode }}

-
网络货运人：{{i?.carrierInformationVO?.enterpriseInfoName}}
+
网络货运人：{{i?.enterpriseInfoName}}