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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2021-12-20 10:53:15 +08:00
parent 19fa0ddbd5 70407631f1
commit f18f512aac
21 changed files with 254 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts
View File

@ -12,7 +12,7 @@ import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-additionalc-detail',
templateUrl: './additionalc-detail.component.html',
@ -30,7 +30,7 @@ export class OrderManagementAdditionalcDetailComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
private service: OrderManagementService,
private modalService: NzModalService
) {

4
src/app/routes/order-management/components/additionalc/additionalc.component.ts
View File

@ -4,7 +4,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISc
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
@ -74,7 +74,7 @@ export class OrderManagementAdditionalcComponent implements OnInit {
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
constructor(public service: OrderManagementService, private modal: NzModalService) { }
/**
* 查询参数

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

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-06 20:34:08
* @LastEditTime: 2021-12-20 09:36:26
* @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
@ -12,7 +12,7 @@ import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-bulk-detail',
templateUrl: './bulk-detail.component.html',
@ -30,7 +30,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
private service: OrderManagementService,
private modalService: NzModalService
) {

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

@ -4,7 +4,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidget
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
import { SureDepartComponent } from '../../modal/bulk/sure-depart/sure-depart.component';
@ -82,7 +82,7 @@ export class OrderManagementBulkComponent implements OnInit {
count: 0,
},
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
constructor(public service: OrderManagementService, private modal: NzModalService) { }
/**
* 查询参数

4
src/app/routes/order-management/components/car-manage/car-manage.component.ts
View File

@ -4,7 +4,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISc
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
@ -64,7 +64,7 @@ export class OrderManagementCarManageComponent implements OnInit {
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
constructor(public service: OrderManagementService, private modal: NzModalService) { }
/**
* 查询参数

4
src/app/routes/order-management/components/complaint/complaint.component.ts
View File

@ -4,7 +4,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISc
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
@ -60,7 +60,7 @@ export class OrderManagementComplaintComponent implements OnInit {
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
constructor(public service: OrderManagementService, private modal: NzModalService) { }
/**
* 查询参数

4
src/app/routes/order-management/components/driver-manage/driver-manage.component.ts
View File

@ -4,7 +4,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISc
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
@ -64,7 +64,7 @@ export class OrderManagementDriverManageComponent implements OnInit {
count: 0,
}
];
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
constructor(public service: OrderManagementService, private modal: NzModalService) { }
/**
* 查询参数

4
src/app/routes/order-management/components/risk-detail/risk-detail.component.ts
View File

@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
// import { RiskOrderService } from '../../services/risk-order.service';
// import { CtcAppealComponent } from '../appeal/appeal.component';
@ -26,7 +26,7 @@ export class OrderManagementRiskDetailComponent implements OnInit {
i: any;
datailList: any;
id: string = '';
constructor(private modal: NzModalService, public service: SupplyManagementService, public ar: ActivatedRoute) {
constructor(private modal: NzModalService, public service: OrderManagementService, public ar: ActivatedRoute) {
this.id = this.ar.snapshot.params.id;
}

2
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-16 17:22:31
* @LastEditTime: 2021-12-20 09:29:11
* @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

4
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -7,7 +7,7 @@ import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-risk',
@ -36,7 +36,7 @@ export class OrderManagementRiskComponent implements OnInit {
stayQuantity: 0
};
constructor(
public service: SupplyManagementService,
public service: OrderManagementService,
public service2: ShipperBaseService,
private modal: NzModalService,
public router: Router

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

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-06 20:34:43
* @LastEditTime: 2021-12-20 09:35:33
* @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
@ -12,7 +12,7 @@ import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
selector: 'app-supply-management-vehicle-detail',
templateUrl: './vehicle-detail.component.html',
@ -30,7 +30,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
private service: OrderManagementService,
private modalService: NzModalService
) {

30
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-14 10:21:33
* @LastEditTime: 2021-12-20 09:56:30
* @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
@ -47,7 +47,7 @@
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_bulkPage_list"
[data]="service.$api_get_getWholeBillDetail"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@ -55,9 +55,26 @@
[loadingDelay]="500"
[loading]="service.http.loading"
>
<ng-template st-row="goodsId" let-item let-index="index">
<a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.id}}</a>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
<div>
<span *ngIf="item?.wayBillStatus == 1">待接单</span>
<span *ngIf="item?.wayBillStatus == 2">待发车</span>
<span *ngIf="item?.wayBillStatus == 3">运输中</span>
<span *ngIf="item?.wayBillStatus == 4">待签收</span>
<span *ngIf="item?.wayBillStatus == 5">已完成</span>
<span *ngIf="item?.wayBillStatus == 6">已取消</span>
</div>
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
<span >{{i?.costName}}：{{i?.price}}</span>
</div>
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
<div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
</ng-template>
<!-- <ng-template st-row="externalSn" let-item let-index="index">
<span class="mr-xs">{{111111}}</span>
<a (click)="editEnternalSn(item)">编辑</a>
@ -92,13 +109,14 @@
multiSort
size="small"
[bordered]="true"
[data]="datass"
[data]="service.$api_get_getWholeBillDetail"
[columns]="columnsFloat"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loadingDelay]="500"
>
</st>
</ng-container>
<ng-template #nzModalFooter>

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

@ -10,7 +10,7 @@ import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receip
import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component';
import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component';
import { SupplyManagementService } from '../../services/order-management.service';
import { OrderManagementService } from '../../services/order-management.service';
@Component({
@ -80,7 +80,7 @@ export class OrderManagementVehicleComponent implements OnInit {
count: 0,
},
];
constructor(public service: SupplyManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
constructor(public service: OrderManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
/**
* 查询参数
@ -117,9 +117,9 @@ export class OrderManagementVehicleComponent implements OnInit {
type: 'string',
title: '货源编号'
},
externalResourceCode: {
shipperAppUserId: {
type: 'string',
title: '外部订单号'
title: '货主'
},
loadingPlace: {
type: 'string',
@ -139,15 +139,6 @@ export class OrderManagementVehicleComponent implements OnInit {
}
}
},
// driverName: {
// type: 'string',
// title: '承运司机',
// ui: {
// visibleIf: {
// _$expand: (value: boolean) => value,
// },
// }
// },
driverId: {
title: '承运司机',
type: 'string',
@ -171,60 +162,67 @@ export class OrderManagementVehicleComponent implements OnInit {
}
} as SFSelectWidgetSchema
},
no9: {
type: 'string',
carNo: {
title: '车牌号',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
no10: {
type: 'string',
title: '收款人',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
wayBillType: {
title: '运单类型',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'goodresourceType' },
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
shipperId: {
title: '托运人',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'BulkFreightUnitPriceType' },
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
enterpriseInfoName: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
allowClear: true,
asyncData: () => this.service2.getNetworkFreightForwarder()
}
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
payeeId: {
title: '车队长',
type: 'string',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
paymentstatus: {
title: '支付状态',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'payment:status' },
containAllLable:true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
createTime: {
title: '创建时间',
@ -237,7 +235,63 @@ export class OrderManagementVehicleComponent implements OnInit {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
},
isRiskSheet: {
type: 'string',
title: '是否风险单',
default: '0',
enum: [
{ label: '全部', value: '0' },
{ label: '是', value: '1' },
{ label: '否', value: '2' }
],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
},
},
enterpriseInfoName: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.service2.getNetworkFreightForwarder(),
},
},
goodsName: {
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
},
},
serviceType: {
title: '服务类型',
type: 'string',
default: '',
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containAllLable:true,
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
},
},
type: 'object'
};
@ -260,17 +314,18 @@ export class OrderManagementVehicleComponent implements OnInit {
title: '运费明细',
width: '100px',
className: 'text-center',
index: 'externalSn',
render: 'billExpenseDetailVOList',
},
{ title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' },
{ title: '货主', index: 'externalSn', width: '120px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoId', width: '120px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserId', width: '120px', className: 'text-center' },
{ title: '关联运单号', index: 'linkUrl', width: '120px', className: 'text-center' },
{ title: '货源编号', index: 'linkUrl', width: '120px', className: 'text-center' },
{ title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
{ title: '装货地', index: 'loadingPlace', width: '120px', className: 'text-center' },
{
title: '卸货地',
className: 'text-center',
width: '120px',
index: 'dischargePlace'
},
{
title: '货物信息',
@ -280,33 +335,24 @@ export class OrderManagementVehicleComponent implements OnInit {
title: '承运司机',
className: 'text-center',
width: '120px',
},
{
title: '承运司机',
className: 'text-center',
width: '120px',
index: 'driverId'
},
{
title: '收款人',
className: 'text-center',
index: 'enStatusStr2',
type: 'badge',
index: 'payeeId',
width: '100px',
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
},
},
{
title: '装卸货时间',
width: '170px',
className: 'text-center',
render: 'loadingTime'
},
{
title: '创建时间',
className: 'text-center',
index: 'enStatusStr3',
index: 'createTime',
},
{
title: '操作',

10
src/app/routes/order-management/services/order-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-16 16:54:25
* @LastEditTime: 2021-12-20 10:00:25
* @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\services\order-management.service.ts
@ -12,7 +12,7 @@ import { BaseService } from 'src/app/shared/services';
@Injectable({
providedIn: 'root'
})
export class SupplyManagementService extends BaseService {
export class OrderManagementService extends BaseService {
$api_get_catalogue_member = `/user?_allow_anonymous=true`;
$api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
@ -28,6 +28,12 @@ export class SupplyManagementService extends BaseService {
$api_get_getRiskDetail = `/api/sdc/billRiskOperate/getRiskDetail`;
// 风险单审核
$api_get_listRisk_audit = `/api/sdc/billRiskOperate/audit`;
// 查询整车订单列表
$api_get_listWholePage = `/api/sdc/billOperate/listWholePage`;
// 整车详情
$api_get_getWholeBillDetail = `/api/sdc/billOperate/getWholeBillDetail`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
constructor(public injector: Injector) {
super(injector)
}

8
src/app/routes/supply-management/components/onecar-publish/address-list/address-list.component.ts
View File

@ -1,8 +1,8 @@
/*
* @Author: your name
* @Date: 2021-12-14 20:08:17
* @LastEditTime: 2021-12-14 20:08:55
* @LastEditors: your name
* @LastEditTime: 2021-12-20 09:35:13
* @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\onecar-publish\address-list\address-list.component.ts
*/
@ -12,7 +12,7 @@ import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st
import { processSingleSort } from '@shared';
import { NzDrawerService } from 'ng-zorro-antd/drawer';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SupplyManagementService } from 'src/app/routes/order-management/services/order-management.service';
import { OrderManagementService } from 'src/app/routes/order-management/services/order-management.service';
@Component({
@ -32,7 +32,7 @@ export class PublishAddressListComponent implements OnInit {
public router: Router,
public ar: ActivatedRoute,
private drawerService: NzDrawerService,
public service: SupplyManagementService,
public service: OrderManagementService,
private modalService: NzModalService
) {}

4
src/app/routes/waybill-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-17 16:41:28
* @LastEditTime: 2021-12-18 16:20: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\supply-management\components\vehicle\vehicle.component.html
@ -41,7 +41,7 @@
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成'"></nz-tab>
<nz-tab [nzTitle]="'已取消'"></nz-tab>
</nz-tabset>

29
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -50,7 +50,7 @@ export class WaybillManagementBulkComponent implements OnInit {
},
];
tabs = {
totalQuantity: 0,
signQuantity: 0,
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0
@ -76,6 +76,7 @@ tabs = {
ngOnInit(): void {
this.initSF();
this.initST();
this.getGoodsSourceStatistical()
this.initSTFloat();
this.initSTFloatView();
this.initSFView();
@ -90,7 +91,7 @@ tabs = {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
no: {
wayBillCode: {
type: 'string',
title: '运单号',
},
@ -577,4 +578,28 @@ tabs = {
console.log(item)
this.isVisibleEvaluate = true
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_getBulkStatistics).subscribe(res => {
if (res) {
res.forEach((ele: any) => {
switch(ele.wayBillStatus) {
case '1':
this.tabs.stayQuantity = ele?.count;
break;
case '2':
this.tabs.receivedQuantity = ele?.count;
break;
case '3':
this.tabs.cancelQuantity = ele?.count;
break;
case '4':
this.tabs.signQuantity = ele?.count;
break;
}
});
}
})
}
}

10
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-17 14:56:09
* @LastEditTime: 2021-12-20 10:12:37
* @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
@ -96,11 +96,9 @@
<h3>运费信息</h3>
<div class="text-right">
<p><label class="freigth-label">收款人:</label><span>{{i?.payee?.name}} /{{i?.payee?.phone}} / {{i?.payee?.phone}}</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 *ngFor="let item of i?.billExpenseDetailVOList">
<p><label class="freigth-label">{{item?.costName}}:</label><span>{{ item?.price| currency: '￥' }}</span></p>
</div>
</div>
</div>
<nz-divider></nz-divider>

4
src/app/routes/waybill-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-17 14:16:57
* @LastEditTime: 2021-12-18 16:17:40
* @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
@ -42,7 +42,7 @@
<nz-tab [nzTitle]="'待接单('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成'"></nz-tab>
<nz-tab [nzTitle]="'已取消'"></nz-tab>
</nz-tabset>

29
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -46,7 +46,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
},
];
tabs = {
totalQuantity: 0,
signQuantity: 0,
cancelQuantity: 0,
receivedQuantity: 0,
stayQuantity: 0
@ -72,6 +72,7 @@ tabs = {
ngOnInit(): void {
this.initSF();
this.initST();
this.getGoodsSourceStatistical()
this.initSTFloat();
this.initSTFloatView();
}
@ -85,7 +86,7 @@ tabs = {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
no: {
wayBillCodeno: {
type: 'string',
title: '运单号',
},
@ -486,4 +487,28 @@ tabs = {
console.log(item)
this.isVisibleEvaluate = true
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => {
if (res) {
res.forEach((ele: any) => {
switch(ele.wayBillStatus) {
case '1':
this.tabs.stayQuantity = ele?.count;
break;
case '2':
this.tabs.receivedQuantity = ele?.count;
break;
case '3':
this.tabs.cancelQuantity = ele?.count;
break;
case '4':
this.tabs.signQuantity = ele?.count;
break;
}
});
}
})
}
}

7
src/app/routes/waybill-management/services/waybill-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:52:29
* @LastEditTime: 2021-12-17 16:10:46
* @LastEditTime: 2021-12-18 16:06:43
* @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\waybill-management\services\waybill-management.service.ts
@ -28,6 +28,11 @@ export class SupplyManagementService extends BaseService {
// 查询大宗运单详情-运营后台
$api_get_getBulkDetail = `/api/sdc/wayBillOperate/getBulkDetail`;
// 整车运单分类统计
$api_get_getWholeStatistics = `/api/sdc/wayBillOperate/getWholeStatistics`;
// 大宗运单分类统计
$api_get_getBulkStatistics = `/api/sdc/wayBillOperate/getBulkStatistics`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
constructor(public injector: Injector) {