车辆接口更新

This commit is contained in:
wangshiming
2022-01-21 10:57:11 +08:00
parent c05a8eb2ba
commit 2bc832186a
13 changed files with 415 additions and 109 deletions

View File

@ -4,8 +4,8 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-19 14:39:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* @LastEditTime : 2022-01-21 10:47:36
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
@ -43,19 +43,15 @@
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
<nz-tab [nzTitle]="'接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'审核('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已审核('+tabs?.stayQuantity+')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_listBulkPage"
[data]="service.$api_get_billExamine_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"

View File

@ -116,18 +116,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
if (res) {
let totalCount = 0;
res.forEach((element: any) => {
if (element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity;
} else if (element.billStatusLabel === '待接单') {
if (element.billStatusLabel === '待审核') {
this.tabs.receivedQuantity = element.quantity;
} else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity;
} else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity;
} else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity;
} else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity;
} else if (element.billStatusLabel === '已审核') {
this.tabs.stayQuantity = element.quantity;
}
totalCount += element.quantity;
});
@ -259,35 +251,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
}
} as SFSelectWidgetSchema
},
createTime: {
title: '创建时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
riskStatus: {
type: 'string',
title: '是否风险单',
enum: [
{ label: '全部', value: '' },
{ label: '是', value: '3' },
{ label: '否', value: '1' }
],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
@ -315,7 +278,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
} as SFSelectWidgetSchema
},
settlementBasis: {
title: '结算依据',
title: '装卸凭证',
type: 'string',
ui: {
widget: 'dict-select',
@ -391,7 +354,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
{ title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
{
@ -406,24 +368,6 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
width: '250px',
render: 'goodsName'
},
{
title: '运费单价',
className: 'text-right',
width: '180px',
render: 'freightPrice'
},
{
title: '接单数量',
className: 'text-right',
index: 'goodsNumber',
width: '180px'
},
{
title: '结算重量',
className: 'text-right',
index: 'settlementWeight',
width: '150px'
},
{
title: '承运司机',
className: 'text-left',
@ -445,7 +389,13 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
render: 'loadingTime'
},
{
title: '创建时间',
title: '装货凭证',
width: '180px',
className: 'text-left',
index: 'createTime'
},
{
title: '卸货凭证',
width: '180px',
className: 'text-left',
index: 'createTime'
@ -457,37 +407,21 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
className: 'text-left',
buttons: [
{
text: '查看评价 ',
text: '通过',
click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5'
},
{
text: '运费变更记录',
text: '生成电子单据',
click: _record => this.OpenPrice(_record),
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6'
},
{
text: '变更运费 ',
text: '修改',
click: _record => this.updateFreight(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
},
{
text: '确认签收 ',
click: _record => this.confirmReceipt(_record),
iif: item => item.billStatus == '4'
},
{
text: '取消订单 ',
click: _record => this.cancellation(_record),
iif: item =>
item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
},
{
text: '修改订单 ',
click: _record => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3'
}
]
}
];