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:
潘晓云
2022-04-28 20:42:59 +08:00
parent bbc3095852 5eb22cb934
commit f83ab482a8
120 changed files with 413 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,21 +547,21 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
loadTime: this.loadTime,
// 到车时间
unloadTime: this.unloadTime,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data
? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath
: this.sf.value?.loadingLadingBillFilePath?.url,
loadingLadingBillFilePath: this.sf?.value?.loadingLadingBillFilePath?.data
? this.sf?.value?.loadingLadingBillFilePath.data.fullFilePath
: this.sf?.value?.loadingLadingBillFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data
? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.data
? this.sf?.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.url,
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data
? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath
: this.sf.value?.unloadingLadingBillFilePath?.url,
unloadingLadingBillFilePath: this.sf?.value?.unloadingLadingBillFilePath?.data
? this.sf?.value?.unloadingLadingBillFilePath.data.fullFilePath
: this.sf?.value?.unloadingLadingBillFilePath?.url,
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data
? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url
unloadingPeopleVehiclesGoodsFilePath: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.data
? this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.url
};
this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
if (res) {

4
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
View File

@ -184,7 +184,7 @@ export class UpdateFreightComponent implements OnInit {
if (this.calculateSub) {
this.calculateSub.unsubscribe();
}
const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} }
const params = { billId: this.data.billId, changeCause: this.sf?.value.changeCause, dto: {...this.sf?.value} }
this.calculateSub = this.service
.request(this.service.$api_calculate_cost, params)
.subscribe(res => {
@ -203,7 +203,7 @@ export class UpdateFreightComponent implements OnInit {
this.sf.validator({ emitError: true });
return;
}
const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} }
const params = { billId: this.data.billId, changeCause: this.sf?.value.changeCause, dto: {...this.sf?.value} }
this.service.request(this.service.$api_change_bulk,params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('变更运费成功！');

4
src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
View File

@ -103,11 +103,11 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
console.log(this.List)
}
save(value: any): void {
if (!this.sf.value.reason) {
if (!this.sf?.value.reason) {
this.service.msgSrv.error('请填写备注信息！');
return;
}
const params = { billId: this.i?.id, ...this.sf.value };
const params = { billId: this.i?.id, ...this.sf?.value };
console.log(params)
this.service.request(this.service.$api_billRefundApplication_save, params).subscribe(res => {
if (res) {

4
src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts
View File

@ -60,7 +60,7 @@ export class OneCarOrderCancelComponent implements OnInit {
this.modal.confirm({
nzTitle: '<i>是否确定立即取消运单！</i>',
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => {
this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf?.value }).subscribe(res => {
if (res) {
this.modalRef.close(true);
}
@ -68,7 +68,7 @@ export class OneCarOrderCancelComponent implements OnInit {
nzOnCancel: () => this.modalRef.destroy()
});
} else {
this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => {
this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf?.value }).subscribe(res => {
if (res) {
this.modalRef.close(true);
}

4
src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
View File

@ -68,14 +68,14 @@ export class VehicleFreightPeopleComponent implements OnInit {
}
save(value: any): void {
console.log(this.sf.value);
console.log(this.sf?.value);
if(!this.sf.valid) {
this.service.msgSrv.error("请选择网络货运人！")
return;
}
const params = {
billIds: this.data?.ids,
enterpriseInfoId: this.sf.value?.enterpriseInfoId
enterpriseInfoId: this.sf?.value?.enterpriseInfoId
};
console.log(params);
this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {

6
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
View File

@ -78,14 +78,14 @@ export class VehicleModifyRateComponent implements OnInit {
}
save(value: any): void {
if (!this.sf.value?.additionalRate) {
if (!this.sf?.value?.additionalRate) {
this.service.msgSrv.warning('请填写附加费！');
return;
}
console.log(this.sf.value);
console.log(this.sf?.value);
const params = {
ids: this.data?.ids,
...this.sf.value
...this.sf?.value
};
console.log(params);
this.service.request(this.service.$api_set_updateAdditionalRateBatch, params).subscribe((res: any) => {

18
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -165,8 +165,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
});
}
});
// 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;
}
getParams() {
@ -174,13 +174,13 @@ export class VehicleUpdateFreightComponent implements OnInit {
editItems.forEach((item: any) => {
switch (item.costName) {
case '预付':
item.price = this.sf.value.prePay;
item.price = this.sf?.value.prePay;
break;
case '到付':
item.price = this.sf.value.toPay;
item.price = this.sf?.value.toPay;
break;
case '回单付':
item.price = this.sf.value.receiptPay;
item.price = this.sf?.value.receiptPay;
break;
default:
break;
@ -190,7 +190,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
const params = {
billId: this.data.id,
dtos: editItems,
changeCause: this.sf.value.changeCause
changeCause: this.sf?.value.changeCause
};
return params;
}
@ -198,9 +198,9 @@ export class VehicleUpdateFreightComponent implements OnInit {
const param = {
billId: this.data.id,
pre: this.sf.value.prePay,
rece: this.sf.value.toPay,
back: this.sf.value.receiptPay,
pre: this.sf?.value.prePay,
rece: this.sf?.value.toPay,
back: this.sf?.value.receiptPay,
total: this.data.totalFreight,
freightAmount: this.data.totalAmount,
}