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 94a1319d..d71990b9 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 @@ -1,7 +1,7 @@ - + - - -
-
- - {{ i?.no }} - {{i?.wayBillStatusLabel}} - - - - + +
+ +

运单号: {{ i?.wayBillCode }}

-
- - - - -
-
- -
- {{ i?.enterpriseProject }} - {{ i?.dispatch?.name }}/{{i?.dispatch?.phone}} - 到货后{{ i?.paymentDays }}天内支付运费 - {{ i?.serviceTypeLabel }} -
- -
-
-
-

装卸货信息

-
-

装货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

发货日期：{{item?.createTime}}

-
-
-

卸货地：{{item?.detailedAddress}}

-

联系人：{{item?.appUserName}}/{{item?.contractTelephone}}

-

卸货日期：{{item?.modifyTime}}

-
-
-
-
-
-

货物信息

-
-

货物名称：{{item?.goodsName}}

-

重量/体积：{{item?.weight}}吨/{{item?.volume}}立方

-

用车需求：{{item?.vehicleDemand}}

-
-
-
-
-
-

托运信息

-

公司名称：{{i?.enterpriseInfoName}}

-

联系人：{{ i?.dispatch?.name }}/{{i?.dispatch?.phone}}

-
-
-
-
-

承运信息

-

司机：{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}

-

车牌号：{{i?.carVO?.carNo}}

-

车型/车长/承重：{{i?.carVO?.carModel}} | {{i?.carVO?.carLength}} | {{i?.carVO?.carLoad}}

-
-
-
-

补充信息

-

协议附件

-

装车附件

-

卸货附件

-

回单附件

-
-
- -
-
-

运费信息

-
-

{{i?.payee?.name}} /{{i?.payee?.phone}} / {{i?.payee?.phone}}

-
-

{{ item?.price| currency: '￥' }}

-
+
+
+ +
-
-
-

{{i?.freight | currency: '￥' }}

-

{{i?.wayBillStatusLabel}}

-
- +
+
+ {{ i?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{i?.enterpriseProject}} + {{i?.serviceTypeLabel}} + {{i?.dispatch?.name}} /{{i?.dispatch?.phone}} +
+ + + + + + + + + + + + +
+ + + +
+
+   +   +   +  
- -
-
-
-
平台支付
- -
- -
-

{{ item?.price| currency: '￥' }}

+ + + + + + {{i?.goodsInfos?.[0]?.goodsName}} + + + + + {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 + + + {{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}} + + + {{i?.driver?.name}}/{{i?.driver?.phone}} + + + {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 + + + {{i?.loadPlanTime}} + + + {{i?.unloadPlanTime}} + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 + + +
+

装货卸货信息 + ( + + + ) + +

+
+
+
+
+
+
装
+
+

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
-
-
-
货主支付
-
-

{{ item?.price| currency: '￥' }}

+
+
+
+
+
卸
+
+

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
- +
+ + + + +
+ 总计：{{ i?.freight | currency: '￥' }} +
+
收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}
+ + + + + + + 查看附件      + 补充协议 + + + + + + + + + + + + + + + + + {{i?.goodsResource?.stateReceipt ?'是':'否'}} + + + {{i?.goodsResource?.receiptTypeLabel}} + + + {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} + + + {{i?.goodsResource?.receiptAddress}} + + + {{i?.goodsResource?.receiptAddress}} + + + + + + + + {{i?.goodsResource?.remarks}} + + + + +
- +
- - +
@@ -149,6 +208,7 @@
+ @@ -157,4 +217,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less index 3cd8c1be..b8327013 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less @@ -33,4 +33,38 @@ .leftPadding { padding-right: 100px; } + .handling-info { + min-height: 100px; + border: 1px solid #ccc; + + .loading-row { + display: flex; + } + + .handling-info-icon { + width: 32px; + height: 32px; + margin-right: 24px; + color: #fff; + line-height: 32px; + text-align: center; + border-radius: 50%; + + &.loading-bg { + background-color: #50D4AB; + } + + &.unloaing-bg { + background: #F66F6A; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } } \ No newline at end of file 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 feb59366..b73d7a9f 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 @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-27 15:38:04 + * @LastEditTime: 2021-12-28 17:10:12 * @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 @@ -10,6 +10,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; +import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; import { WaybillManagementServe } from '../../services/waybill-management.service'; @@ -21,13 +22,29 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic export class WaybillManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; - isVisible = false; i: any; - imges: any; + totalObj: any; + attObj: any; + isVisible = false; logColumns: STColumn[] = [ - { title: '时间', index: 'operationUserPhone' }, - { title: '地点', index: ' createTime' }, + { title: '款项', index: 'costName' }, + { title: '运输费（元）', index: 'price' }, + { title: '支付时间', index: ' paymentTime' }, + { + title: '支付状态', + className: 'text-center', + index: 'paymentStatus', + type: 'badge', + width: '120px', + badge: { + '1': { text: '待申请', color: 'warning' }, + '2': { text: '已支付', color: 'success' }, + '3': { text: '已拒绝', color: 'warning' }, + '4': { text: '申请中', color: 'warning' }, + }, + }, ]; + imges: any; unLoadingPlaceVOList: any = []; constructor( @@ -41,6 +58,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.initData() + } initData() { const params = { @@ -48,12 +66,12 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { } this.service.request(this.service.$api_get_getWholeDetail, params).subscribe((res) => { console.log(res) - if(res) { - this.unLoadingPlaceVOList.push(...res.loadingPlace) - this.unLoadingPlaceVOList.push(...res?.dischargePlace) - console.log(this.unLoadingPlaceVOList) - this.i = res; - } + this.unLoadingPlaceVOList.push(...res.loadingPlace) + this.unLoadingPlaceVOList.push(...res.dischargePlace) + console.log(this.unLoadingPlaceVOList) + this.i = res; + this.attObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]; + this.totalObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; }) } @@ -69,24 +87,29 @@ export class WaybillManagementVehicleDetailComponent implements OnInit { goBack() { window.history.go(-1); } -handleCancel() { + 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.isVisible = true; + } + handleCancel() { this.isVisible = false } handleOK() { this.isVisible = false } -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 +goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); } - this.isVisible = true; } }