Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

车辆对接

Browse Source
This commit is contained in:
wangshiming
2022-01-13 15:21:30 +08:00
parent a917c83275
commit 5bf20e71c1
6 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -403,71 +403,71 @@ tabs = {
{ {
title: '订单号', title: '订单号',
width: '180px', width: '180px',
className: 'text-center', className: 'text-left',
render: 'billCode' render: 'billCode'
}, },
{ {
title: '运费明细', title: '运费明细',
width: '250px', width: '250px',
className: 'text-center', className: 'text-left',
render: 'mybidDetailInfo', render: 'mybidDetailInfo',
}, },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-center' }, { title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-center' }, { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' }, { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-center' }, { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
{ {
title: '卸货地', title: '卸货地',
className: 'text-center', className: 'text-left',
width: '180px', width: '180px',
index: 'unloadingAddressArr' index: 'unloadingAddressArr'
}, },
{ {
title: '货物信息', title: '货物信息',
className: 'text-center', className: 'text-left',
width: '180px', width: '180px',
render: 'goodsName' render: 'goodsName'
}, { }, {
title: '运费单价', title: '运费单价',
className: 'text-center', className: 'text-left',
width: '180px', width: '180px',
index: 'freightPrice' index: 'freightPrice'
}, },
{ {
title: '接单数量', title: '接单数量',
className: 'text-center', className: 'text-left',
index: 'goodsNumber', index: 'goodsNumber',
width: '180px', width: '180px',
}, },
{ {
title: '结算重量', title: '结算重量',
className: 'text-center', className: 'text-left',
index: 'settlementWeight', index: 'settlementWeight',
width: '100px', width: '100px',
}, },
{ {
title: '承运司机', title: '承运司机',
className: 'text-center', className: 'text-left',
index: 'driverName', index: 'driverName',
width: '100px', width: '100px',
}, },
{ {
title: '收款人', title: '收款人',
className: 'text-center', className: 'text-left',
index: 'payeeName', index: 'payeeName',
width: '100px', width: '100px',
}, },
{ {
title: '装卸货时间', title: '装卸货时间',
width: '180px', width: '180px',
className: 'text-center', className: 'text-left',
render: 'loadingTime' render: 'loadingTime'
}, },
{ {
title: '创建时间', title: '创建时间',
width: '180px', width: '180px',
className: 'text-center', className: 'text-left',
index: 'createTime', index: 'createTime',
}, },
{ {

28
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -355,58 +355,58 @@ resourceStatus: any;
{ {
title: '订单号', title: '订单号',
width: '200px', width: '200px',
className: 'text-center', className: 'text-left',
render: 'billCode' render: 'billCode'
}, },
{ {
title: '我的出价', title: '我的出价',
width: '200px', width: '200px',
className: 'text-center', className: 'text-left',
render: 'mybidInfo' render: 'mybidInfo'
}, },
{ {
title: '运费明细', title: '运费明细',
width: '250px', width: '250px',
className: 'text-center', className: 'text-left',
render: 'mybidDetailInfo', render: 'mybidDetailInfo',
}, },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-center' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-center' }, { title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-center' }, { title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-center' }, { title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-center' }, { title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-left' },
{ {
title: '卸货地', title: '卸货地',
className: 'text-center', className: 'text-left',
width: '170px', width: '170px',
index: 'unloadingAddressArr' index: 'unloadingAddressArr'
}, },
{ {
title: '货物信息', title: '货物信息',
className: 'text-center', className: 'text-left',
width: '170px', width: '170px',
render: 'goodsName' render: 'goodsName'
}, { }, {
title: '承运司机', title: '承运司机',
className: 'text-center', className: 'text-left',
width: '120px', width: '120px',
render: 'driverName' render: 'driverName'
}, },
{ {
title: '收款人', title: '收款人',
className: 'text-center', className: 'text-left',
render: 'payeeName', render: 'payeeName',
width: '100px', width: '100px',
}, },
{ {
title: '装卸货时间', title: '装卸货时间',
width: '170px', width: '170px',
className: 'text-center', className: 'text-left',
render: 'loadingTime' render: 'loadingTime'
}, },
{ {
title: '创建时间', title: '创建时间',
className: 'text-center', className: 'text-left',
index: 'creationTime', index: 'creationTime',
width: '170px', width: '170px',
}, },

27
src/app/routes/supply-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 11:10:14 * @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-12 10:21:40 * @LastEditTime: 2022-01-13 15:16:07
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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\bulk.component.html * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk\bulk.component.html
@ -73,42 +73,37 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [loading]="service.http.loading"
> >
<!--运费单价 -->
<ng-template st-row="freightPrice" let-item let-index="index">
<div class="mr-xs" >{{item.freightPrice | currency}}
</div>
</ng-template>
<!--货源编号 -->
<ng-template st-row="resourceCode" let-item let-index="index"> <ng-template st-row="resourceCode" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.resourceCode}}</a> <a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.resourceCode}}</a>
</ng-template> </ng-template>
<!-- 服务类型 -->
<ng-template st-row="serviceType" let-item let-index="index"> <ng-template st-row="serviceType" let-item let-index="index">
<div *ngIf="item.serviceType === 1">抢单</div> <div *ngIf="item.serviceType === 1">抢单</div>
<div *ngIf="item.serviceType === 2">指派</div> <div *ngIf="item.serviceType === 2">指派</div>
</ng-template> </ng-template>
<!-- 关联订单 -->
<ng-template st-row="orderSn" let-item let-index="index"> <ng-template st-row="orderSn" let-item let-index="index">
<div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList"> <div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
<label>{{item.wayBillStatusLabel}}</label> <label>{{item.wayBillStatusLabel}}</label>
(<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>) (<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
</div> </div>
</ng-template> </ng-template>
<!-- 货物信息 -->
<ng-template st-row="goodsInfos" let-item let-index="index"> <ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div> <div>{{item?.goodsInfos?.goodsName}}</div>
<div>货源：{{item?.goodsInfos?.goodsResource}}</div> <div>货源：{{item?.goodsInfos?.goodsResource}}</div>
</ng-template> </ng-template>
<!-- 用车需求 -->
<ng-template st-row="useCarDemand" let-item let-index="index"> <ng-template st-row="useCarDemand" let-item let-index="index">
<div>车型: {{item.carModelLabel}}</div> <div>车型: {{item.carModelLabel}}</div>
<div class="error">车长: {{item.carLenghtLabel}} 米</div> <div class="error">车长: {{item.carLenghtLabel}} 米</div>
</ng-template> </ng-template>
<ng-template st-row="demand" let-item let-index="index">
<div>车型: {{item.progress}}</div>
<div class="error">车长: {{item.progress}} 米</div>
</ng-template>
<ng-template st-row="price" let-item let-index="index">
<div>{{item.progress}} 元/顿</div>
</ng-template>
<ng-template st-row="cMember" let-item let-index="index">
<div>{{item.owner}}</div>
<div>{{item.mobile}}</div>
</ng-template>
<ng-template st-row="dispatcher" let-item let-index="index">
<div>{{item.owner}}</div>
<div>{{item.mobile}}</div>
</ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>

33
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -194,46 +194,47 @@ export class SupplyManagementBulkComponent implements OnInit {
{ {
title: '货源编号', title: '货源编号',
width: '200px', width: '200px',
className: 'text-center', className: 'text-left',
render: 'resourceCode' render: 'resourceCode'
}, },
{ title: '服务类型', index: 'serviceTypeLabel', width: '150px', className: 'text-center' }, { title: '服务类型', index: 'serviceTypeLabel', width: '150px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-center' }, { title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
{ title: '项目名称', index: 'enterpriseProjectName', width: '200px', className: 'text-center' }, { title: '项目名称', index: 'enterpriseProjectName', width: '200px', className: 'text-left' },
{ title: '关联订单', render: 'orderSn', width: '200px', className: 'text-center' }, { title: '关联订单', render: 'orderSn', width: '200px', className: 'text-left' },
{ title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-center' }, { title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-left' },
{ {
title: '装货地', title: '装货地',
className: 'text-center', className: 'text-left',
index: 'loadingAddressArr', index: 'loadingAddressArr',
width: '200px', width: '200px',
}, { }, {
title: '卸货地', title: '卸货地',
className: 'text-center', className: 'text-left',
index: 'unloadingAddressArr', index: 'unloadingAddressArr',
width: '200px', width: '200px',
}, },
{ {
title: '用车需求', title: '用车需求',
className: 'text-center', className: 'text-left',
width: '200px', width: '200px',
render: 'useCarDemand' render: 'useCarDemand'
}, },
{ {
title: '运费单价', title: '运费单价',
className: 'text-center', className: 'text-right',
width: '150px', width: '150px',
index: 'freightPrice', index: 'freightPrice',
render: 'freightPrice'
}, },
{ {
title: '结算依据', title: '结算依据',
className: 'text-center', className: 'text-left',
width: '200px', width: '200px',
index: 'settlementBasis', index: 'settlementBasisLabel',
}, },
{ {
title: '货源状态', title: '货源状态',
className: 'text-center', className: 'text-left',
index: 'resourceStatus', index: 'resourceStatus',
type: 'badge', type: 'badge',
width: '120px', width: '120px',
@ -245,18 +246,18 @@ export class SupplyManagementBulkComponent implements OnInit {
{ {
title: '截止时间', title: '截止时间',
width: '170px', width: '170px',
className: 'text-center', className: 'text-left',
index: 'deadlineTime', index: 'deadlineTime',
}, },
{ {
title: '发布时间', title: '发布时间',
width: '170px', width: '170px',
className: 'text-center', className: 'text-left',
index: 'releaseTime', index: 'releaseTime',
}, },
{ {
title: '审核状态', title: '审核状态',
className: 'text-center', className: 'text-left',
index: 'auditStatus', index: 'auditStatus',
type: 'badge', type: 'badge',
width: '170px', width: '170px',

9
src/app/routes/supply-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-22 11:28:28 * @Date: 2021-12-22 11:28:28
* @LastEditTime: 2022-01-05 15:45:01 * @LastEditTime: 2022-01-13 15:02:42
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -57,8 +57,11 @@
<p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p> <p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p>
</ng-template> </ng-template>
<ng-template st-row="totalAmount" let-item let-index="index"> <ng-template st-row="totalAmount" let-item let-index="index">
<!-- [nzPopoverContent]="contentTemplate" --> <div class="mr-xs" >{{item.totalAmount | currency}}
<div class="mr-xs" nzPopoverTitle="Title" nz-popover>￥{{item.totalAmount}} </div>
</ng-template>
<ng-template st-row="surcharge" let-item let-index="index">
<div class="mr-xs" >{{item.surcharge | currency}}
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="useCarDemand" let-item let-index="index"> <ng-template st-row="useCarDemand" let-item let-index="index">

34
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -358,75 +358,75 @@ export class SupplyManagementVehicleComponent implements OnInit {
{ {
title: '货源编号', title: '货源编号',
width: '180px', width: '180px',
className: 'text-center', className: 'text-left',
render: 'resourceCode' render: 'resourceCode'
}, },
{ {
title: '货主', title: '货主',
index: 'shipperAppUserName', index: 'shipperAppUserName',
width: '180px', width: '180px',
className: 'text-center' }, className: 'text-left' },
{ {
title: '项目名称', title: '项目名称',
index: 'enterpriseProjectName', index: 'enterpriseProjectName',
width: '180px', width: '180px',
className: 'text-center' className: 'text-left'
}, },
{ {
title: '装货地', title: '装货地',
index: 'loadingAddressArr', index: 'loadingAddressArr',
width: '200px', width: '200px',
className: 'text-center' className: 'text-left'
}, },
{ {
title: '卸货地', title: '卸货地',
index: 'unloadingAddressArr', index: 'unloadingAddressArr',
width: '200px', width: '200px',
className: 'text-center' className: 'text-left'
}, },
{ {
title: '货物名称', title: '货物名称',
index: 'goodsName', index: 'goodsName',
width: '150px', width: '150px',
className: 'text-center' className: 'text-left'
}, },
{ {
title: '货物数量', title: '货物数量',
width: '200px', width: '200px',
index: 'goodsNumber', index: 'goodsNumber',
className: 'text-center', className: 'text-left',
format: item => item.goodsNumber.join('/') format: item => item.goodsNumber.join('/')
}, },
{ {
title: '用车需求', title: '用车需求',
className: 'text-center', className: 'text-left',
width: '120px', width: '180px',
render: 'useCarDemand' render: 'useCarDemand'
}, },
{ {
title: '总费用', title: '总费用',
className: 'text-center', className: 'text-right',
width: '120px', width: '120px',
index: 'totalAmount', index: 'totalAmount',
render: 'totalAmount' render: 'totalAmount'
}, },
{ {
title: '总运费', title: '总运费',
width: '120px', width: '150px',
className: 'text-center', className: 'text-right',
index: 'totalAmount', index: 'totalAmount',
render: 'totalAmount' render: 'totalAmount'
}, },
{ {
title: '附加费', title: '附加费',
className: 'text-center', className: 'text-right',
width: '120px', width: '120px',
index: 'surcharge', index: 'surcharge',
format: item => `￥${item.surcharge}` render: 'surcharge'
}, },
{ {
title: '货源状态', title: '货源状态',
className: 'text-center', className: 'text-left',
index: 'resourceStatus', index: 'resourceStatus',
type: 'badge', type: 'badge',
width: '120px', width: '120px',
@ -439,12 +439,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
title: '创建时间', title: '创建时间',
width: '170px', width: '170px',
index: 'createTime', index: 'createTime',
className: 'text-center', className: 'text-left',
type: 'date' type: 'date'
}, },
{ {
title: '审核状态', title: '审核状态',
className: 'text-center', className: 'text-left',
index: 'auditStatus', index: 'auditStatus',
type: 'badge', type: 'badge',
width: '170px', width: '170px',