diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
index eee013ee..e13fbf66 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@@ -8,9 +8,9 @@
+ acl [acl-ability]="['FUND-REPORTING-search']">查询
-
+
-
-
-
+
+
+
diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
index 295b66ea..ef60a6e7 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@@ -9,9 +9,9 @@
-
-
-
-
+
+
+
+
diff --git a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html
index a4f5ae6e..967041a5 100644
--- a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html
+++ b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html
@@ -3,6 +3,6 @@
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index 7ef8e00f..e2fd7084 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -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;
}
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index b51f4cd7..48c2c347 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -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;
}
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
index 7cf3957c..ed607da7 100644
--- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
+++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
@@ -20,6 +20,7 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
import { Observable, Observer } from 'rxjs';
import { EAEnvironmentService } from '@shared';
import { OrderManagementService } from '../../../services/order-management.service';
+import format from 'date-fns/format';
@Component({
selector: 'app-order-management-voucher-view',
@@ -34,14 +35,14 @@ export class orderManagementVoucherViewComponent implements OnInit {
formData: any;
datas: any;
Status: any;
- data: any ={
+ data: any = {
weight: 0,
volume: 0
};
@ViewChild('sf', { static: false }) sf!: SFComponent;
schema: SFSchema = {};
ui: SFUISchema = {};
- constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService,private datePipe: DatePipe,private envSrv: EAEnvironmentService, ) {}
+ constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { }
ngOnInit(): void {
// console.log(this.i)
@@ -51,406 +52,462 @@ export class orderManagementVoucherViewComponent implements OnInit {
}
initSF() {
console.log(this.Status)
- if(this.Status == 1) {
+ if (this.Status == 1) {
- this.schema = {
-
- properties: {
- loadingLadingBillFilePath: {
- type: 'string',
- title: '装货凭证',
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '提货单',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- },
- loadingPeopleVehiclesGoodsFilePath: {
- type: 'string',
- title: '',
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '人车货照片',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- },
- no4: {
- type: 'string',
- title: '',
- ui: {
- widget: 'text',
- },
- default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
- },
- unloadingLadingBillFilePath: {
- type: 'string',
- title: '卸货凭证',
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '提货单',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- },
- unloadingPeopleVehiclesGoodsFilePath: {
- type: 'string',
- title: '',
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '人车货照片',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- }
- },
- required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
- };
- }else {
- this.schema = {
- properties: {
- no0: {
- type: 'string',
- title: '',
- ui: {
- widget: 'custom',
- },
- },
- loadingLadingBillFilePath: {
- type: 'string',
- title: '装货凭证',
- readOnly: true,
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '提货单',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- },
- loadingPeopleVehiclesGoodsFilePath: {
- type: 'string',
- title: '',
- readOnly: true,
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '人车货照片',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- },
+ this.schema = {
- no4: {
- type: 'string',
- title: '',
- ui: {
- widget: 'text',
- },
- default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+ properties: {
+ loadingLadingBillFilePath: {
+ type: 'string',
+ title: '装货凭证',
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '提货单',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ },
+ loadingPeopleVehiclesGoodsFilePath: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '人车货照片',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ },
+ no4: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'text',
+ },
+ default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+ },
+ unloadingLadingBillFilePath: {
+ type: 'string',
+ title: '卸货凭证',
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '提货单',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ },
+ unloadingPeopleVehiclesGoodsFilePath: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '人车货照片',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ }
},
- no6: {
- type: 'string',
- title: '',
- ui: {
- widget: 'custom',
- },
+ required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
+ };
+ } else {
+ this.schema = {
+ properties: {
+ no0: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'custom',
+ },
+ },
+ loadingLadingBillFilePath: {
+ type: 'string',
+ title: '装货凭证',
+ readOnly: true,
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '提货单',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ },
+ loadingPeopleVehiclesGoodsFilePath: {
+ type: 'string',
+ title: '',
+ readOnly: true,
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '人车货照片',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ },
+
+ no4: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'text',
+ },
+ default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+ },
+ no6: {
+ type: 'string',
+ title: '',
+ ui: {
+ widget: 'custom',
+ },
+ },
+ unloadingLadingBillFilePath: {
+ type: 'string',
+ title: '卸货凭证',
+ readOnly: true,
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '提货单',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ },
+ unloadingPeopleVehiclesGoodsFilePath: {
+ type: 'string',
+ title: '',
+ readOnly: true,
+ ui: {
+ widget: 'upload',
+ action: apiConf.waterFileUpload,
+ fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ limit: 1,
+ limitFileCount: 1,
+ resReName: 'data.fullFileWatermarkPath',
+ urlReName: 'data.fullFileWatermarkPath',
+ descriptionI18n: '人车货照片',
+ data: {
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
+ },
+ name: 'multipartFile',
+ beforeUpload: (file: any, fileList: any) => {
+ return new Observable((observer: Observer) => {
+ const isLt1M = file.size / 1024 / 1024 < 5;
+ const fileType = 'image/png,image/jpeg';
+ if (fileType.indexOf(file.type) === -1) {
+ this.service.msgSrv.warning('图片格式不正确！');
+ observer.complete();
+ return;
+ }
+ if (!isLt1M) {
+ this.service.msgSrv.warning('图片大小超过5M!');
+ observer.complete();
+ return;
+ }
+ observer.next(isLt1M);
+ observer.complete();
+ });
+ },
+ multiple: false,
+ listType: 'picture-card',
+ } as SFUploadWidgetSchema,
+ }
},
- unloadingLadingBillFilePath: {
- type: 'string',
- title: '卸货凭证',
- readOnly: true,
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '提货单',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- },
- unloadingPeopleVehiclesGoodsFilePath: {
- type: 'string',
- title: '',
- readOnly: true,
- ui: {
- widget: 'upload',
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
- limit: 1,
- limitFileCount: 1,
- resReName: 'data.fullFileWatermarkPath',
- urlReName: 'data.fullFileWatermarkPath',
- descriptionI18n: '人车货照片',
- data: {
- appId: this.envSrv.env.appId,
- },
- name: 'multipartFile',
- beforeUpload: (file: any, fileList: any) => {
- return new Observable((observer: Observer) => {
- const isLt1M = file.size / 1024 / 1024 < 5;
- const fileType = 'image/png,image/jpeg';
- if (fileType.indexOf(file.type) === -1) {
- this.service.msgSrv.warning('图片格式不正确！');
- observer.complete();
- return;
- }
- if (!isLt1M) {
- this.service.msgSrv.warning('图片大小超过5M!');
- observer.complete();
- return;
- }
- observer.next(isLt1M);
- observer.complete();
- });
- },
- multiple: false,
- listType: 'picture-card',
- } as SFUploadWidgetSchema,
- }
- },
- required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
- };
- }
+ required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
+ };
+ }
this.ui = {
'*': {
spanLabelFixed: 100,
grid: { span: 20 }
},
- $unloadingLadingBillFilePath: { grid: { span: 12} },
- $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
- $loadingLadingBillFilePath: { grid: { span: 12} },
- $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
+ $unloadingLadingBillFilePath: { grid: { span: 12 } },
+ $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
+ $loadingLadingBillFilePath: { grid: { span: 12 } },
+ $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
};
}
save(value: any): void {
- if(!this.sf.valid) {
- this.service.msgSrv.warning('必填项为空！')
- return;
- }
- console.log(value)
- const params = {
- id: this.i?.id,
- loadingLadingBillFilePath: value?.loadingLadingBillFilePath?.data?.fullFilePath,
- loadingPeopleVehiclesGoodsFilePath: value?.loadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
- unloadingLadingBillFilePath: value?.unloadingLadingBillFilePath?.data?.fullFilePath,
- unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
+ if (!this.sf.valid) {
+ this.service.msgSrv.warning('必填项为空！')
+ return;
+ }
+ console.log(value)
+ const params = {
+ id: this.i?.id,
+ loadingLadingBillFilePath: value?.loadingLadingBillFilePath?.data?.fullFilePath,
+ loadingPeopleVehiclesGoodsFilePath: value?.loadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
+ unloadingLadingBillFilePath: value?.unloadingLadingBillFilePath?.data?.fullFilePath,
+ unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
+ }
+ console.log(params)
+ this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {
+ if (res) {
+ this.service.msgSrv.success('修改成功！')
+ this.modal.destroy(true);
}
- console.log(params)
- this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {
- if(res) {
- this.service.msgSrv.success('修改成功！')
- this.modal.destroy(true);
- }
- })
+ })
}
sure() {
const params = [this.i?.id];
- this.service.downloadFile(this.service.$api_createBillTakeGoods,params)
- this.service.downloadFile(this.service.$api_createBillDischargeGoods,params)
- this.service.msgSrv.success('生成电子单据成功！')
- this.modal.destroy(true);
+ this.service.downloadFile(this.service.$api_createBillTakeGoods, params)
+ this.service.downloadFile(this.service.$api_createBillDischargeGoods, params)
+ this.service.msgSrv.success('生成电子单据成功！')
+ this.modal.destroy(true);
}
- // 确认到车界面信息(两个只能看的图片)
+ // 确认到车界面信息(两个只能看的图片)
initData() {
- this.service.request(this.service.$api_get_getCredentials, { id : this.i?.id}).subscribe((res) => {
+ this.service.request(this.service.$api_get_getCredentials, { id: this.i?.id }).subscribe((res) => {
console.log(res)
this.datas = res
- if (res.unloadingLadingBillFilePath) {
- this.formData = {
+ if (res.unloadingLadingBillFilePath) {
+ this.formData = {
loadingLadingBillFilePath: [
{
uid: 'logo',
@@ -461,30 +518,30 @@ export class orderManagementVoucherViewComponent implements OnInit {
url: res.loadingLadingBillFilePath,
},
},
- ],
- loadingPeopleVehiclesGoodsFilePath: [
- {
- uid: 'logo',
- name: 'LOGO',
- status: 'done',
- url: res.loadingPeopleVehiclesGoodsFilePath,
- response: {
- url: res.loadingPeopleVehiclesGoodsFilePath,
- },
- },
- ],
- unloadingLadingBillFilePath: [
- {
- uid: 'logo',
- name: 'LOGO',
- status: 'done',
- url: res.unloadingLadingBillFilePath,
- response: {
- url: res.unloadingLadingBillFilePath,
- },
- },
- ],
- unloadingPeopleVehiclesGoodsFilePath: [
+ ],
+ loadingPeopleVehiclesGoodsFilePath: [
+ {
+ uid: 'logo',
+ name: 'LOGO',
+ status: 'done',
+ url: res.loadingPeopleVehiclesGoodsFilePath,
+ response: {
+ url: res.loadingPeopleVehiclesGoodsFilePath,
+ },
+ },
+ ],
+ unloadingLadingBillFilePath: [
+ {
+ uid: 'logo',
+ name: 'LOGO',
+ status: 'done',
+ url: res.unloadingLadingBillFilePath,
+ response: {
+ url: res.unloadingLadingBillFilePath,
+ },
+ },
+ ],
+ unloadingPeopleVehiclesGoodsFilePath: [
{
uid: 'logo',
name: 'LOGO',
@@ -494,7 +551,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
url: res.unloadingPeopleVehiclesGoodsFilePath,
},
},
- ],
+ ],
};
}
})
@@ -503,7 +560,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
this.modal.destroy(true);
}
openlaod(value: any) {
- if(value === 1) {
+ if (value === 1) {
const a = document.createElement('a');
a.href = this.datas?.loadingElectronicsLadingBillFilePath;
document.body.appendChild(a);
@@ -518,6 +575,6 @@ export class orderManagementVoucherViewComponent implements OnInit {
a.click(); //点击下载
document.body.removeChild(a); //下载完成移除元素
}
-
+
}
}
diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
index 6bf8d513..d39e4110 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
@@ -1,24 +1,17 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
import { DatePipe } from '@angular/common';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
import {
- SFComponent,
- SFCustomWidgetSchema,
- SFDateWidgetSchema,
- SFNumberWidgetSchema,
- SFRadioWidgetSchema,
- SFSchema,
- SFSelectWidgetSchema,
- SFTextareaWidgetSchema,
- SFUISchema,
+ SFComponent, SFSchema, SFUISchema,
SFUploadWidgetSchema
} from '@delon/form';
-import { apiConf } from '@conf/api.conf';
import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
+import format from 'date-fns/format';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
-import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
import { Observable, Observer } from 'rxjs';
-import { EAEnvironmentService } from '@shared';
+import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
@Component({
selector: 'app-order-management-vehicle-sure-arrive',
@@ -45,7 +38,7 @@ export class VehicleSureArriveComponent implements OnInit {
public service: WaybillManagementServe,
private datePipe: DatePipe,
private envSrv: EAEnvironmentService
- ) {}
+ ) { }
ngOnInit(): void {
console.log(this.i);
@@ -67,7 +60,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '装货凭证',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -75,7 +68,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -105,7 +105,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -113,7 +113,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -151,7 +158,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '卸货凭证',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -159,7 +166,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -189,7 +203,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -197,7 +211,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -252,7 +273,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '装货凭证',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -260,7 +281,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -290,7 +318,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -298,7 +326,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -336,7 +371,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '卸货凭证',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -344,7 +379,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -374,7 +416,7 @@ export class VehicleSureArriveComponent implements OnInit {
title: '',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -382,7 +424,14 @@ export class VehicleSureArriveComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.unloadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -426,7 +475,7 @@ export class VehicleSureArriveComponent implements OnInit {
console.log(this.Status);
console.log(value?.imgUrl3?.data?.fullFilePath);
console.log(value?.imgUrl3?.url);
-
+
if (this.Status === 1) {
if (!value.time) {
this.service.msgSrv.warning('卸货时间为空！');
@@ -442,7 +491,7 @@ export class VehicleSureArriveComponent implements OnInit {
};
params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ');
console.log(params);
-
+
this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe(res => {
if (res) {
this.service.msgSrv.success('确认到车成功！');
diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
index c51480bf..5da8c701 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
@@ -1,24 +1,17 @@
+import { DatePipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
+import { apiConf } from '@conf/api.conf';
import {
- SFComponent,
- SFCustomWidgetSchema,
- SFDateWidgetSchema,
- SFNumberWidgetSchema,
- SFRadioWidgetSchema,
- SFSchema,
- SFSelectWidgetSchema,
- SFTextareaWidgetSchema,
- SFUISchema,
+ SFComponent, SFSchema, SFUISchema,
SFUploadWidgetSchema
} from '@delon/form';
-import { apiConf } from '@conf/api.conf';
import { _HttpClient } from '@delon/theme';
+import { EAEnvironmentService } from '@shared';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { Observable, Observer } from 'rxjs';
import { WaybillManagementServe } from 'src/app/routes/waybill-management/services/waybill-management.service';
-import { EAEnvironmentService, EADateUtil } from '@shared';
-import { DatePipe } from '@angular/common';
+import format from 'date-fns/format';
@Component({
selector: 'app-order-management-vehicle-sure-depart',
@@ -44,7 +37,7 @@ export class VehicleSureDepartComponent implements OnInit {
public service: WaybillManagementServe,
private envSrv: EAEnvironmentService,
private datePipe: DatePipe
- ) {}
+ ) { }
ngOnInit(): void {
this.initSF();
@@ -82,7 +75,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -112,7 +112,7 @@ export class VehicleSureDepartComponent implements OnInit {
title: '',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -120,7 +120,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {
@@ -183,7 +190,7 @@ export class VehicleSureDepartComponent implements OnInit {
title: '装货凭证',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -191,7 +198,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '提货单',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.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 VehicleSureDepartComponent implements OnInit {
title: '',
ui: {
widget: 'upload',
- action: apiConf.fileUpload,
+ action: apiConf.waterFileUpload,
accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
@@ -229,7 +243,14 @@ export class VehicleSureDepartComponent implements OnInit {
urlReName: 'data.fullFileWatermarkPath',
descriptionI18n: '人车货照片',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
+ content: [
+ `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`,
+ `上传位置:${this.record?.loadingAddressArr[0]}`,
+ `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+ ],
+ position: '2',
+ fontSize: '100'
},
name: 'multipartFile',
beforeUpload: (file: any, fileList: any) => {