diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 895ed730..a321842f 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -94,7 +94,7 @@ {{ i?.unloadPlanTime }} --> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 + {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
@@ -209,7 +209,7 @@
- +
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 2daee3a6..32ad9e11 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -28,6 +28,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { MapList: any[]=[]; id = this.route.snapshot.params.id; billExpenses: any[] = []; //运费信息表格信息 + pois: any[] = []; i: any; imges: any; totalObj: any; @@ -77,8 +78,22 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; - this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA'); + this.billExpenses = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TRA'); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); + this.pois = [ + { + markerLabel: '起', + color: 'blue', + position: [res.startingPoint.longitude, res.startingPoint.latitude], + title: res.startingPoint.detailedAddress + }, + { + markerLabel: '卸', + color: 'red', + position: [res.endPoint.longitude, res.endPoint.latitude], + title: res.endPoint.detailedAddress + } + ]; } }); this.service.request(this.service.$api_get_getRiskDetail, { id: this.id }).subscribe(res => { diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 2f56ef24..19636437 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -118,7 +118,7 @@ export class OrderManagementBulkComponent implements OnInit { }; } search() { - this.st?.load(1); + this.st?.load(); this.getGoodsSourceStatistical(); } getGoodsSourceStatistical() { diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 3892a179..f2855f77 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -216,7 +216,7 @@
-
+ diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index 585e53cf..d05ad48a 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -94,7 +94,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { title: res.endPoint.detailedAddress } ]; - this.billExpenses = this.i?.billExpenseDetails?.filter( + this.billExpenses = this.i?.billExpenseDetailVOList?.filter( (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html index 16cdb712..5360747c 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html @@ -12,13 +12,13 @@
- +
吨
- +
方
 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 9a58fc6c..12b67875 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,4 +1,3 @@ - import { Component, OnInit, ViewChild } from '@angular/core'; import { DatePipe } from '@angular/common'; import { @@ -32,442 +31,455 @@ export class VehicleSureArriveComponent implements OnInit { i: any; formData: 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: WaybillManagementServe,private datePipe: DatePipe,private envSrv: EAEnvironmentService, ) {} + constructor( + private modal: NzModalRef, + private msgSrv: NzMessageService, + public http: _HttpClient, + public service: WaybillManagementServe, + private datePipe: DatePipe, + private envSrv: EAEnvironmentService + ) {} ngOnInit(): void { - console.log(this.i) - this.initData() + console.log(this.i); + this.initData(); this.i.time = this.i?.loadingTime; this.initSF(); } initSF() { - if(this.Status === 1) { - - this.schema = { - properties: { - time: { - type: 'string', - title: '卸货时间', - format: 'date-time', + if (this.Status === 1) { + this.schema = { + properties: { + time: { + type: 'string', + title: '卸货时间', + format: 'date-time' + }, + imgUrl3: { + type: 'string', + title: '装货凭证', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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 + }, + imgUrl4: { + type: 'string', + title: '', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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格式' + }, + imgUrl1: { + type: 'string', + title: '卸货凭证', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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 + }, + imgUrl2: { + type: 'string', + title: '', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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 + } }, - imgUrl3: { - type: 'string', - title: '装货凭证', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - if (fileType.indexOf(file.type) === -1) { - this.service.msgSrv.warning('图片格式不正确！'); + required: ['time'] + }; + } else { + this.schema = { + properties: { + time: { + type: 'string', + title: '卸货时间', + format: 'date-time' + }, + weight: { + type: 'string', + title: '卸货重量', + ui: { + widget: 'custom' + } + }, + volume: { + type: 'string', + title: '卸货体积', + ui: { + widget: 'custom' + } + }, + imgUrl3: { + type: 'string', + title: '装货凭证', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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(); - return; - } - if (!isLt1M) { - this.service.msgSrv.warning('图片大小超过5M!'); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + imgUrl4: { + type: 'string', + title: '', + readOnly: true, + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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(); - return; - } - observer.next(isLt1M); - observer.complete(); - }); + }); + }, + multiple: false, + listType: 'picture-card' + } as SFUploadWidgetSchema + }, + no4: { + type: 'string', + title: '', + ui: { + widget: 'text' }, - multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' + }, + imgUrl1: { + type: 'string', + title: '卸货凭证', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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 + }, + imgUrl2: { + type: 'string', + title: '', + ui: { + widget: 'upload', + action: apiConf.fileUpload, + accept: '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,image/jpg,image/gif'; + 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 + } }, - imgUrl4: { - type: 'string', - title: '', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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格式', - }, - imgUrl1: { - type: 'string', - title: '卸货凭证', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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, - }, - imgUrl2: { - type: 'string', - title: '', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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: ['time'] - }; - }else { - this.schema = { - properties: { - time: { - type: 'string', - title: '卸货时间', - format: 'date-time', - }, - weight: { - type: 'string', - title: '卸货重量', - ui: { - widget: 'custom', - } - }, - volume: { - type: 'string', - title: '卸货体积', - ui: { - widget: 'custom', - } - }, - imgUrl3: { - type: 'string', - title: '装货凭证', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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, - }, - imgUrl4: { - type: 'string', - title: '', - readOnly: true, - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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格式', - }, - imgUrl1: { - type: 'string', - title: '卸货凭证', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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, - }, - imgUrl2: { - type: 'string', - title: '', - ui: { - widget: 'upload', - action: apiConf.fileUpload, - accept: '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,image/jpg,image/gif'; - 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: ['time','weight','volume' ] - }; - } + required: ['time', 'weight', 'volume'] + }; + } this.ui = { '*': { spanLabelFixed: 100, grid: { span: 20 } }, - $imgUrl1: { grid: { span: 12} }, - $imgUrl2: { grid: { span: 12} }, - $imgUrl3: { grid: { span: 12} }, - $imgUrl4: { grid: { span: 12} }, + $imgUrl1: { grid: { span: 12 } }, + $imgUrl2: { grid: { span: 12 } }, + $imgUrl3: { grid: { span: 12 } }, + $imgUrl4: { grid: { span: 12 } } }; } save(value: any): void { - if(this.Status === 1) { - if(!value.time) { - this.service.msgSrv.warning('卸货时间为空！') + if (this.Status === 1) { + if (!value.time) { + this.service.msgSrv.warning('卸货时间为空！'); return; - } - const params = { + } + const params = { id: this.i.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, imgUrl2: value?.imgUrl2?.data?.fullFilePath, - time: value?.time, - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - - this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认到车成功！') - this.modal.destroy(true); - } - }) - } else { - if(!value.time || !this.data?.volume || !this.data?.weight) { - this.service.msgSrv.warning('卸货时间或卸货重量为空！') - return; - } - const params = { - id: this.i?.id, - imgUrl1: value?.imgUrl1?.data?.fullFilePath, - imgUrl2: value?.imgUrl2?.data?.fullFilePath, - time: value?.time, - volume: this.data?.volume, - weight: this.data?.weight - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认到车成功！') - this.modal.destroy(true); - } - }) - } + time: value?.time + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认到车成功！'); + this.modal.destroy(true); + } + }); + } else { + if (!value?.time) { + this.service.msgSrv.warning('装货时间为空！'); + return; + } + if (!this.data?.volume) { + this.service.msgSrv.warning('装货重量为空！'); + return; + } + if (!this.data?.weight) { + this.service.msgSrv.warning('装货体积为空！'); + return; + } + const params = { + id: this.i?.id, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, + volume: this.data?.volume, + weight: this.data?.weight + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认到车成功！'); + this.modal.destroy(true); + } + }); + } } - // 确认到车界面信息(两个只能看的图片) + // 确认到车界面信息(两个只能看的图片) initData() { - this.service.request(this.service.$api_get_getUnloadCarInfo, { id : this.i?.id}).subscribe((res) => { - console.log(res) + this.service.request(this.service.$api_get_getUnloadCarInfo, { id: this.i?.id }).subscribe(res => { + console.log(res); if (res.imgUrl1) { this.formData = { imgUrl3: [ @@ -477,10 +489,10 @@ export class VehicleSureArriveComponent implements OnInit { status: 'done', url: res.imgUrl1, response: { - url: res.imgUrl1, - }, - }, - ], + url: res.imgUrl1 + } + } + ], imgUrl4: [ { uid: 'logo', @@ -488,16 +500,15 @@ export class VehicleSureArriveComponent implements OnInit { status: 'done', url: res.imgUrl2, response: { - url: res.imgUrl2, - }, - }, - ], + url: res.imgUrl2 + } + } + ] }; } - }) + }); } close(): void { this.modal.destroy(true); } - } diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html index 6da96d05..3c703e39 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html @@ -12,13 +12,13 @@
- +
吨
- +
方
 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 927c3f9d..c51480bf 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,4 +1,3 @@ - import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, @@ -31,37 +30,44 @@ export class VehicleSureDepartComponent implements OnInit { record: any = {}; i: any; Status: any; - data: any ={ + data: any = { weight: '', volume: '' }; @ViewChild('sf', { static: false }) sf!: SFComponent; schema: SFSchema = {}; ui: SFUISchema = {}; - constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: WaybillManagementServe, private envSrv: EAEnvironmentService,private datePipe: DatePipe) {} + constructor( + private modal: NzModalRef, + private msgSrv: NzMessageService, + public http: _HttpClient, + public service: WaybillManagementServe, + private envSrv: EAEnvironmentService, + private datePipe: DatePipe + ) {} ngOnInit(): void { this.initSF(); - console.log(this.i) - this.data.weight = this.i?.weight + console.log(this.i); + this.data.weight = this.i?.weight; this.i.time = this.i.loadingTime; } initSF() { - if(this.Status === 1) { + if (this.Status === 1) { this.schema = { properties: { time: { type: 'string', title: '装货时间', - format: 'date-time', + format: 'date-time' }, no4: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + widget: 'text' + }, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' }, imgUrl1: { type: 'string', @@ -76,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '提货单', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -98,8 +104,8 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, imgUrl2: { type: 'string', @@ -114,7 +120,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '人车货照片', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -136,8 +142,8 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema } }, required: ['time'] @@ -148,29 +154,29 @@ export class VehicleSureDepartComponent implements OnInit { time: { type: 'string', title: '装货时间', - format: 'date-time', + format: 'date-time' }, weight: { type: 'string', title: '装货重量', ui: { - widget: 'custom', - } + widget: 'custom' + } }, volume: { type: 'string', title: '装货体积', ui: { - widget: 'custom', - } + widget: 'custom' + } }, no4: { type: 'string', title: '', ui: { - widget: 'text', - }, - default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式', + widget: 'text' + }, + default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式' }, imgUrl1: { type: 'string', @@ -185,7 +191,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '提货单', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -207,8 +213,8 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema }, imgUrl2: { type: 'string', @@ -223,7 +229,7 @@ export class VehicleSureDepartComponent implements OnInit { urlReName: 'data.fullFileWatermarkPath', descriptionI18n: '人车货照片', data: { - appId: this.envSrv.env.appId, + appId: this.envSrv.env.appId }, name: 'multipartFile', beforeUpload: (file: any, fileList: any) => { @@ -245,69 +251,75 @@ export class VehicleSureDepartComponent implements OnInit { }); }, multiple: false, - listType: 'picture-card', - } as SFUploadWidgetSchema, + listType: 'picture-card' + } as SFUploadWidgetSchema } }, - required: ['time','weight', 'volume'] + required: ['time', 'weight', 'volume'] }; } - + this.ui = { '*': { spanLabelFixed: 100, grid: { span: 20 } }, - $imgUrl1: { grid: { span: 12} }, - $imgUrl2: { grid: { span: 12} }, + $imgUrl1: { grid: { span: 12 } }, + $imgUrl2: { grid: { span: 12 } } }; } save(value: any): void { - if(this.Status === 1) { - if(!value?.time) { - this.service.msgSrv.warning('装货时间为空！') + if (this.Status === 1) { + if (!value?.time) { + this.service.msgSrv.warning('装货时间为空！'); return; - } - const params = { + } + const params = { + id: this.i.id, + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认发车成功！'); + this.modal.destroy(true); + } + }); + } else { + if (!value?.time) { + this.service.msgSrv.warning('装货时间为空！'); + return; + } + if (!this.data?.volume) { + this.service.msgSrv.warning('装货重量为空！'); + return; + } + if (!this.data?.weight) { + this.service.msgSrv.warning('装货体积为空！'); + return; + } + console.log(value); + const params = { id: this.i.id, imgUrl1: value?.imgUrl1?.data?.fullFilePath, imgUrl2: value?.imgUrl2?.data?.fullFilePath, time: value?.time, - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认发车成功！') - this.modal.destroy(true); + volume: this.data?.volume, + weight: this.data?.weight + }; + params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss '); + this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe(res => { + if (res) { + this.service.msgSrv.success('确认发车成功！'); + this.modal.destroy(true); } - }) - } else { - if(!value?.time || !this.data?.volume || !this.data?.weight) { - this.service.msgSrv.warning('装货时间或装货重量为空！') - return; - } - console.log(value) - const params = { - id: this.i.id, - imgUrl1: value?.imgUrl1?.data?.fullFilePath, - imgUrl2: value?.imgUrl2?.data?.fullFilePath, - time: value?.time, - volume: this.data?.volume, - weight: this.data?.weight - } - params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') - this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe((res) => { - if(res) { - this.service.msgSrv.success('确认发车成功！') - this.modal.destroy(true); - } - }) + }); } - } close(): void { this.modal.destroy(true); } - } diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index ac00d884..c9467c22 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -40,14 +40,14 @@
- - - + + + [nzDescription]="i?.endTime"> +
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index 3aa2e92f..4c731269 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -73,7 +73,7 @@ [req]="{ process: beforeReq }" [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" - [loading]="loading" + [loading]="false" >
{{ item?.createUserName }}/{{ item?.createUserPhone }}
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index d5af46f3..26bda239 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -98,7 +98,7 @@ export class SupplyManagementBulkComponent implements OnInit { return requestOptions; }; search() { - this.st?.load(1); + this.st?.load(); this.getGoodsSourceStatistical() } afterRes = (data: any[], rawData?: any) => { diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index d6bd2f80..4b2cbcc9 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -92,13 +92,13 @@ {{i?.unloadPlanTime}} --> - {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 - {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 + { i?.settlementWeight }}吨,{{ i?.settlementVolume }}方