From 1a3091eb1e2803ec71340be895a1bd5ee4c45767 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 22 Dec 2021 11:28:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/order-management/components/risk/risk.component.ts | 4 ++-- .../waybill-management/components/bulk/bulk.component.ts | 2 ++ .../components/vehicle/vehicle.component.ts | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 65879813..a620e7f5 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -417,7 +417,7 @@ export class OrderManagementRiskComponent implements OnInit { this.isVisibleRE = false; this.st.reload() } else { - // this.service.msgSrv.error(res.msg); + this.service.msgSrv.error(res?.msg); } }); } @@ -446,7 +446,7 @@ export class OrderManagementRiskComponent implements OnInit { this.isVisibleRE = false; this.st.reload() } else { - this.service.msgSrv.error(res.msg); + this.service.msgSrv.error(res?.msg); } }); } diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index f745f629..f092e0ad 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -427,10 +427,12 @@ tabs = { { text: '确认发车', click: (_record) => this.sureDepart(_record), + iif: item => item.wayBillStatus == '2' , }, { text: '确认到车', click: (_record) => this.sureArrive(_record), + iif: item => item.wayBillStatus == '3' , }, ], }, diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 75b6f1ec..02650fd7 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -338,10 +338,12 @@ tabs = { { text: '确认发车', click: (_record) => this.sureDepart(_record), + iif: item => item.wayBillStatus == '2' , }, { text: '确认到车', click: (_record) => this.sureArrive(_record), + iif: item => item.wayBillStatus == '3' , }, ], }, From 2a91d9fd80c2195b970a56c8bd23846256be6305 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 22 Dec 2021 20:01:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.html | 32 ++++--- .../components/bulk/bulk.component.ts | 91 ++++++++++++------ .../components/vehicle/vehicle.component.html | 18 ++-- .../components/vehicle/vehicle.component.ts | 11 ++- .../confir-receipt.component.html | 34 +++++-- .../confir-receipt.component.ts | 92 ++++++++++++++++++- .../confir-receipt.component.ts | 55 +++++++---- .../services/order-management.service.ts | 4 + .../components/vehicle/vehicle.component.html | 7 +- .../components/vehicle/vehicle.component.ts | 15 +++ 10 files changed, 270 insertions(+), 89 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 782ee6ca..ccfb7059 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -1,7 +1,7 @@ - + + +
+ +
请上传图片
+
+ + + + + + +
diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts index d19fc369..73f1279a 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts @@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme'; /* * @Author: your name * @Date: 2021-12-14 14:03:07 - * @LastEditTime: 2021-12-21 13:43:08 + * @LastEditTime: 2021-12-22 19:10:07 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts @@ -22,7 +22,16 @@ import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { OrderManagementService } from '../../../services/order-management.service'; - +import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload'; +import { Observable, Observer } from 'rxjs'; +function getBase64(file: File): Promise { + return new Promise((resolve, reject) => { + const reader = new FileReader(); + reader.readAsDataURL(file); + reader.onload = () => resolve(reader.result); + reader.onerror = error => reject(error); + }); +} @Component({ selector: 'app-order-management-confir-receipt', templateUrl: './confir-receipt.component.html', @@ -36,6 +45,9 @@ export class ConfirReceiptComponent implements OnInit { driverList: any; payeeList: any; carList: any; + listImagUrls: any[] = []; + previewImage1 = ''; + previewVisible1 = false; constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService) {} ngOnInit(): void { @@ -44,10 +56,26 @@ export class ConfirReceiptComponent implements OnInit { save(): void { // 大宗 - this.service.request(this.service.$api_get_signBulkOrder, {id: this.i?.id}).subscribe((res: any) => { + console.log(this.listImagUrls) + let imgList : any= []; + if(this.listImagUrls.length > 0) { + this.listImagUrls.forEach((res :any) => { + if(res.url) { + imgList.push(res.url) + } + }) + } + console.log(imgList) + const params = { + id: this.i?.id, + filePathList: imgList, + } + console.log(params) + this.service.request(this.service.$api_get_signBulkOrder, params).subscribe((res: any) => { console.log(res.success) if(res) { this.service.msgSrv.success('确认签收成功！') + this.modal.destroy(); } else { this.service.msgSrv.error(res.msg) } @@ -58,6 +86,16 @@ export class ConfirReceiptComponent implements OnInit { this.service.request(this.service.$api_get_getBulkSignForDetail, {id: this.i?.id}).subscribe((res: any) => { console.log(res) this.detailList = res; + let arr : any= [] + res.filePathList.forEach((element: any, index: any) => { + console.log(index) + arr.push( { + url: element, + status: 'done', + uid: index + }) + }); + this.listImagUrls = arr; this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.payeeId}).subscribe((res: any) => { console.log(res) this.payeeList = res; @@ -81,5 +119,51 @@ export class ConfirReceiptComponent implements OnInit { userAction() { } - + handlePreview1 = async (file: NzUploadFile) => { + if (!file.url && !file.preview) { + file.preview = await getBase64(file.originFileObj!); + } + this.previewImage1 = file.url || file.preview; + this.previewVisible1 = true; + }; + handleChange1(info: NzUploadChangeParam): void { + switch (info.file.status) { + case 'uploading': + break; + case 'done': + let fileList = [...info.fileList]; + // 2. Read from response and show file link + console.log(fileList) + fileList = fileList.map((file: any) => { + if (file.response) { + file.url = file.response.data.fullFilePath; + } + return file; + }); + console.log(this.listImagUrls) + break; + case 'error': + this.service.msgSrv.error('网络错误'); + break; + } + } + beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => { + return new Observable((observer: Observer) => { + const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp'; + if (!isJpgOrPng) { + this.service.msgSrv.warning('只能上传图片!'); + observer.complete(); + return; + } + // tslint:disable-next-line: no-non-null-assertion + const isLt2M = file.size! / 1024 / 1024 < 3; + if (!isLt2M) { + this.service.msgSrv.warning('图片大小超过3兆!'); + observer.complete(); + return; + } + observer.next(isJpgOrPng && isLt2M); + observer.complete(); + }); + }; } diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts index fba3d408..243b2a48 100644 --- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts +++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-15 13:17:42 - * @LastEditTime: 2021-12-21 14:50:54 + * @LastEditTime: 2021-12-22 19:19:25 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\confir-receipt\confir-receipt.component.ts @@ -61,10 +61,24 @@ export class VehicleConfirReceiptComponent implements OnInit { } save(): void { - this.service.request(this.service.$api_get_signWholeOrder, {id: this.i?.id}).subscribe((res: any) => { + let imgList : any= []; + if(this.listImagUrls.length > 0) { + this.listImagUrls.forEach((res :any) => { + if(res.url) { + imgList.push(res.url) + } + }) + } + console.log(imgList) + const params = { + id: this.i?.id, + filePathList: imgList, + } + this.service.request(this.service.$api_get_signWholeOrder, params).subscribe((res: any) => { console.log(res) if(res) { this.service.msgSrv.success('确认签收成功！') + this.modal.destroy(); } else { this.service.msgSrv.error(res.msg) } @@ -101,16 +115,6 @@ export class VehicleConfirReceiptComponent implements OnInit { }); }; initData() { - // if (this.i?.receiptCertificate?.length > 0) { - // this.i?.receiptCertificate.forEach((element: any) => { - // const image = { - // url: element, - // status: 'done', - // uid: '-1' - // }; - // this.listImagUrls.push(image); - // }); - // } // 大宗 this.service.request(this.service.$api_get_getWholeSignForDetail, {id: this.i?.id}).subscribe((res: any) => { console.log(res) @@ -129,6 +133,16 @@ export class VehicleConfirReceiptComponent implements OnInit { cost.traiPrice = element.price } }); + let arr : any= [] + res.filePathList.forEach((element: any, index: any) => { + console.log(index) + arr.push( { + url: element, + status: 'done', + uid: index + }) + }); + this.listImagUrls = arr; this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => { console.log(res) this.payeeList = res; @@ -176,15 +190,16 @@ export class VehicleConfirReceiptComponent implements OnInit { case 'uploading': break; case 'done': - const resData = info.file.response.data; - const arr = [ - { - url: resData.fullFilePath, - status: 'done', - uid: '-1' + let fileList = [...info.fileList]; + // 2. Read from response and show file link + console.log(fileList) + fileList = fileList.map((file: any) => { + if (file.response) { + file.url = file.response.data.fullFilePath; } - ]; - this.listImagUrls = arr; + return file; + }); + console.log(this.listImagUrls) break; case 'error': this.service.msgSrv.error('网络错误'); diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index e35eb4c5..322ef5c0 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -77,6 +77,10 @@ export class OrderManagementService extends BaseService { public $api_insertFreightChangeBulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; // 大宗详情 public $api_getBulkBillDetail = `/api/sdc/billOperate/getBulkBillDetail`; + // 查看运费变更记录详情-大宗 + public $api_getChangeRecordBulkDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordBulkDetail`; + // 查看运费变更记录详情-整车 + public $api_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`; constructor(public injector: Injector) { super(injector) diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index f1010901..bce174df 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@