车辆对接

This commit is contained in:
wangshiming
2021-12-24 15:36:49 +08:00
parent f45dfc4732
commit 78f4659a73
3 changed files with 25 additions and 30 deletions

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: 2021-12-24 13:26:16 * @LastEditTime: 2021-12-24 15:36:09
* @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
@ -42,7 +42,7 @@
[nzTabBarExtraContent]="extraTemplate"> [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部'"></nz-tab> <nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待申诉('+tabs?.stayQuantity+')'"></nz-tab> <nz-tab [nzTitle]="'待申诉('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'申诉中('+tabs?.stayQuantity+')'"></nz-tab> <nz-tab [nzTitle]="'申诉中('+tabs?.underwayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'申诉成功('+tabs?.receivedQuantity+')'"></nz-tab> <nz-tab [nzTitle]="'申诉成功('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'申诉失败('+tabs?.cancelQuantity+')'"></nz-tab> <nz-tab [nzTitle]="'申诉失败('+tabs?.cancelQuantity+')'"></nz-tab>
</nz-tabset> </nz-tabset>

View File

@ -29,7 +29,7 @@ export class OrderManagementRiskComponent implements OnInit {
@ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
tabs = { tabs = {
totalQuantity: 0, underwayQuantity: 0,
cancelQuantity: 0, cancelQuantity: 0,
receivedQuantity: 0, receivedQuantity: 0,
stayQuantity: 0 stayQuantity: 0
@ -66,12 +66,14 @@ export class OrderManagementRiskComponent implements OnInit {
this.service.request(this.service.$api_get_listStatisticalStatus, {}).subscribe(res => { this.service.request(this.service.$api_get_listStatisticalStatus, {}).subscribe(res => {
if (res) { if (res) {
res.forEach((element: any) => { res.forEach((element: any) => {
if(element.statusLabel === '待发车') { if(element.representationsStatusLabel === '待申述') {
this.tabs.stayQuantity = element.quantity this.tabs.stayQuantity = element.quantity
} else if (element.statusLabel === '待接单') { } else if (element.representationsStatusLabel === '申诉失败') {
this.tabs.receivedQuantity = element.quantity this.tabs.receivedQuantity = element.quantity
} else if (element.statusLabel === '待签收') { } else if (element.representationsStatusLabel === '申述成功') {
this.tabs.cancelQuantity = element.quantity this.tabs.cancelQuantity = element.quantity
} else if (element.representationsStatusLabel === '申诉中') {
this.tabs.underwayQuantity = element.quantity
} }
}); });
} }

View File

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 14:59:33 * @LastEditTime: 2021-12-24 15:35:18
* @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\order-management\components\vehicle-detail\vehicle-detail.component.ts * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
@ -424,19 +424,15 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
console.log(this.sf.value) console.log(this.sf.value)
const params = { const params = {
id: this.id, id: this.id,
unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
goodsResource: [{
id: this.i?.goodsResource?.id,
enterpriseInfoId: this.sf3.value?.enterpriseInfoId,
}],
receiptFilePath: imgList, receiptFilePath: imgList,
goodsInfoList: [{ goodsInfoDTOList: [{
id: this.i?.goodsInfoList?.[0].id, id: this.i?.goodsInfoList?.[0].id,
goodsName: this.sf3.value?.goodsName, goodsName: this.sf3.value?.goodsName,
...this.sf4.value ...this.sf4.value
}], }],
// 运费信息 // 运费信息
expenseList: this.i?.billExpenseDetails, billExpenseDetailDTOList: this.i?.billExpenseDetails,
// 收款人 // 收款人
payeeId: this.dirverPhone, payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡 dirverBankCard: this.dirverBankCard, // 银行卡
@ -572,18 +568,18 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
initSF3() { initSF3() {
this.schema3 = { this.schema3 = {
properties: { properties: {
enterpriseInfoId: { // enterpriseInfoId: {
title: '网络货运人', // title: '网络货运人',
type: 'string', // type: 'string',
ui: { // ui: {
placeholder: '请选择', // placeholder: '请选择',
widget: 'select', // widget: 'select',
asyncData: () => this.service2.getNetworkFreightForwarder(), // asyncData: () => this.service2.getNetworkFreightForwarder(),
visibleIf: { // visibleIf: {
_$expand: (value: boolean) => value, // _$expand: (value: boolean) => value,
}, // },
} // }
}, // },
goodsName: { goodsName: {
type: 'string', type: 'string',
title: '货物名称', title: '货物名称',
@ -603,16 +599,13 @@ initSF3() {
} }
} }
}, },
required: ['goodsName', 'enterpriseInfoId'] required: ['goodsName',]
}; };
this.ui3 = { this.ui3 = {
'*': { '*': {
spanLabelFixed: 110, spanLabelFixed: 110,
grid: { span: 12 } grid: { span: 12 }
}, },
$enterpriseInfoId: {
grid: { span: 16, }
},
$goodsName: { $goodsName: {
grid: { span: 12 } grid: { span: 12 }
}, },