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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-20 17:18:40 +08:00
parent f18f512aac
commit 0a31c9eb4e
33 changed files with 1275 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/routes/waybill-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-17 14:57:52
* @LastEditTime: 2021-12-20 15:06: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\components\vehicle-detail\vehicle-detail.component.html
@ -52,10 +52,12 @@
</div>
<div *ngIf="item.type === 2 || item.type === '2'">
<p>卸货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
<p>卸货日期：{{item?.modifyTime}}</p>
</div>
</div>
</div>
<div nz-col nzSpan="5">
<div class="source-info bdr bdl pl-md">
@ -84,10 +86,10 @@
</div>
<div class="source-info pl-md">
<h3>补充信息</h3>
<p style="color: #1890ff;">协议附件</p>
<p style="color: #1890ff;"> 装车附件</p>
<p style="color: #1890ff;">卸货附件</p>
<p style="color: #1890ff;">回单附件</p>
<p style="color: #1890ff;" (click)="agreement('1')">协议附件</p>
<p style="color: #1890ff;" (click)="agreement('2')"> 装车附件</p>
<p style="color: #1890ff;" (click)="agreement('3')">卸货附件</p>
<p style="color: #1890ff;" (click)="agreement('4')">回单附件</p>
</div>
</div>
<nz-divider></nz-divider>
@ -96,18 +98,16 @@
<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>
<div class="freight-info-box" nz-row>
<div nz-col nzSpan="24">
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{400 | currency }}</span></h3>
<h3 class="text-right">未支付</h3>
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{i?.freight | currency: '￥' }}</span></h3>
<h3 class="text-right">{{i?.wayBillStatusLabel}}</h3>
</div>
</div>
@ -151,4 +151,13 @@
</div>
</nz-card>
</div>
</nz-card>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<app-imagelist [imgList]="imges"></app-imagelist>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
<button nz-button nzType="default" (click)="handleCancel()">确定 </button>
</ng-template>
</nz-modal>

29
src/app/routes/waybill-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-17 14:59:03
* @LastEditTime: 2021-12-20 16:23:36
* @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/waybill-management.service';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({
selector: 'app-supply-management-bulk-detail',
templateUrl: './bulk-detail.component.html',
@ -22,16 +22,18 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
i: any;
isVisible = false;
logColumns: STColumn[] = [
{ title: '时间', index: 'operationUserPhone' },
{ title: '地点', index: ' createTime' },
];
imges: any;
unLoadingPlaceVOList: any = [];
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
private service: WaybillManagementServe,
private modalService: NzModalService
) {
@ -66,5 +68,24 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
goBack() {
window.history.go(-1);
}
agreement(value: any) {
console.log('123')
console.log(value)
if(value === '1') {
this.imges = this.i?.supplementAgreement
} else if (value === '2') {
this.imges = this.i?.loadingCertificate
} else if (value === '3') {
this.imges = this.i?.unLoadingCertificate
} else if (value === '4') {
this.imges = this.i?.receiptCertificate
}
this.isVisible = true;
}
handleCancel() {
this.isVisible = false
}
handleOK() {
this.isVisible = false
}
}

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

@ -6,7 +6,9 @@ import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs';
import { map } from 'rxjs/operators';
import { SupplyManagementService } from '../../services/waybill-management.service';
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({
@ -55,7 +57,7 @@ tabs = {
receivedQuantity: 0,
stayQuantity: 0
};
constructor(public service: SupplyManagementService, private modal: NzModalService, public service2: ShipperBaseService) { }
constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
/**
* 查询参数
@ -422,6 +424,14 @@ tabs = {
text: '查看评价',
click: (_record) => this.viewEvaluate(_record),
},
{
text: '确认发车',
click: (_record) => this.sureDepart(_record),
},
{
text: '确认到车',
click: (_record) => this.sureArrive(_record),
},
],
},
];
@ -602,4 +612,31 @@ tabs = {
}
})
}
// *确认发车
sureDepart(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认发车',
nzWidth: '50%',
nzContent: VehicleSureDepartComponent,
nzComponentParams: {
i: item,
Status: 2
},
nzFooter: null
});
}
// 确认到车
sureArrive(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认到车',
nzWidth: '50%',
nzContent: VehicleSureArriveComponent,
nzComponentParams: {
i: item,
Status: 2
},
nzFooter: null
});
}
}

50
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-20 10:12:37
* @LastEditTime: 2021-12-20 15:07:51
* @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
@ -84,10 +84,10 @@
</div>
<div class="source-info pl-md">
<h3>补充信息</h3>
<p style="color: #1890ff;">协议附件</p>
<p style="color: #1890ff;"> 装车附件</p>
<p style="color: #1890ff;">卸货附件</p>
<p style="color: #1890ff;">回单附件</p>
<p style="color: #1890ff;" (click)="agreement('1')">协议附件</p>
<p style="color: #1890ff;" (click)="agreement('2')"> 装车附件</p>
<p style="color: #1890ff;" (click)="agreement('3')">卸货附件</p>
<p style="color: #1890ff;" (click)="agreement('4')">回单附件</p>
</div>
</div>
<nz-divider></nz-divider>
@ -104,8 +104,8 @@
<nz-divider></nz-divider>
<div class="freight-info-box" nz-row>
<div nz-col nzSpan="24">
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{400 | currency }}</span></h3>
<h3 class="text-right">未支付</h3>
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{i?.freight | currency: '￥' }}</span></h3>
<h3 class="text-right">{{i?.wayBillStatusLabel}}</h3>
</div>
</div>
@ -114,23 +114,22 @@
<div nz-row >
<div nz-col [nzSpan]='12'>
<div style="position: relative;">
<div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: 0%;color: #fff;text-align: center;">平台支付</div>
<span class="leftPadding">司机运输费666</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
<div style="height: 24px; width: 90px; background-color: #68758e;color: #fff;text-align: center;">平台支付</div>
<div >
<!-- <p><label class="freigth-label">{{i?.platformPaymentDetail?.costName}}:</label><span>{{ i?.platformPaymentDetail?.price| currency: '￥' }}</span></p> -->
<div *ngFor="let item of i?.platformPaymentDetail">
<p><label class="freigth-label">{{item?.costName}}:</label><span>{{ item?.price| currency: '￥' }}</span></p>
</div>
</div>
</div>
</div>
<div nz-col [nzSpan]='12'>
<div style="position: relative;">
<div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: 0%;color: #fff;text-align: center;">货主支付</div>
<span class="leftPadding">司机运输费22</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
</div>
<div>
<span class="leftPadding">附加费</span>
<span class="leftPadding">1000.00</span>
<span class="leftPadding">未支付</span>
<div style="height: 24px; width: 90px; background-color: #68758e;color: #fff;text-align: center;">货主支付</div>
<div *ngFor="let item of i?.ownerPaymentDetail?.freightDetail">
<p><label class="freigth-label">{{item?.costName}}:</label><span>{{ item?.price| currency: '￥' }}</span></p>
</div>
</div>
</div>
</div>
@ -149,4 +148,13 @@
</div>
</nz-card>
</div>
</nz-card>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<app-imagelist [imgList]="imges"></app-imagelist>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
<button nz-button nzType="default" (click)="handleCancel()">确定 </button>
</ng-template>
</nz-modal>

29
src/app/routes/waybill-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-17 14:38:14
* @LastEditTime: 2021-12-20 13:55:09
* @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/waybill-management.service';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({
selector: 'app-supply-management-vehicle-detail',
templateUrl: './vehicle-detail.component.html',
@ -21,7 +21,9 @@ import { SupplyManagementService } from '../../services/waybill-management.servi
export class WaybillManagementVehicleDetailComponent implements OnInit {
id = this.route.snapshot.params.id;
isVisible = false;
i: any;
imges: any;
logColumns: STColumn[] = [
{ title: '时间', index: 'operationUserPhone' },
{ title: '地点', index: ' createTime' },
@ -31,7 +33,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
private service: WaybillManagementServe,
private modalService: NzModalService
) {
@ -65,5 +67,24 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
goBack() {
window.history.go(-1);
}
handleCancel() {
this.isVisible = false
}
handleOK() {
this.isVisible = false
}
agreement(value: any) {
console.log('123')
console.log(value)
if(value === '1') {
this.imges = this.i?.supplementAgreement
} else if (value === '2') {
this.imges = this.i?.loadingCertificate
} else if (value === '3') {
this.imges = this.i?.unLoadingCertificate
} else if (value === '4') {
this.imges = this.i?.receiptCertificate
}
this.isVisible = true;
}
}

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

@ -6,7 +6,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/waybill-management.service';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({
@ -51,7 +51,7 @@ tabs = {
receivedQuantity: 0,
stayQuantity: 0
};
constructor(public service: SupplyManagementService, private modal: NzModalService, public service2: ShipperBaseService) { }
constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
/**
* 查询参数

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

@ -1,3 +1,4 @@
import { WaybillManagementBulkComponent } from './../components/bulk/bulk.component';
/*
* @Author: your name
* @Date: 2021-12-07 14:52:29
@ -12,7 +13,7 @@ import { BaseService } from 'src/app/shared/services';
@Injectable({
providedIn: 'root'
})
export class SupplyManagementService extends BaseService {
export class WaybillManagementServe extends BaseService {
$api_get_catalogue_member = `/user?_allow_anonymous=true`;
$api_del_driver = ``;
@ -35,6 +36,10 @@ export class SupplyManagementService extends BaseService {
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
// 大宗确认发车
$api_get_insertBulkStartCarInfo= `/api/sdc/wayBillOperate/insertBulkStartCarInfo`;
constructor(public injector: Injector) {
super(injector)
}