车辆对接
This commit is contained in:
wangshiming
@ -599,14 +599,25 @@ tabs = {
|
||||
*变更运费
|
||||
*/
|
||||
updateFreight(item: any) {
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '变更运费',
|
||||
nzWidth: '50%',
|
||||
nzContent: UpdateFreightComponent,
|
||||
nzComponentParams: {
|
||||
i: item
|
||||
},
|
||||
nzFooter: null
|
||||
this.service.request(this.service.$api_getFreightChangeBulkDetail, { id: item.id }).subscribe(data => {
|
||||
if (data) {
|
||||
const modal = this.modal.create({
|
||||
nzTitle: '变更运费',
|
||||
nzWidth: 580,
|
||||
nzContent: UpdateFreightComponent,
|
||||
nzComponentParams: { data },
|
||||
nzOnOk: sin => {
|
||||
this.service.request(this.service.$api_insertFreightChangeBulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
|
||||
if (res) {
|
||||
this.service.msgSrv.success('变更运费成功');
|
||||
modal.destroy();
|
||||
this.st.reload();
|
||||
}
|
||||
});
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -1,138 +1,165 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-07 15:09:44
|
||||
* @LastEditTime: 2021-12-21 14:20: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.html
|
||||
-->
|
||||
<page-header-wrapper [title]="''" [logo]="logo">
|
||||
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
</button>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card>
|
||||
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="4">
|
||||
<sv-container class="bdr">
|
||||
<sv label="订单号" col="1">{{ i?.no }}</sv>
|
||||
<sv-title class="text-center text-lg">待接单</sv-title>
|
||||
<sv-title>
|
||||
<div class="">
|
||||
<a class="btn-size" (click)="hand()">指派车队长</a>
|
||||
<!-- <a class="btn-size m-lg mr-lg">取消货源</a>
|
||||
<a class="btn-size">再下一单</a> -->
|
||||
</div>
|
||||
</sv-title>
|
||||
</sv-container>
|
||||
<ng-template #headerContent>
|
||||
<div class="mb-xs" nz-row>
|
||||
<h4 class="ml-md">订单号: {{ i?.billCode }}</h4>
|
||||
</div>
|
||||
<div nz-col nzSpan="16" class="approval-status">
|
||||
<nz-steps style="width: 80%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
|
||||
<nz-step nzStatus="finish" nzIcon="user" [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
|
||||
<nz-step nzStatus="finish" nzIcon="solution" nzTitle="完结"></nz-step>
|
||||
<div nz-row style="display: flex; justify-content: end;">
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button >取消货源</button>
|
||||
<button nz-button
|
||||
>重新指派</button>
|
||||
<button nz-button >修改货源</button>
|
||||
<button nz-button nzType="primary" nzGhost >再下一单</button>
|
||||
</div>
|
||||
</div>
|
||||
<div sv-container>
|
||||
<sv label="货主">{{ i?.goodsInfoList[0].shipperAppUserName }} </sv>
|
||||
<sv label="所属项目">{{i?.enterpriseProjectId}}</sv>
|
||||
<sv label="服务类型">{{i?.createUserId}}</sv>
|
||||
<sv label="录单员">{{i?.dispatchName}} 18100000000 </sv>
|
||||
<sv label="调度员">{{i?.serviceTypeLabel}} </sv>
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card nzTitle="货源进度">
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
<nz-steps [nzLabelPlacement]="'vertical'">
|
||||
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
|
||||
[nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
|
||||
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
|
||||
[nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
|
||||
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
|
||||
</nz-steps>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container *ngIf="i">
|
||||
<sv label="项目名称">{{ i?.owner }}</sv>
|
||||
<sv label="调度员">32943898021309809423</sv>
|
||||
<sv label="承诺付款时间">3321944288191034921</sv>
|
||||
<sv label="服务类型">18112345678</sv>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="6">
|
||||
<div class="source-info">
|
||||
<h3>装卸货信息</h3>
|
||||
<p>装货地：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
<p>联系人：奥利给/13680058545</p>
|
||||
<p>卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>联系人：花花世界/13680058545</p>
|
||||
<p>发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>卸货日期：花花世界/13680058545</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col nzSpan="5">
|
||||
<div class="source-info bdr bdl pl-md">
|
||||
<h3>货物信息</h3>
|
||||
<p>货物名称：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
<p>重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>车型/车长：花花世界/13680058545</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col nzSpan="5">
|
||||
<div class="source-info bdr bdl pl-md">
|
||||
<h3>托运信息</h3>
|
||||
<p>公司名称：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
<p>联系人：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col nzSpan="5">
|
||||
<div class="source-info bdr pl-md">
|
||||
<h3>承运信息</h3>
|
||||
<p>司机：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
<p>车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="source-info pl-md">
|
||||
<h3>补充信息</h3>
|
||||
<p style="color: #1890ff;">协议附件</p>
|
||||
<p style="color: #1890ff;"> 装车附件</p>
|
||||
<p style="color: #1890ff;">卸货附件</p>
|
||||
<p style="color: #1890ff;">回单附件</p>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div nz-row>
|
||||
<div class="freight-info-box">
|
||||
<h3>运费信息</h3>
|
||||
<div class="text-right">
|
||||
<p><label class="freigth-label">收款人:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">预付:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">油卡:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">到付:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">回单付:</label><span>{{400 | currency}}</span></p>
|
||||
<p><label class="freigth-label">附加费:</label><span>{{400 | currency }}</span></p>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div class="freight-info-box" nz-row>
|
||||
<div nz-col nzSpan="24">
|
||||
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{400 | currency }}</span></h3>
|
||||
<h3 class="text-right">未支付</h3>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div style="display: flex; justify-content: space-evenly;">
|
||||
<div>
|
||||
<div>
|
||||
<span class="leftPadding">司机运输费</span>
|
||||
<span class="leftPadding">1000.00</span>
|
||||
<span class="leftPadding">未支付</span>
|
||||
<nz-card nzTitle="装卸货信息(一装一卸)">
|
||||
<div class="mt-md">
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
|
||||
<div *ngIf="item.type === '1'" class="loading-row">
|
||||
<div class="handling-info-icon loading-bg">装</div>
|
||||
<div class="info">
|
||||
<h4>装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</h4>
|
||||
<p>联系人：{{item.appUserName}}/{{item.contractTelephone}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="time-info">装货时间：{{i?.loadingTime}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
<span class="leftPadding">司机运输费</span>
|
||||
<span class="leftPadding">1000.00</span>
|
||||
<span class="leftPadding">未支付</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="leftPadding">附加费</span>
|
||||
<span class="leftPadding">1000.00</span>
|
||||
<span class="leftPadding">未支付</span>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
|
||||
<div *ngIf="item.type === '2'" class="loading-row">
|
||||
<div class="handling-info-icon unloaing-bg">卸</div>
|
||||
<div class="info">
|
||||
<h4>卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</h4>
|
||||
<p>联系人：{{item.appUserName}}/{{item.contractTelephone}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<p class="time-info">卸货时间：{{i?.unloadingTime}}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
|
||||
</nz-card>
|
||||
<nz-card nzTitle="基本信息">
|
||||
<sv-container col="1">
|
||||
<sv label="网络货运人">
|
||||
{{i?.goodsName}}
|
||||
</sv>
|
||||
<sv label="货物名称">
|
||||
{{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2">
|
||||
<sv label="货物数量">
|
||||
{{i?.goodsName}}
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
|
||||
</sv>
|
||||
<sv label="承运司机">
|
||||
{{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
|
||||
</sv>
|
||||
<sv label="车型车长载重">
|
||||
{{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
|
||||
</sv>
|
||||
</sv-container>
|
||||
|
||||
|
||||
</nz-card>
|
||||
<nz-card nzTitle="保险待定">
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="运费信息">
|
||||
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
|
||||
</st>
|
||||
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
|
||||
<div>收款人：</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="附件信息">
|
||||
<sv-container>
|
||||
<sv label="协议附件">
|
||||
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="2" class="mt-md">
|
||||
<sv label="装货凭证">
|
||||
{{i?.supplementaryInformationVO?.remarks}}
|
||||
</sv>
|
||||
<sv label="卸货凭证">
|
||||
{{i?.supplementaryInformationVO?.remarks}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="补充信息">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
|
||||
</sv>
|
||||
<sv label="回单类型">
|
||||
{{i?.supplementaryInformationVO?.receiptTypeLabel}}
|
||||
</sv>
|
||||
<sv label="联系人">
|
||||
{{i?.supplementaryInformationVO?.receiptUserName}} / {{i?.supplementaryInformationVO?.phon}}
|
||||
</sv>
|
||||
<sv label="所在地区">
|
||||
{{i?.supplementaryInformationVO?.area}}
|
||||
</sv>
|
||||
<sv label="详细地址">
|
||||
{{i?.supplementaryInformationVO?.address}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
<sv-container col="1" class="mt-md">
|
||||
<sv label="备注">
|
||||
{{i?.supplementaryInformationVO?.remarks}}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
|
||||
<nz-card>
|
||||
<div nz-row>
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%;" >
|
||||
<div nz-row >
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-20 09:35:33
|
||||
* @LastEditTime: 2021-12-21 11:22:23
|
||||
* @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
|
||||
@ -37,13 +37,18 @@ export class OrderManagementVehicleDetailComponent 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_get_getWholeBillDetail, {id: this.id}).subscribe(res => {
|
||||
console.log(res)
|
||||
if (res) {
|
||||
this.i =res;
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
hand() {
|
||||
this.modalService.create({
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-21 10:36:16
|
||||
* @LastEditTime: 2021-12-21 13:48:55
|
||||
* @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\vehicle\vehicle.component.html
|
||||
@ -60,7 +60,7 @@
|
||||
|
||||
>
|
||||
<ng-template st-row="billCode" let-item let-index="index">
|
||||
<a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
|
||||
<a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
|
||||
<div>
|
||||
<span>{{item?.billStatusLabel}}</span>
|
||||
</div>
|
||||
|
||||
@ -6,6 +6,7 @@ import { ShipperBaseService } from '@shared';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { of } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
|
||||
import { OneCarOrderCancelComponent } from '../../modal/vehicle/cancel/cancel.component';
|
||||
import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component';
|
||||
import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure-arrive.component';
|
||||
@ -558,14 +559,17 @@ resourceStatus: any;
|
||||
*变更运费
|
||||
*/
|
||||
updateFreight(item: any) {
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '变更运费',
|
||||
nzWidth: '50%',
|
||||
nzContent: VehicleUpdateFreightComponent,
|
||||
nzComponentParams: {
|
||||
record: item
|
||||
},
|
||||
nzFooter: null
|
||||
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
|
||||
if (data) {
|
||||
const modal = this.modal.create({
|
||||
nzTitle: '变更运费',
|
||||
nzWidth: 580,
|
||||
nzContent: VehicleUpdateFreightComponent,
|
||||
nzComponentParams: { data: { ...data, id: item.id } },
|
||||
nzFooter: null
|
||||
});
|
||||
modal.afterClose.subscribe(_ => this.st.reload());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user