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 bff5f784..a00ea6f9 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 @@ -6,17 +6,20 @@ -
-
+
- {{ i?.no }} - 待接单 + {{ dataList?.resourceCode }} + + 待接单 + 已接单 + 已取消 + @@ -24,78 +27,96 @@
- +
-
- {{ i?.owner }} - 32943898021309809423 - 3321944288191034921 - 18112345678 - 曲丽丽 18100000000 - 曲丽丽 18100000000 +
+ {{ dataList?.enterpriseProjectId }} + {{ dataList?.externalResourceCode }} + {{ dataList?.enterpriseProjectId }} + {{ dataList?.dispatchName }}
-

装卸货信息

-

装货地:广东省深圳市龙岗区怡亚通大厦

-

联系人:奥利给/13680058545

-

卸货地:广东省深圳市福田区岗厦村9巷8号405(新村)

-

联系人:花花世界/13680058545

+
+

装卸货信息

+
+

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

+

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

+

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

+
+
+

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

+

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

+

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

+
+
-
+
-

货物信息

-

货物名称:广东省深圳市龙岗区怡亚通大厦

-

运费单价:奥利给/13680058545

-

重量/体积:广东省深圳市福田区岗厦村9巷8号405(新村)

-

剩余:花花世界/13680058545

-

车型/车长:花花世界/13680058545

+
+

货物信息

+

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

+

货物数量:{{item?.weight}}吨/{{item?.volume}}立方

+

剩余:{{item?.weight}}吨/{{item?.volume}}立方

+

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

+
-
+
-

关联运单

-

待发车({{ i?.id }})

-

运输中({{ i?.id }})

-

待签收({{ i?.id }})

-

已完成({{ i?.id }})

-

已取消 ({{ i?.id }})

+

承运信息

+

网络货运人:{{dataList?.carrierInformationVO?.enterpriseInfoName}}

+

服务类型:{{dataList?.carrierInformationVO?.serviceType === 1 ? '抢单' : '指派'}}

+

当前指派

+
+
+
+
+

关联运单

+

待发车 ({{dataList?.goodsInfoList?.goodsName}})

+

运输中 ({{dataList?.goodsInfoList?.goodsName}})

+

待签收 ({{dataList?.goodsInfoList?.goodsName}})

+

已完成 ({{dataList?.goodsInfoList?.goodsName}})

+

已取消 ({{dataList?.goodsInfoList?.goodsName}})

-

补充信息

-

结算重量:广东省深圳市龙岗区怡亚通大厦

-

备注:奥利给/13680058545

+

补充信息

+

备注:{{dataList?.supplementaryInformationVO?.remarks}}

- - - - +
+

运费信息

+
+

预付:{{dataList?.expenseList?.prePay | currency: '¥' }}

+

油卡:{{dataList?.expenseList?.oilCardPay | currency: '¥'}}

+

到付:{{dataList?.expenseList?.toPay | currency: '¥'}}

+

回单付:{{dataList?.expenseList?.receiptPay | currency: '¥'}}

+

保险费:{{dataList?.expenseList?.insuranceFee | currency: '¥'}}

+

附加费保险费:{{dataList?.expenseList?.appendFee | currency: '¥'}}

+
+
+ +
+
+

{{dataList?.expenseList?.totalFee | currency: '¥' }}

+
+ +
+
- - -

指派熟车 - 已选择 - 10 - 位司机 - -

-
- - - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index 93655fac..e029e3e9 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -1,13 +1,13 @@ /* * @Author: your name * @Date: 2021-12-03 11:10:14 - * @LastEditTime: 2021-12-07 19:51:21 - * @LastEditors: your name + * @LastEditTime: 2021-12-08 16:20:45 + * @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\supply-management\components\bulk-detail\bulk-detail.component.ts */ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { STColumn } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; @@ -48,22 +48,30 @@ export class SupplyManagementBulkDetailComponent implements OnInit { ], }, ]; + dataList: any; constructor( private route: ActivatedRoute, private msgSrv: NzMessageService, private service: SupplyManagementService, - private modal: NzModalService + private modal: NzModalService, + private router: Router,private ar: ActivatedRoute ) { } ngOnInit(): void { - this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => { - console.log(res); - this.i = res - }); + this.getDetailList(); + } + // 获取录单员 + getDetailList() { + const params = { + id: this.id + }; + this.service.request(`${this.service.$api_get_getBulkDetail}`, params).subscribe((res) => { + console.log(res) + this.dataList = res + }) } - /** * 移除司机 */ @@ -103,4 +111,16 @@ export class SupplyManagementBulkDetailComponent implements OnInit { goBack() { window.history.go(-1); } + // 修改货源 + modification() { + this.router.navigate(['/supply-management/vehicle-amend', this.id], { + relativeTo: this.ar + }) + } + // 再下一单 + nextOrder() { + this.router.navigate(['/supply-management/vehicle-amend', this.id], { + relativeTo: this.ar + }) + } } 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 270a45cd..22fe68ed 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@