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 14b57ab4..2b5273fd 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,140 +1,177 @@ - + - - - -
-
- - {{ i?.no }} - 待接单555 - - - - + +
+

订单号: {{ i?.billCode }}

-
- - - +
+
+ + + + +
+
+
+
+
+ {{ i?.goodsResource[0]?.shipperAppUserName }} + {{i?.goodsResource[0]?.enterpriseProjectName}} + {{i?.goodsResource[0]?.serviceTypeLabel}} + {{i?.goodsResource[0]?.dispatchName}} 18100000000 + {{i?.goodsResource[0]?.dispatchName}} +
+
+
状态
+
{{i?.billStatusLabel}}
+
+
+ +
+ + + +
+
+ + + +
- -
- {{ i?.owner }} - 32943898021309809423 - 3321944288191034921 - 18112345678 -
- -
-
-
-

装卸货信息

-

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

-

联系人：奥利给/13680058545

-

卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）

-

联系人：花花世界/13680058545

-

发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）

-

卸货日期：花花世界/13680058545

-
-
-
-
-

货物信息

-

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

-

重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）

-

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

-
-
-
-
-

托运信息

-

公司名称：广东省深圳市龙岗区怡亚通大厦

-

联系人：广东省深圳市福田区岗厦村9巷8号405（新村）

-
-
-
-
-

承运信息

-

司机：广东省深圳市龙岗区怡亚通大厦

-

车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）

-

车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}

-
-
-
-

补充信息

-

协议附件

-

装车附件

-

卸货附件

-

回单附件

-
-
- -
-
-

运费信息

-
-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency }}

-

{{400 | currency}}

-

{{400 | currency }}

-
-
- -
-
-

{{400 | currency }}

-

未支付

-
+ -
-
- -
-
-
-
平台支付
- 司机运输费666 - 1000.00 - 未支付 + +
+
+
+
+
+
+
+

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

+

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

+
+
+
+

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

+
-
-
-
-
货主支付
- 司机运输费22 - 1000.00 - 未支付 -
-
- 附加费 - 1000.00 - 未支付 +
+
+
+
+
+

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

+

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

+
+
+
+

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

+
- - + + + + + {{i?.goodsResource[0]?.enterpriseInfoName}} + + + {{i?.goodsInfoList[0]?.goodsName}} + + + + + {{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件 + + + {{i?.goodsInfoList[0]?.maxWeightLabel}}/{{i?.goodsInfoList[0]?.maxCube}} + + + {{i?.driverId}} + + + {{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件 + + + + + + + + + + + + +
总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）
+
收款人：
+ + + + + + {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} + + + + + + + + + + + + + + + + + {{i?.goodsResource?.stateReceipt ?'是':'否'}} + + + {{i?.goodsResource?.receiptTypeLabel}} + + + {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} + + + {{i?.goodsResource?.receiptAddress}} + + + {{i?.goodsResource?.receiptAddress}} + + + {{i?.goodsResource?.receiptAddress}} + + + + + {{i?.goodsResource?.remarks}} + + + + +
@@ -148,6 +185,4 @@
- - - + \ No newline at end of file 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 c8d0459b..9c73906e 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 @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-20 09:36:26 + * @LastEditTime: 2021-12-22 09:49:57 * @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 @@ -20,11 +20,29 @@ import { OrderManagementService } from '../../services/order-management.service' }) export class OrderManagementBulkeDetailComponent implements OnInit { + id = this.route.snapshot.params.id; i: any; logColumns: STColumn[] = [ - { title: '时间', index: 'operationUserPhone' }, - { title: '地点', index: ' createTime' }, + { title: '款项', index: 'costName' }, + { title: '总费用（元）', index: 'price' }, + { title: '协议金额（元）', index: 'price' }, + { title: '附加费（元）', index: 'surcharge' }, + { title: '附加费率（%）', index: 'paymentMethodRate' }, + { 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' }, + }, + }, ]; constructor( @@ -37,13 +55,18 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } ngOnInit(): void { - this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => { - console.log(res); - this.i = res - }); + console.log(this.id) + this.initData() } - + initData() { + this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => { + console.log(res) + if (res) { + this.i =res; + } + }) + } hand() { this.modalService.create({ @@ -56,5 +79,4 @@ export class OrderManagementBulkeDetailComponent implements OnInit { goBack() { window.history.go(-1); } - } 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 30c587fa..2b5273fd 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 @@