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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-24 14:34:31 +08:00
parent 1733c588cd
commit 5fb5097acf
3 changed files with 43 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-23 17:39:40 * @LastEditTime: 2021-12-24 14:13:00
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -356,7 +356,6 @@
</sv-container> </sv-container>
<sv-container col="1" class="mt-md"> <sv-container col="1" class="mt-md">
<sv label="回单凭证"> <sv label="回单凭证">
<!-- {{i?.goodsResource?.receiptAddress}} -->
<nz-upload <nz-upload
class="avatar-uploader" class="avatar-uploader"
[nzAction]="service.$api_upload_url" [nzAction]="service.$api_upload_url"

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

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 13:15:50 * @LastEditTime: 2021-12-24 14:31:53
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.ts
@ -92,10 +92,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
imgUrl3: { loadingLadingBillFilePath: {
type: 'string', type: 'string',
title: '装货凭证', title: '装货凭证',
readOnly: true,
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.fileUpload,
@ -131,10 +130,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listType: 'picture-card', listType: 'picture-card',
} as SFUploadWidgetSchema, } as SFUploadWidgetSchema,
}, },
imgUrl4: { loadingPeopleVehiclesGoodsFilePath: {
type: 'string', type: 'string',
title: '', title: '',
readOnly: true,
ui: { ui: {
widget: 'upload', widget: 'upload',
action: apiConf.fileUpload, action: apiConf.fileUpload,
@ -178,7 +176,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}, },
default: '', default: '',
}, },
imgUrl1: { unloadingLadingBillFilePath: {
type: 'string', type: 'string',
title: '卸货凭证', title: '卸货凭证',
ui: { ui: {
@ -216,7 +214,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
listType: 'picture-card', listType: 'picture-card',
} as SFUploadWidgetSchema, } as SFUploadWidgetSchema,
}, },
imgUrl2: { unloadingPeopleVehiclesGoodsFilePath: {
type: 'string', type: 'string',
title: '', title: '',
ui: { ui: {
@ -271,17 +269,17 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
default: '', default: '',
}, },
}, },
required: ['imgUrl3','imgUrl1'] required: ['loadingLadingBillFilePath','unloadingLadingBillFilePath']
}; };
this.ui = { this.ui = {
'*': { '*': {
spanLabelFixed: 100, spanLabelFixed: 100,
grid: { span: 20 } grid: { span: 20 }
}, },
$imgUrl1: { grid: { span: 12} }, $unloadingLadingBillFilePath: { grid: { span: 12} },
$imgUrl2: { grid: { span: 12} }, $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
$imgUrl3: { grid: { span: 12} }, $loadingLadingBillFilePath: { grid: { span: 12} },
$imgUrl4: { grid: { span: 12} }, $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
$no5: { grid: { span: 24} }, $no5: { grid: { span: 24} },
}; };
} }
@ -341,27 +339,27 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
}); });
// 对装货凭证进行初始化 // 对装货凭证进行初始化
if (res.imgUrl1) { if (res.unloadingLadingBillFilePath) {
this.formData = { this.formData = {
imgUrl3: [ loadingLadingBillFilePath: [
{ {
uid: 'logo', uid: 'logo',
name: 'LOGO', name: 'LOGO',
status: 'done', status: 'done',
url: res.imgUrl1, url: res.unloadingLadingBillFilePath,
response: { response: {
url: res.imgUrl1, url: res.unloadingLadingBillFilePath,
}, },
}, },
], ],
imgUrl4: [ loadingPeopleVehiclesGoodsFilePath: [
{ {
uid: 'logo', uid: 'logo',
name: 'LOGO', name: 'LOGO',
status: 'done', status: 'done',
url: res.imgUrl2, url: res.unloadingPeopleVehiclesGoodsFilePath,
response: { response: {
url: res.imgUrl2, url: res.unloadingPeopleVehiclesGoodsFilePath,
}, },
}, },
], ],
@ -371,14 +369,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}) })
} }
hand() {
this.modalService.create({
nzTitle: '',
// nzContent: OrderManagementGaodeMapComponent,
nzWidth: 1200
});
}
goBack() { goBack() {
window.history.go(-1); window.history.go(-1);
} }
@ -388,7 +378,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
// 保存修改 // 保存修改
save() { save() {
console.log(this.sf.value)
let imgList : any= []; let imgList : any= [];
if(this.listImagUrls.length > 0) { if(this.listImagUrls.length > 0) {
this.listImagUrls?.forEach((res :any) => { this.listImagUrls?.forEach((res :any) => {
@ -397,15 +386,13 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
} }
}) })
} }
console.log(imgList) if(typeof(this.unloadingTime) !== 'string' ){
var c = new Date(this.unloadingTime);
if(typeof(this.validateForm1.value.unloadingTime) !== 'string' ) { this.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
var c = new Date(this.validateForm1.value.unloadingTime);
this.validateForm1.value.unloadingTime = 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.validateForm1.value.loadingTime) !== 'string' ) { if(typeof(this.loadingTime) !== 'string' ) {
var c = new Date(this.validateForm1.value.loadingTime); var c = new Date(this.loadingTime);
this.validateForm1.value.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds()) this.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
} }
console.log(this.sf3.value) console.log(this.sf3.value)
console.log(this.sf4.value) console.log(this.sf4.value)
@ -413,36 +400,33 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
id: this.id, id: this.id,
unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], unLoadingPlaceList: [...this.startInfo, ...this.endInfo,],
goodsResource: [{ goodsResource: [{
id: '', id: this.i?.goodsResource?.id,
enterpriseInfoId: 'xxx', enterpriseInfoId: this.sf3.value?.enterpriseInfoId,
}], }],
receiptFilePath: imgList, receiptFilePath: imgList,
goodsInfoList: [{ goodsInfoList: [{
id: '', id: this.i?.goodsInfoList?.[0].id,
goodsName: 'xxx', goodsName: this.sf3.value?.goodsName,
weight: '', ...this.sf4.value
volume: '',
number: '',
}], }],
// 运费信息 // 运费信息
expenseList: this.i?.i?.billExpenseDetails, expenseList: this.i?.billExpenseDetails,
// 收款人 // 收款人
payeeId: '', payeeId: this.dirverPhone,
银行卡: '', dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间 // 发车时间
loadPlanTime: '', loadPlanTime: this.loadingTime,
// 到车时间 // 到车时间
unloadPlanTime: '', unloadPlanTime: this.loadingTime,
loadingLadingBillFilePath: '', loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath.data.fullFilePath,
loadingPeopleVehiclesGoodsFilePath: '', loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
unloadingLadingBillFilePath: '', unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath,
unloadingPeopleVehiclesGoodsFilePath: '', unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
} }
console.log(params) console.log(params)
// this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => { this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => {
// console.log(res) console.log(res)
// }) })
} }
addPreZero(num: any){ addPreZero(num: any){
if(num<10){ if(num<10){

4
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:31:52 * @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 13:59:12 * @LastEditTime: 2021-12-24 14:02:11
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 * @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -201,7 +201,7 @@
</sv-container> </sv-container>
<sv-container col="1" class="mt-md"> <sv-container col="1" class="mt-md">
<sv label="回单凭证"> <sv label="回单凭证">
<app-imagelist [imgList]="[imges]"></app-imagelist> <app-imagelist [imgList]="[i?.receiptFilePath]"></app-imagelist>
</sv> </sv>
<sv label="备注"> <sv label="备注">
{{i?.goodsResource?.remarks}} {{i?.goodsResource?.remarks}}