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

装货凭证添加水印

Browse Source
This commit is contained in:
潘晓云
2022-04-19 19:28:11 +08:00
parent f20df8ac89
commit 0195a624c2
5 changed files with 779 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
listImagUrls: any[] = []; // 货源单设置回显
dirvingMessage = [];
modalcontent: any;
modalTitle:string = '';
modalTitle: string = '';
imges: any;
totalObj: any;
attObj: any;
@ -135,7 +135,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -143,7 +143,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -174,7 +181,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -182,7 +189,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -221,7 +235,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -229,7 +243,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -260,7 +281,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -268,7 +289,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -589,44 +617,44 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
}
if (item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
}
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;
});
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;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}
initSF3() {
@ -916,11 +944,11 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
});
};
agreement(value: any) {
if(value ==='1'){
if (value === '1') {
this.modalTitle = '附件信息';
this.modalcontent = this.i?.contractContent?.contractContent;
}else if(value === '2'){
} else if (value === '2') {
this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent;
}

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

@ -55,7 +55,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
billExpenses: any[] = []; //运费信息表格信息
dirvingMessage = [];
modalcontent: any;
modalTitle:string = '';
modalTitle: string = '';
attObj: any;
totalObj: any;
approvalLsit: any;
@ -126,7 +126,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -134,7 +134,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -165,7 +172,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -173,7 +180,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -212,7 +226,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -220,7 +234,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -251,7 +272,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
// readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
ui: {
widget: 'upload',
action: apiConf.fileUpload,
action: apiConf.waterFileUpload,
fileType: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@ -259,7 +280,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
appId: this.envSrv.env.appId
appId: this.envSrv.env.appId,
content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
],
position: '2',
fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@ -391,52 +419,52 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
});
// 对装货凭证进行初始化
this.formData = {
loadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.loadingLadingBillFilePath,
response: {
url: res?.loadingLadingBillFilePath
}
this.formData = {
loadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.loadingLadingBillFilePath,
response: {
url: res?.loadingLadingBillFilePath
}
],
loadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
}
],
loadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res?.loadingPeopleVehiclesGoodsFilePath,
response: {
url: res?.loadingPeopleVehiclesGoodsFilePath,
}
}
],
unloadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.unloadingLadingBillFilePath,
response: {
url: res?.unloadingLadingBillFilePath
}
}
],
unloadingLadingBillFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.unloadingLadingBillFilePath,
response: {
url: res?.unloadingLadingBillFilePath
}
],
unloadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.unloadingPeopleVehiclesGoodsFilePath,
response: {
url: res?.unloadingPeopleVehiclesGoodsFilePath
}
}
],
unloadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
status: 'done',
url: res?.unloadingPeopleVehiclesGoodsFilePath,
response: {
url: res?.unloadingPeopleVehiclesGoodsFilePath
}
]
};
}
]
};
// 发车时间到车时间初始化
this.loadTime = res?.loadTime;
this.unloadTime = res?.unloadTime;
@ -560,43 +588,43 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
nzContent: AmapPoiPickerComponent,
nzWidth: 900,
nzOnOk: item => {
if(item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
}
if (item?.poi) {
const poi = item.poi;
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
}
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;
});
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;
});
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
return true
} else {
this.service.msgSrv.warning('请重新手动选择地址！')
return false
}
}
});
}
@ -855,11 +883,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
});
};
agreement(value: any) {
if(value ==='1'){
if (value === '1') {
this.modalTitle = '附件信息';
this.modalcontent = this.i?.contractContent?.contractContent;
}else if(value === '2'){
} else if (value === '2') {
this.modalTitle = '补充协议';
this.modalcontent = this.i?.supplementContent?.contractContent;
}