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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2022-01-10 13:32:17 +08:00
parent 11c5ab47b8
commit a0c7db29a4
22 changed files with 600 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
View File

@ -29,6 +29,7 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
@ViewChild('st') st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
status: string = 'anew';
type: any;
url = ''; // 请求的api地址
params: any = {}; // 传进来的参数
cardBADGE: STColumnBadge | any = {
@ -99,6 +100,7 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
}
ngOnInit(): void {
console.log(this.type)
}
dataProcess(data: STData[]): STData[] {

8
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
View File

@ -213,9 +213,9 @@
</nz-card>
<nz-card>
<div class="align-center">
<!-- <button nz-button nzType="primary" (click)="chooseFamifiar()">生成二维码</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="chooseFamifiar()">指派熟车</button> -->
<button nz-button nzType="primary" (click)="choose()">取消</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submit()">司机抢单</button>
<!-- <button nz-button nzType="primary" (click)="chooseFamifiar()">生成二维码</button> -->
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submit('assign')">指派熟车</button>
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submit('publish')">司机抢单</button>
</div>
</nz-card>

35
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -530,14 +530,34 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
}
//指派熟车
chooseFamifiar() {
this.modalService.create({
//指派熟车
chooseFamifiar(item: any) {
const modalRef = this.modalService.create({
nzTitle: '指派熟车',
nzContent: PublishGoodsChooseFamifiarComponent,
nzWidth: 1300
nzComponentParams: {
submitParams: item,
submitUrl: this.service.$api_save_bulk_assign
},
nzWidth: 1300,
});
modalRef.afterClose.subscribe(result => {
if (result) {
this.openFinishPage(result);
}
});
}
submit(): void {
// 打开下单完成页面
openFinishPage(resourceObj: any = null) {
this.modalService.create({
nzTitle: '',
nzContent: PublishSuccessComponent,
nzWidth: 900,
nzFooter: null,
nzComponentParams: { type: 'bulk' }
});
}
submit(submitType?: string): void {
console.log(this.startInfo)
if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) {
var c = new Date(this.validateForm1.value.modifyTime);
@ -563,7 +583,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
]
}
params.freightPrice = this.totalFees
console.log(this.sf7.value)
if(submitType) {
if (submitType == 'assign') {
this.chooseFamifiar(params);
return;
}
}
console.log(params)
if(this.PageStatus === '大宗修改') {
this.requests(this.service.$api_set_bulkModify, params);

5
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
View File

@ -174,9 +174,8 @@
<nz-card>
<div class="align-center">
<button nz-button nzType="primary" (click)="choose()">取消</button>
<button nz-button nzType="primary" (click)="submit('assign')">生成二维码</button>
<!-- <button nz-button nzType="primary" (click)="choose()">取消</button> -->
<!-- <button nz-button nzType="primary" (click)="submit('assign')">生成二维码</button> -->
<button nz-button nzType="primary" (click)="submit('assign')">指派熟车</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="submit('publish')">司机抢单</button>
</div>

2
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -446,7 +446,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
nzContent: PublishGoodsChooseFamifiarComponent,
nzComponentParams: {
submitParams: item,
submitUrl: this.service.$api_save_bulk_assign
submitUrl: this.service.$api_save_consignBulkAssign
},
nzWidth: 1300
});

7
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -706,7 +706,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzComponentParams: {
status: 'new',
url: this.service.$api_save_assign_whole,
params: item
params: item,
type: 'next'
},
nzFooter: null
});
@ -732,7 +734,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzTitle: '运输协议',
nzContent: TranAgreementComponent,
nzWidth: 900,
nzFooter: null
nzFooter: null,
nzComponentParams: { type: 'next' }
});
modalRef.afterClose.subscribe(result => {
if (result) {

2
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -639,7 +639,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
nzWidth: 1200,
nzComponentParams: {
status: 'new',
url: this.service.$api_save_assign_whole,
url: this.service.$api_save_consignWholeAssign,
params: item
},
nzFooter: null

10
src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
View File

@ -1,3 +1,11 @@
/*
* @Author: your name
* @Date: 2022-01-06 15:01:40
* @LastEditTime: 2022-01-10 11:20:22
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\tran-agreement\tran-agreement.component.ts
*/
import { Component } from '@angular/core';
import { NzModalRef } from 'ng-zorro-antd/modal';
@ -8,7 +16,7 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
})
export class TranAgreementComponent {
type: any;
constructor(private modal: NzModalRef) {
}

12
src/app/routes/supply-management/services/supply-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-06 19:16:43
* @LastEditTime: 2022-01-10 13:20:04
* @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\services\supply-management.service.ts
@ -65,10 +65,14 @@ export class SupplyManagementService extends BaseService {
$api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`;// 货主端大宗货源重新指派
$api_save_assign_bulk = `/api/sdc/goodsResourceShipper/reAssignBulk`; // 货主端大宗货源指派熟车
// 货主端大宗货源指派熟车
$api_save_assign_whole = `/api/sdc/goodsResourceShipper/saveWholeAssign`;
// 整车再下一单指派熟车
$api_save_assign_whole = `/api/sdc/goodsResourceOperate/saveAnotherWholeOrderAssign`;
// 代发整车货源指派熟车
$api_save_consignWholeAssign = `/api/sdc/goodsResourceOperate/consignWholeAssign`;
// 货主端大宗货源指派熟车
$api_save_bulk_assign = `/api/sdc/goodsResourceShipper/saveBulkAssign`;
$api_save_bulk_assign = `/api/sdc/goodsResourceOperate/saveAnotherBulkOrderAssign`;
// 代发大宗货源指派熟车
$api_save_consignBulkAssign = `/api/sdc/goodsResourceOperate/consignBulkAssign`;
$api_get_has_assigned_car_list = `/api/sdc/goodsResourceShipper/getCarDriverIdsByResourceId`;// 大宗货源根据货源id获取司机和车辆的id集合