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:
heqinghang
2022-03-12 15:30:13 +08:00
parent dd8f5afaa1 8940aec409
commit e330724811
4 changed files with 514 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

225
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 11:24:51
* @LastEditTime : 2022-03-11 17:51:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -75,7 +75,7 @@ loadTime: any; // 货源单设置回显
ui: SFUISchema = {};
logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' },
{ title: '地点', index: 'cityName' },
{ title: '地点', index: 'cityName' }
];
logColumns: STColumn[] = [
{ title: '款项', index: 'expenseCodeLabel' },
@ -110,19 +110,19 @@ loadTime: any; // 货源单设置回显
public shipperservice: ShipperBaseService,
fb: FormBuilder,
private envSrv: EAEnvironmentService,
private ar: ActivatedRoute,
private ar: ActivatedRoute
) {
this.validateForm1 = fb.group({
loadTime: [null, []],
unloadTime: [null, []],
unloadTime: [null, []]
});
}
ngOnInit(): void {
this.initData()
this.initData();
this.initSF3();
this.initSF4();
this.getTrajectory()
this.getTrajectory();
}
initSF() {
this.schema = {
@ -141,7 +141,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -163,8 +163,8 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
loadingPeopleVehiclesGoodsFilePath: {
type: 'string',
@ -180,7 +180,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -202,24 +202,16 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
},
no4: {
type: 'string',
title: '',
ui: {
widget: 'text',
},
default: '',
listType: 'picture-card'
} as SFUploadWidgetSchema
},
no7: {
type: 'string',
title: '',
ui: {
widget: 'text',
widget: 'text'
},
default: '',
default: ''
},
unloadingLadingBillFilePath: {
type: 'string',
@ -235,7 +227,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -257,8 +249,8 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
unloadingPeopleVehiclesGoodsFilePath: {
type: 'string',
@ -274,7 +266,7 @@ loadTime: any; // 货源单设置回显
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId,
appId: this.envSrv.env.appId
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -296,25 +288,25 @@ loadTime: any; // 货源单设置回显
});
},
multiple: false,
listType: 'picture-card',
} as SFUploadWidgetSchema,
listType: 'picture-card'
} as SFUploadWidgetSchema
},
no5: {
type: 'string',
title: '',
ui: {
widget: 'text',
widget: 'text'
},
default: '',
default: ''
},
no6: {
type: 'string',
title: '',
ui: {
widget: 'text',
},
default: '',
widget: 'text'
},
default: ''
}
},
required: ['loadingLadingBillFilePath', 'unloadingLadingBillFilePath']
};
@ -327,7 +319,7 @@ loadTime: any; // 货源单设置回显
$unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
$loadingLadingBillFilePath: { grid: { span: 12 } },
$loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
$no5: { grid: { span: 24} },
$no5: { grid: { span: 24 } }
};
}
initData() {
@ -337,21 +329,21 @@ loadTime: any; // 货源单设置回显
this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
this.initSF();
// 对装货凭证进行初始化
let arr : any= []
let arr: any = [];
res?.receiptFilePath.forEach((element: any, index: any) => {
arr.push({
url: element,
status: 'done',
uid: index
})
});
this.sf4data
});
this.sf4data;
this.listImagUrls = arr;
// this.sf4data = res?.goodsInfoList?.[0]
this.sf4data = {
...res,
...res?.goodsInfoList?.[0]
}
};
this.sf3data = {
goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '',
goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '',
@ -377,7 +369,7 @@ loadTime: any; // 货源单设置回显
area: element.area,
type: element.type,
id: element.id
})
});
this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
@ -394,74 +386,72 @@ loadTime: any; // 货源单设置回显
area: element.area,
type: element.type,
id: element.id
})
});
this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required));
}
});
// 对装货凭证进行初始化
if (res.loadingLadingBillFilePath) {
this.formData = {
loadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.loadingLadingBillFilePath,
url: res?.loadingLadingBillFilePath,
response: {
url: res.loadingLadingBillFilePath,
},
},
url: res?.loadingLadingBillFilePath
}
}
],
loadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.loadingPeopleVehiclesGoodsFilePath,
url: res?.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res.loadingPeopleVehiclesGoodsFilePath,
},
},
url: res?.loadingPeopleVehiclesGoodsFilePath
}
}
],
unloadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.unloadingLadingBillFilePath,
url: res?.unloadingLadingBillFilePath,
response: {
url: res.unloadingLadingBillFilePath,
},
},
url: res?.unloadingLadingBillFilePath
}
}
],
unloadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res.unloadingPeopleVehiclesGoodsFilePath,
url: res?.unloadingPeopleVehiclesGoodsFilePath,
response: {
url: res.unloadingPeopleVehiclesGoodsFilePath,
},
},
],
};
url: res?.unloadingPeopleVehiclesGoodsFilePath
}
}
]
};
// 发车时间到车时间初始化
this.loadTime = res.loadTime
this.unloadTime = res.unloadTime
this.dirvingMessage = res.billExpenseDetails;
this.loadTime = res?.loadTime;
this.unloadTime = res?.unloadTime;
this.dirvingMessage = res?.billExpenseDetails;
// 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
this.totalDistance = res?.distance;
this.totalTime = res?.time;
});
}
}
})
});
}
goBack() {
@ -483,35 +473,62 @@ loadTime: any; // 货源单设置回显
this.service.msgSrv.warning('请完善必填项！');
return;
}
if ((this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight) || (this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight) ) {
if (
this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight ||
this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight
) {
this.service.msgSrv.warning('装货重量/卸货重量不能大于货物重量！');
return;
}
let imgList: any = [];
if (this.listImagUrls.length > 0) {
this.listImagUrls?.forEach((res: any) => {
if(res.url) {
imgList.push(res.url)
if (res?.url) {
imgList.push(res?.url);
}
})
});
}
if(typeof(this.unloadTime) !== 'string' ){
if (typeof this.unloadTime !== 'string') {
var c = new Date(this.unloadTime);
this.unloadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
this.unloadTime =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
if(typeof(this.loadTime) !== 'string' ) {
if (typeof this.loadTime !== 'string') {
var c = new Date(this.loadTime);
this.loadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
this.loadTime =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
const params = {
id: this.id,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
receiptFilePath: imgList,
goodsInfoDTOList: [{
goodsInfoDTOList: [
{
id: this.i?.goodsInfoList?.[0].id,
goodsName: this.sf3.value?.goodsName,
...this.sf4.value
}],
}
],
// 运费信息
// 收款人
payeeId: this.dirverPhone,
@ -524,14 +541,22 @@ loadTime: any; // 货源单设置回显
acceptVolume: this.sf4.value?.acceptVolume,
settlementWeight: this.sf4.value?.settlementWeight,
settlementVolume: this.sf4.value?.settlementVolume,
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_modifyBulkOrder, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('修改成功！');
@ -539,7 +564,7 @@ loadTime: any; // 货源单设置回显
} else {
this.service.msgSrv.error(res?.msg);
}
})
});
}
addPreZero(num: any) {
if (num < 10) {
@ -589,8 +614,8 @@ loadTime: any; // 货源单设置回显
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
this.totalDistance = res.distance;
this.totalTime = res.time;
this.totalDistance = res?.distance;
this.totalTime = res?.time;
});
}
}
@ -761,7 +786,7 @@ initSF4() {
grid: {
span: 12
},
hideStep: true,
hideStep: true
} as SFNumberWidgetSchema
},
acceptVolume: {
@ -775,7 +800,7 @@ initSF4() {
grid: {
span: 12
},
hideStep: true,
hideStep: true
} as SFNumberWidgetSchema
},
settlementWeight: {
@ -789,7 +814,7 @@ initSF4() {
grid: {
span: 12
},
hideStep: true,
hideStep: true
} as SFNumberWidgetSchema
},
settlementVolume: {
@ -803,7 +828,7 @@ initSF4() {
grid: {
span: 12
},
hideStep: true,
hideStep: true
} as SFNumberWidgetSchema
}
},
@ -832,7 +857,7 @@ initSF4() {
},
$unloadTime: {
grid: { span: 12 }
},
}
};
}
// 处理上传图片
@ -884,17 +909,17 @@ beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
};
agreement(value: any) {
if (value === '1') {
this.imges = this.i?.supplementAgreement
this.imges = this.i?.supplementAgreement;
} else if (value === '2') {
this.imges = this.i?.supplementAgreement
this.imges = this.i?.supplementAgreement;
}
this.isVisible = true;
}
handleCancel() {
this.isVisible = false
this.isVisible = false;
}
handleOK() {
this.isVisible = false
this.isVisible = false;
}
goDistance(elf: NzCardComponent) {
if (elf) {
@ -917,8 +942,8 @@ goDistance(elf: NzCardComponent) {
// 计算里程，时间
if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
this.totalDistance = res.distance;
this.totalTime = res.time;
this.totalDistance = res?.distance;
this.totalTime = res?.time;
});
}
}
@ -927,7 +952,7 @@ goDistance(elf: NzCardComponent) {
getTrajectory() {
this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
if (res) {
const points = res.trackArray;
const points = res?.trackArray;
let list: any[] = [];
points?.forEach((item: any) => {
list.push({
@ -936,7 +961,7 @@ goDistance(elf: NzCardComponent) {
});
});
this.mapList = list;
this.addressItems = res.cityArray;
this.addressItems = res?.cityArray;
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.vinOutTime);
@ -950,7 +975,7 @@ goDistance(elf: NzCardComponent) {
getDriverTrajectory() {
this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
if (res) {
const points = res.tracks;
const points = res?.tracks;
let list: any[] = [];
points?.forEach((item: any) => {
list.push({
@ -959,7 +984,7 @@ goDistance(elf: NzCardComponent) {
});
});
this.mapList = list;
this.addressItems = [...res.enclosureDataAppTrack];
this.addressItems = [...res?.enclosureDataAppTrack];
if (this.addressItems && this.addressItems.length > 0) {
this.addressItems.forEach(item => {
item.vinOutTime = this.getLocalTime(item.gtm);
@ -971,7 +996,7 @@ goDistance(elf: NzCardComponent) {
}
trajectoryChange(event: any) {
if (event === 'car') {
this.getTrajectory()
this.getTrajectory();
} else if (event === 'driver') {
this.getDriverTrajectory();
}

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-03-11 11:24:29
* @LastEditTime : 2022-03-11 17:58:28
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -97,7 +97,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
addressItems: any[] = []; //打点地址数据组
logColumns2: STColumn[] = [
{ title: '时间', index: 'vinOutTime' },
{ title: '地点', index: 'cityName' },
{ title: '地点', index: 'cityName' }
];
constructor(
private route: ActivatedRoute,
@ -204,14 +204,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listType: 'picture-card'
} as SFUploadWidgetSchema
},
no4: {
type: 'string',
title: '',
ui: {
widget: 'text'
},
default: ''
},
no7: {
type: 'string',
title: '',
@ -405,7 +397,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
});
// 对装货凭证进行初始化
if (res?.loadingLadingBillFilePath) {
this.formData = {
loadingLadingBillFilePath: [
{
@ -425,7 +416,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
status: 'done',
url: res?.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res?.loadingPeopleVehiclesGoodsFilePath
url: res?.loadingPeopleVehiclesGoodsFilePath,
}
}
],
@ -452,7 +443,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
]
};
}
// 发车时间到车时间初始化
this.loadTime = res?.loadTime;
this.unloadTime = res?.unloadTime;
@ -683,7 +673,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
'*': {
spanLabelFixed: 110,
grid: { span: 12 }
},
}
};
}
changeGoodsType(value: string, data: any) {
@ -969,7 +959,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
trajectoryChange(event: any) {
if (event === 'car') {
this.getTrajectory()
this.getTrajectory();
} else if (event === 'driver') {
this.getDriverTrajectory();
}

4
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 : 2022-03-11 16:40:09
* @LastEditTime : 2022-03-11 17:27:42
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@ -83,7 +83,7 @@
{{i?.driver?.name}}/{{i?.driver?.phone}}
</sv>
<sv label="车型车长载重">
{{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
{{i?.car?.carModelLabel}},{{i?.car?.carLengthLabel}}米,{{i?.car?.carLoad ? i?.car?.carLoad +'吨': ''}}
</sv>
<!-- <sv label="计划装货时间">
{{i?.loadPlanTime}}

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

@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
/*
* @Author: your name
* @Date: 2021-12-07 14:52:29
* @LastEditTime : 2022-03-08 14:51:11
* @LastEditTime : 2022-03-11 17:26:20
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts