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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-27 14:08:42 +08:00
parent ce13bc115e
commit a1cf5944c1
20 changed files with 590 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 17:49:33
* @LastEditTime: 2021-12-27 13:28: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\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -25,6 +25,7 @@
<div>
<div style="display: flex; justify-content: space-between;">
<div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>

12
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 17:39:12
* @LastEditTime: 2021-12-27 13:37:18
* @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
@ -27,6 +27,7 @@
<div>
<div style="display: flex; justify-content: space-between;">
<div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
@ -95,7 +96,7 @@
<nz-card nzTitle="装卸货信息(一装一卸)" id="distannce1" >
<div class="mt-md">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<div nz-col [nzSpan]="8">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '1'" class="loading-row">
@ -107,7 +108,12 @@
</div>
</div>
</div>
<div nz-col [nzSpan]="12">
<div nz-col [nzSpan]="8" style="display: flex; justify-content: center; align-items: center;">
<div >
<span style="padding: 24 px; font-size: 30px;"><img style="width: 48px;" src="../../../../../assets/images/usercenter/彩色-箭头-向右-1.png" alt=""></span>
</div>
</div>
<div nz-col [nzSpan]="8">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '2'" class="loading-row">

4
src/app/routes/order-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-24 17:32:00
* @LastEditTime: 2021-12-27 13:25:20
* @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
@ -78,7 +78,7 @@
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price }}
<span *ngIf="data.paymentStatus" style="color: #f59a63">{{ data.paymentStatus }}</span>
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>

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

@ -632,17 +632,9 @@ tabs = {
nzWidth: 580,
nzContent: UpdateFreightComponent,
nzComponentParams: { data: { ...data, billId: item.id } },
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;
}
});
modal.afterClose.subscribe(_ => this.st.reload());
}
});
}

3
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 16:42:46
* @LastEditTime: 2021-12-27 11:45:44
* @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
@ -25,6 +25,7 @@
<div>
<div style="display: flex; justify-content: space-between;">
<div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.[0]?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>

30
src/app/routes/order-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-24 15:13:40
* @LastEditTime: 2021-12-27 13:56:18
* @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
@ -27,11 +27,12 @@
<div>
<div style="display: flex; justify-content: space-between;">
<div sv-container>
<sv label="货主">{{ i?.goodsResource?.[0]?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.[0]?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.[0]?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource?.[0]?.dispatchName}} 18100000000 </sv>
<sv label="调度员">{{i?.goodsResource?.[0]?.dispatchName}} </sv>
<sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource?.dispatchName}} 18100000000 </sv>
<sv label="调度员">{{i?.goodsResource?.dispatchName}} </sv>
</div>
<div>
<div>状态</div>
@ -95,7 +96,7 @@
<nz-card nzTitle="装卸货信息(一装一卸)" id="distannce1" >
<div class="mt-md">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<div nz-col [nzSpan]="8">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '1'" class="loading-row">
@ -105,10 +106,15 @@
</div>
</div>
</div>
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}</p>
<p class="time-info">计划装货时间：{{i?.goodsResource?.loadingTime}}</p>
</div>
</div>
<div nz-col [nzSpan]="12">
<div nz-col [nzSpan]="8" style="display: flex; justify-content: center; align-items: center;">
<div >
<span style="padding: 24 px; font-size: 30px;"><img style="width: 48px;" src="../../../../../assets/images/usercenter/彩色-箭头-向右-1.png" alt=""></span>
</div>
</div>
<div nz-col [nzSpan]="8">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
<div *ngIf="item?.type === '2'" class="loading-row">
@ -118,7 +124,7 @@
</div>
</div>
</div>
<p class="time-info">计划卸货时间：{{i?.goodsResource?.[0]?.unloadingTime}}</p>
<p class="time-info">计划卸货时间：{{i?.goodsResource?.unloadingTime}}</p>
</div>
</div>
</div>
@ -127,7 +133,7 @@
<nz-card nzTitle="基本信息" id="distannce2">
<sv-container col="1">
<sv label="网络货运人">
{{i?.goodsResource?.[0]?.enterpriseInfoName}}
{{i?.goodsResource?.enterpriseInfoName}}
</sv>
<sv label="货物名称">
{{i?.goodsInfoList?.[0]?.goodsName}}
@ -227,7 +233,7 @@
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<app-imagelist [imgList]="imges"></app-imagelist>
<app-imagelist [imgList]="[imges]"></app-imagelist>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>

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

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 17:20:40
* @LastEditTime: 2021-12-27 13:54:45
* @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
@ -95,9 +95,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
}
agreement(value: any) {
if(value === '1') {
this.imges = this.i?.supplementAgreement
this.imges = this.i?.agreementFilePath
} else if (value === '2') {
this.imges = this.i?.supplementAgreement
this.imges = this.i?.agreementFilePath
}
this.isVisible = true;
}

4
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-23 11:28:00
* @LastEditTime: 2021-12-27 13:25:08
* @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
@ -83,7 +83,7 @@
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price }}
<span *ngIf="data.paymentStatus" style="color: #f59a63">{{ data.paymentStatus }}</span>
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>

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

@ -240,7 +240,7 @@ resourceStatus: any;
},
} as SFSelectWidgetSchema,
},
createTime: {
creationTime: {
title: '创建时间',
type: 'string',
ui: {
@ -328,7 +328,7 @@ resourceStatus: any;
},
{
title: '运费明细',
width: '100px',
width: '200px',
className: 'text-center',
render: 'mybidDetailInfo',
},
@ -369,7 +369,7 @@ resourceStatus: any;
{
title: '创建时间',
className: 'text-center',
index: 'createTime',
index: 'creationTime',
},
{
title: '操作',