车辆对接
This commit is contained in:
wangshiming
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-14 14:03:07
|
||||
* @LastEditTime: 2021-12-20 20:26:52
|
||||
* @LastEditTime: 2021-12-21 14:47: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\modal\bulk\update-freight\update-freight.component.html
|
||||
@ -50,10 +50,10 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
|
||||
<div>{{detailList?.goodsInfoVO?.freightPrice ? detailList?.goodsInfoVO?.freightPrice + '元' : ''}} </div>
|
||||
</sv>
|
||||
<sv label="司机车辆">
|
||||
<div>张三 / 18888888888 / 粤GJ401</div>
|
||||
<div>{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}</div>
|
||||
</sv>
|
||||
<sv label="收款人">
|
||||
<div>李四 / 1888888888</div>
|
||||
<div>{{payeeList?.nickName}} / {{payeeList?.telephone}}</div>
|
||||
</sv>
|
||||
<sv label="回单凭证">
|
||||
<!-- <app-imagelist
|
||||
|
||||
@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-14 14:03:07
|
||||
* @LastEditTime: 2021-12-21 09:42:54
|
||||
* @LastEditTime: 2021-12-21 13:43: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\order-management\modal\bulk\update-freight\update-freight.component.ts
|
||||
@ -33,6 +33,9 @@ export class ConfirReceiptComponent implements OnInit {
|
||||
Status:any;
|
||||
detailList:any;
|
||||
data: any = {};
|
||||
driverList: any;
|
||||
payeeList: any;
|
||||
carList: any;
|
||||
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
@ -42,7 +45,7 @@ export class ConfirReceiptComponent implements OnInit {
|
||||
save(): void {
|
||||
// 大宗
|
||||
this.service.request(this.service.$api_get_signBulkOrder, {id: this.i?.id}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
console.log(res.success)
|
||||
if(res) {
|
||||
this.service.msgSrv.success('确认签收成功！')
|
||||
} else {
|
||||
@ -55,11 +58,17 @@ export class ConfirReceiptComponent implements OnInit {
|
||||
this.service.request(this.service.$api_get_getBulkSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.detailList = res;
|
||||
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.id}).subscribe((res: any) => {
|
||||
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.payeeId}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.payeeList = res;
|
||||
})
|
||||
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.driverId}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.driverList = res;
|
||||
})
|
||||
this.service.request(this.service.$api_getCarLicenseByIds, {id: this.detailList?.carId}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.carList = res;
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
@ -1,53 +1,17 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-14 14:03:07
|
||||
* @LastEditTime: 2021-12-14 15:16:40
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-12-21 15:03:17
|
||||
* @LastEditors: your name
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.html
|
||||
-->
|
||||
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'">
|
||||
<ng-template sf-template="no" let-me let-ui="ui" let-schema="schema">
|
||||
<div style="display: flex;">
|
||||
<nz-input-number [(ngModel)]="data.place" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
|
||||
<div class="left_btn">元/吨</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template sf-template="no2" let-me let-ui="ui" let-schema="schema">
|
||||
<div style="display: flex;">
|
||||
<nz-input-number [(ngModel)]="data.place1" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
|
||||
<div class="left_btn">吨</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template sf-template="no3" let-me let-ui="ui" let-schema="schema">
|
||||
<div style="display: flex;">
|
||||
<nz-input-number [(ngModel)]="data.place2" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
|
||||
<div class="left_btn">吨</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
|
||||
<div style="display: flex;">
|
||||
<nz-input-number [(ngModel)]="data.place3" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
|
||||
<div class="left_btn">吨</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template sf-template="no5" let-me let-ui="ui" let-schema="schema">
|
||||
<div style="display: flex;">
|
||||
<nz-input-number [(ngModel)]="data.place4" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
|
||||
<div class="left_btn">吨</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span:24 } } }" [button]="'none'">
|
||||
</sf>
|
||||
<nz-divider></nz-divider>
|
||||
<nz-divider style="margin-top: 0;"></nz-divider>
|
||||
<div>
|
||||
<p style="font-weight: bolder;">总运费：<span style="color: red;">￥900.00</span></p>
|
||||
<p>运输费：￥800.00，附加费：￥100.00</p>
|
||||
</div>
|
||||
|
||||
<div class="modal-footer">
|
||||
<button nz-button type="button" (click)="close()">关闭</button>
|
||||
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid" [nzLoading]="http.loading"
|
||||
>确认</button
|
||||
>
|
||||
</div>
|
||||
<p style="font-size: 16px;">
|
||||
<span style="font-weight: bolder">总运费：<span style="color: #dc112a">￥{{ data.totalFreight }}</span></span>
|
||||
</p>
|
||||
<p style="margin-bottom: 0;"> 运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}</p>
|
||||
</div>
|
||||
@ -1,4 +1,3 @@
|
||||
import { preloaderFinished } from '@delon/theme';
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-14 14:03:07
|
||||
@ -7,20 +6,12 @@ import { preloaderFinished } from '@delon/theme';
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
|
||||
*/
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { Component, Input, OnInit, ViewChild } from '@angular/core';
|
||||
import {
|
||||
SFComponent,
|
||||
SFCustomWidgetSchema,
|
||||
SFNumberWidgetSchema,
|
||||
SFRadioWidgetSchema,
|
||||
SFSchema,
|
||||
SFComponent, SFNumberWidgetSchema, SFSchema,
|
||||
SFSelectWidgetSchema,
|
||||
SFTextareaWidgetSchema,
|
||||
SFUISchema
|
||||
SFStringWidgetSchema, SFTextWidgetSchema
|
||||
} from '@delon/form';
|
||||
import { _HttpClient } from '@delon/theme';
|
||||
import { NzMessageService } from 'ng-zorro-antd/message';
|
||||
import { NzModalRef } from 'ng-zorro-antd/modal';
|
||||
|
||||
@Component({
|
||||
selector: 'app-order-management-update-freight',
|
||||
@ -28,116 +19,154 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
|
||||
styleUrls: ['./update-freight.component.less']
|
||||
})
|
||||
export class UpdateFreightComponent implements OnInit {
|
||||
record: any = {};
|
||||
i: any;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
schema: SFSchema = {};
|
||||
ui: SFUISchema = {};
|
||||
data: any = {};
|
||||
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient) {}
|
||||
schema!: SFSchema;
|
||||
|
||||
@Input()
|
||||
data: any;
|
||||
|
||||
constructor() {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
|
||||
if (this.record.id > 0) this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res));
|
||||
}
|
||||
initSF() {
|
||||
this.schema= {
|
||||
properties: {
|
||||
no: {
|
||||
type: 'string',
|
||||
title: '运费单价',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
}
|
||||
},
|
||||
sex: {
|
||||
title: '',
|
||||
type: 'string',
|
||||
enum: [
|
||||
{ label: '保留小数', value: 0 },
|
||||
{ label: '男', value: 1 },
|
||||
{ label: '女', value: 2 },
|
||||
{ label: '保密', value: 3 },
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
appId: {
|
||||
type: 'string',
|
||||
title: '结算依据',
|
||||
ui: {
|
||||
width: 300,
|
||||
grid: { span: 24 },
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
// asyncData: () => this.getCatalogueMember(),
|
||||
},
|
||||
},
|
||||
no2: {
|
||||
type: 'string',
|
||||
title: '装货重量',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
}
|
||||
},
|
||||
no3: {
|
||||
type: 'string',
|
||||
title: '装货体积',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
}
|
||||
},
|
||||
no4: {
|
||||
type: 'string',
|
||||
title: '卸货重量',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
}
|
||||
},
|
||||
no5: {
|
||||
type: 'string',
|
||||
title: '卸货体积',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
}
|
||||
},
|
||||
name3: {
|
||||
type: 'string',
|
||||
title: '变更原因',
|
||||
maxLength: 100,
|
||||
ui: {
|
||||
width: 300,
|
||||
placeholder:"选填，最多不超过100字",
|
||||
widget: 'textarea',
|
||||
autosize: { minRows: 3, maxRows: 6 }
|
||||
} as SFTextareaWidgetSchema
|
||||
},
|
||||
},
|
||||
required: ['no', 'appId'],
|
||||
type: 'object',
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 100, grid: { span: 12, gutter: 4 } }
|
||||
};
|
||||
}
|
||||
save(value: any): void {
|
||||
console.log(value)
|
||||
console.log(this.data)
|
||||
this.http.post(`/user/${this.record.id}`, value).subscribe(res => {
|
||||
this.msgSrv.success('保存成功');
|
||||
this.modal.close(true);
|
||||
});
|
||||
this.schema = this.initSF(this.data);
|
||||
}
|
||||
|
||||
close(): void {
|
||||
this.modal.destroy();
|
||||
}
|
||||
/**
|
||||
* 更新数字框
|
||||
* @param value
|
||||
* @param type
|
||||
* 初始化表单
|
||||
*/
|
||||
changeNumVal(value: any, type: number) {}
|
||||
private initSF(data: any): SFSchema {
|
||||
return {
|
||||
properties: {
|
||||
dto: {
|
||||
type: 'object',
|
||||
properties: {
|
||||
freightPrice: {
|
||||
type: 'string',
|
||||
title: '运费单价',
|
||||
ui: {
|
||||
addOnAfter: data.freightTypeLabel,
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
}
|
||||
} as SFStringWidgetSchema,
|
||||
default: data.freightPrice
|
||||
},
|
||||
rule: {
|
||||
title: '',
|
||||
type: 'string',
|
||||
default: data.rule,
|
||||
enum: [
|
||||
{ label: '保留小数', value: '1' },
|
||||
{ label: '抹除小数', value: '2' },
|
||||
{ label: '抹除个数', value: '3' }
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
spanLabelFixed: 10,
|
||||
grid: {
|
||||
span: 10
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
settlementBasis: {
|
||||
title: '结算依据',
|
||||
type: 'string',
|
||||
default: data.settlementBasis,
|
||||
enum: [
|
||||
{ label: '以收货为准', value: '1' },
|
||||
{ label: '以发货为准', value: '2' }
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
grid: {
|
||||
span: 12
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
blank1: {
|
||||
title: '',
|
||||
type: 'string',
|
||||
ui: { widget: 'text', grid: { span: 12 }, class: 'input-back' },
|
||||
default: ' '
|
||||
},
|
||||
freightType: {
|
||||
title: '',
|
||||
type: 'string',
|
||||
ui: { hidden: true },
|
||||
default: data.freightType
|
||||
},
|
||||
acceptWeight: {
|
||||
type: 'number',
|
||||
title: '装货重量',
|
||||
default: data.acceptWeight,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
acceptVolume: {
|
||||
type: 'number',
|
||||
title: '装货体积',
|
||||
default: data.acceptVolume,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
settlementWeight: {
|
||||
type: 'number',
|
||||
title: '卸货重量',
|
||||
default: data.settlementWeight,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
settlementVolume: {
|
||||
type: 'number',
|
||||
title: '卸货体积',
|
||||
default: data.settlementVolume,
|
||||
ui: {
|
||||
unit: '吨',
|
||||
placeholder: '请输入',
|
||||
grid: {
|
||||
span: 12
|
||||
},
|
||||
hideStep: true
|
||||
} as SFNumberWidgetSchema
|
||||
}
|
||||
},
|
||||
required: ['freightPrice', 'settlementBasis']
|
||||
},
|
||||
changeCause: {
|
||||
title: '审核备注',
|
||||
type: 'string',
|
||||
maxLength: 100,
|
||||
default: data.changeCause,
|
||||
ui: {
|
||||
widget: 'textarea',
|
||||
span: 24,
|
||||
placeholder: '选填，最多不超过100字',
|
||||
autosize: {
|
||||
minRows: 3,
|
||||
maxRows: 5
|
||||
}
|
||||
} as SFTextWidgetSchema
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-15 13:17:42
|
||||
* @LastEditTime: 2021-12-20 20:56:54
|
||||
* @LastEditors: your name
|
||||
* @LastEditTime: 2021-12-21 14:34:16
|
||||
* @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\modal\vehicle\confir-receipt\confir-receipt.component.html
|
||||
-->
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
<sv-container col="1">
|
||||
<sv label="费用明细">
|
||||
<st #st [widthMode]="{ type: 'strict' }" [data]="dataInfo" [columns]="columns" bordered="true" [page]="{ show: false }"></st>
|
||||
<st #st [widthMode]="{ type: 'strict' }" [data]="costDetail" [columns]="columns" bordered="true" [page]="{ show: false }"></st>
|
||||
</sv>
|
||||
<sv label="司机车辆">
|
||||
<div>{{ i.driverName }} / {{ i.driverTelephone }} / {{ i.carNo }}</div>
|
||||
<div>{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}</div>
|
||||
</sv>
|
||||
<sv label="收款人">
|
||||
<div>{{ i.payeeName }} / {{ i.payeePhone }}</div>
|
||||
<div>{{payeeList?.nickName}} / {{payeeList?.telephone}}</div>
|
||||
</sv>
|
||||
<sv label="回单凭证">
|
||||
<nz-upload
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-15 13:17:42
|
||||
* @LastEditTime: 2021-12-21 09:34:52
|
||||
* @LastEditTime: 2021-12-21 14:50:54
|
||||
* @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\modal\vehicle\confir-receipt\confir-receipt.component.ts
|
||||
@ -42,6 +42,7 @@ export class VehicleConfirReceiptComponent implements OnInit {
|
||||
record: any = {};
|
||||
i:any;
|
||||
Status: any
|
||||
costDetail: any // 费用明细
|
||||
columns!: STColumn[];
|
||||
previewVisible1 = false;
|
||||
dataInfo: any;
|
||||
@ -49,9 +50,13 @@ export class VehicleConfirReceiptComponent implements OnInit {
|
||||
data: any = {};
|
||||
previewImage1 = '';
|
||||
listImagUrls: any[] = [];
|
||||
payeeList: any;
|
||||
driverList: any;
|
||||
carList: any;
|
||||
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient,public service: OrderManagementService) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.initST()
|
||||
this.initData()
|
||||
}
|
||||
|
||||
@ -96,14 +101,6 @@ export class VehicleConfirReceiptComponent implements OnInit {
|
||||
});
|
||||
};
|
||||
initData() {
|
||||
// this.dataInfo = [
|
||||
// {
|
||||
// prePay: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'PRE')[0]?.price || 0,
|
||||
// toPay: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'RECE')[0]?.price || 0,
|
||||
// receiptPay: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'OIL')[0]?.price || 0,
|
||||
// traiPrice: this.i?.mybidDetailInfo?.filter((data: any) => data.expenseName === '运输费')[0]?.price || 0
|
||||
// }
|
||||
// ];
|
||||
// if (this.i?.receiptCertificate?.length > 0) {
|
||||
// this.i?.receiptCertificate.forEach((element: any) => {
|
||||
// const image = {
|
||||
@ -118,6 +115,34 @@ export class VehicleConfirReceiptComponent implements OnInit {
|
||||
this.service.request(this.service.$api_get_getWholeSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.dataInfo = res;
|
||||
const cost: any = {}
|
||||
res.mybidDetailInfo.forEach((element: any) => {
|
||||
if(element.expenseName === "预付" || element.expenseCode === 'PRE') {
|
||||
cost.PRE = element.price
|
||||
} else if(element.expenseName === "到付" || element.expenseCode === 'RECE') {
|
||||
cost.RECE = element.price
|
||||
} else if(element.expenseName === "回单付" || element.expenseCode === 'BACK') {
|
||||
cost.BACK = element.price
|
||||
} else if(element.expenseName === "油卡" || element.expenseCode === 'OIL') {
|
||||
cost.OIL = element.price
|
||||
} else if(element.expenseName === "总费用") {
|
||||
cost.traiPrice = element.price
|
||||
}
|
||||
});
|
||||
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.payeeList = res;
|
||||
})
|
||||
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.driverList = res;
|
||||
})
|
||||
this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
this.carList = res;
|
||||
})
|
||||
console.log(cost)
|
||||
this.costDetail = [cost];
|
||||
})
|
||||
}
|
||||
|
||||
@ -125,19 +150,19 @@ export class VehicleConfirReceiptComponent implements OnInit {
|
||||
this.columns = [
|
||||
{
|
||||
title: '预付',
|
||||
index: 'prePay'
|
||||
index: 'PRE'
|
||||
},
|
||||
{
|
||||
title: '到付',
|
||||
index: 'toPay'
|
||||
index: 'RECE'
|
||||
},
|
||||
{
|
||||
title: '油卡',
|
||||
index: 'OIL'
|
||||
},
|
||||
// {
|
||||
// title: '油卡',
|
||||
// index: 'name3'
|
||||
// },
|
||||
{
|
||||
title: '回单付',
|
||||
index: 'receiptPay'
|
||||
index: 'BACK'
|
||||
},
|
||||
{
|
||||
title: '总运费',
|
||||
|
||||
@ -1,20 +1,11 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-15 13:17:42
|
||||
* @LastEditTime: 2021-12-20 15:55:51
|
||||
* @LastEditors: your name
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\update-freight\update-freight.component.html
|
||||
-->
|
||||
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
|
||||
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none"></sf>
|
||||
<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
|
||||
<nz-divider></nz-divider>
|
||||
<div>
|
||||
<p>
|
||||
<span style="font-weight: bolder"
|
||||
>总运费：<span style="color: #dc112a">￥{{ totalPrice }}</span></span
|
||||
>总运费：<span style="color: #dc112a">￥{{ data.totalFreight }}</span></span
|
||||
>
|
||||
（运输费：￥{{ tranPrice }}，附加费：￥{{ otherPrice }}）
|
||||
（运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}）
|
||||
</p>
|
||||
<p>
|
||||
<label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>
|
||||
|
||||
@ -2,12 +2,12 @@ import { preloaderFinished } from '@delon/theme';
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-14 14:03:07
|
||||
* @LastEditTime: 2021-12-20 17:57:19
|
||||
* @LastEditTime: 2021-12-21 14:56: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\modal\bulk\update-freight\update-freight.component.ts
|
||||
*/
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { Component, Input, OnInit, ViewChild } from '@angular/core';
|
||||
import {
|
||||
SFComponent,
|
||||
SFCustomWidgetSchema,
|
||||
@ -29,53 +29,33 @@ import { OrderManagementService } from '../../../services/order-management.servi
|
||||
styleUrls: ['./update-freight.component.less']
|
||||
})
|
||||
export class VehicleUpdateFreightComponent implements OnInit {
|
||||
record: any;
|
||||
i: any;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
schema: SFSchema = {};
|
||||
ui: SFUISchema = {};
|
||||
|
||||
totalPrice = 0;
|
||||
tranPrice = 0;
|
||||
otherPrice = 0;
|
||||
|
||||
aggreechecked = false;
|
||||
|
||||
@Input()
|
||||
data: any;
|
||||
|
||||
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
|
||||
|
||||
ngOnInit(): void {
|
||||
console.log(this.record)
|
||||
this.i = {
|
||||
prePay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'PRE')[0]?.price || 0,
|
||||
toPay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'RECE')[0]?.price || 0,
|
||||
oilCardPay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'OIL')[0]?.price || 0,
|
||||
receiptPay: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'BACK')[0]?.price || 0,
|
||||
prePayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'PRE')[0]?.paymentStatus,
|
||||
toPayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'RECE')[0]?.paymentStatus,
|
||||
oilCardPayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'OIL')[0]?.paymentStatus,
|
||||
receiptPayStatus: this.record?.mybidDetailInfo?.filter((data: any) => data.expenseCode === 'BACK')[0]?.paymentStatus
|
||||
};
|
||||
this.record.list.forEach((element: any) => {
|
||||
if(element.costCode === 'PRE') {
|
||||
|
||||
}
|
||||
});
|
||||
this.tranPrice = this.i.prePay + this.i.toPay + this.i.oilCardPay + this.i.receiptPay;
|
||||
this.totalPrice = this.i.prePay + this.i.toPay + this.i.oilCardPay + this.i.receiptPay + this.otherPrice;
|
||||
this.initSF();
|
||||
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: this.record.id}).subscribe((res) => {
|
||||
console.log(res)
|
||||
console.log(this.i)
|
||||
console.log(this.tranPrice)
|
||||
})
|
||||
this.initSF(this.data);
|
||||
}
|
||||
initSF() {
|
||||
initSF(data: any) {
|
||||
const info = {
|
||||
prePay: data.list?.filter((item: any) => item.costCode === 'PRE')[0],
|
||||
toPay: data.list?.filter((item: any) => item.costCode === 'RECE')[0],
|
||||
receiptPay: data.list?.filter((item: any) => item.costCode === 'BACK')[0]
|
||||
};
|
||||
this.schema = {
|
||||
properties: {
|
||||
prePay: {
|
||||
type: 'number',
|
||||
title: '预付',
|
||||
default: 0.0,
|
||||
readOnly: this.i.prePayStatus === '2',
|
||||
default: info.prePay?.price || 0,
|
||||
readOnly: info.prePay?.paymentStatus === '2' || info.prePay?.paymentStatus === '4',
|
||||
ui: {
|
||||
prefix: '￥',
|
||||
widgetWidth: 200,
|
||||
@ -86,20 +66,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
|
||||
toPay: {
|
||||
type: 'number',
|
||||
title: '到付',
|
||||
default: 0.0,
|
||||
readOnly: this.i.toPayStatus === '2',
|
||||
ui: {
|
||||
prefix: '￥',
|
||||
widgetWidth: 200,
|
||||
precision: 2,
|
||||
change: (val: any) => this.changeNumVal()
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
oilCardPay: {
|
||||
type: 'number',
|
||||
title: '油卡',
|
||||
default: 0.0,
|
||||
readOnly: this.i.oilCardPayStatus === '1' || this.i.oilCardPayStatus === '3',
|
||||
default: info.toPay?.price || 0,
|
||||
readOnly: info.toPay?.paymentStatus === '2' || info.toPay?.paymentStatus === '4',
|
||||
ui: {
|
||||
prefix: '￥',
|
||||
widgetWidth: 200,
|
||||
@ -107,11 +75,23 @@ export class VehicleUpdateFreightComponent implements OnInit {
|
||||
change: (val: any) => this.changeNumVal()
|
||||
} as SFNumberWidgetSchema
|
||||
},
|
||||
// oilCardPay: {
|
||||
// type: 'number',
|
||||
// title: '油卡',
|
||||
// default: 0.0,
|
||||
// readOnly: this.i.oilCardPayStatus === '1' || this.i.oilCardPayStatus === '3',
|
||||
// ui: {
|
||||
// prefix: '￥',
|
||||
// widgetWidth: 200,
|
||||
// precision: 2,
|
||||
// change: (val: any) => this.changeNumVal()
|
||||
// } as SFNumberWidgetSchema
|
||||
// },
|
||||
receiptPay: {
|
||||
type: 'number',
|
||||
title: '回单付',
|
||||
default: 0.0,
|
||||
readOnly: this.i.receiptPayStatus === '2',
|
||||
default: info.receiptPay?.price || 0,
|
||||
readOnly: info.receiptPay?.paymentStatus === '2' || info.receiptPay?.paymentStatus === '4',
|
||||
ui: {
|
||||
prefix: '￥',
|
||||
widgetWidth: 200,
|
||||
@ -138,12 +118,11 @@ export class VehicleUpdateFreightComponent implements OnInit {
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
save(value: any): void {
|
||||
console.log(this.record?.mybidDetailInfo)
|
||||
console.log(this.sf.value)
|
||||
const editItems = this.record?.mybidDetailInfo.filter((data: any) => data.receiptPayStatus !== '2');
|
||||
const editItems = this.data.list?.filter((info: any) => info.toPay?.paymentStatus !== '2' && info.toPay?.paymentStatus !== '4');
|
||||
editItems.forEach((item: any) => {
|
||||
switch (item.expenseName) {
|
||||
switch (item.costName) {
|
||||
case '预付':
|
||||
item.price = this.sf.value.prePay;
|
||||
break;
|
||||
@ -159,16 +138,15 @@ export class VehicleUpdateFreightComponent implements OnInit {
|
||||
});
|
||||
|
||||
const params = {
|
||||
id: this.record?.id,
|
||||
billId: this.data.id,
|
||||
dtos: editItems,
|
||||
changeCause: this.sf.value.changeCause
|
||||
};
|
||||
console.log(params)
|
||||
|
||||
this.service.request(this.service.$api_get_insertFreightChangeWhole, params).subscribe((res: any) => {
|
||||
if (res) {
|
||||
this.modal.destroy();
|
||||
} else {
|
||||
this.service.msgSrv.error(res.msg);
|
||||
this.service.msgSrv.success('变更运费成功');
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -181,7 +159,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
|
||||
*
|
||||
*/
|
||||
changeNumVal() {
|
||||
this.tranPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay;
|
||||
this.totalPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay + this.otherPrice;
|
||||
// this.tranPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay;
|
||||
// this.totalPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay + this.otherPrice;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user