diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index 781749ac..2ed32290 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -6,7 +6,7 @@
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 34159b1f..0ae727c7 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; @@ -23,13 +23,21 @@ export class DatatableReportingVerifyResultComponent implements OnInit { get reqParams() { return { subjectType: this.subjectType, - subjectId: this.record?.orderId + subjectId: this.record?.orderId, + }; } + constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { } + beforeReq(requestOptions: STRequestOptions) { + delete requestOptions?.body?.pageSize; + delete requestOptions?.body?.pageIndex; + return requestOptions; + } + ngOnInit(): void { this.initST(); } @@ -76,8 +84,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } selectTab(e: any) { + this.subjectType = e?.value; setTimeout(() => { - this.subjectType = e?.value; this.st.load(1); }) } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index bd2dffe4..0c1d57e9 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -13,12 +13,13 @@
-
+
-
+
@@ -22,7 +22,7 @@ {{i?.representationsStatusLabel}} {{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }} {{i?.carNo}} - {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} + {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} {{i?.loadTime}} {{i?.unloadTime}} {{i?.loadingPlace}} 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 2132950a..0bc13d3a 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 15:12:24 + * @LastEditTime : 2022-04-11 19:26:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -560,6 +560,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { + if(item?.poi) { const poi = item.poi; const locList = poi.pois; switch (type) { @@ -591,6 +592,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { this.totalTime = res?.time; }); } + return true + } else { + this.service.msgSrv.warning('请重新手动选择地址！') + return false + } } }); } 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 13e8bb1d..607a26a9 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 14:35:08 + * @LastEditTime : 2022-04-11 22:29:34 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -244,4 +244,25 @@ export class OrderManagementService extends ShipperBaseService { constructor(public injector: Injector) { super(injector); } + public reviewPDF(url: string) { + if (!url) { + return; + } + const uA = window.navigator.userAgent; // 判断浏览器内核 + const isIE = + /msie\s|trident\/|edge\//i.test(uA) && + !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); + const objectUrl = url; + const a = document.createElement('a'); + document.body.appendChild(a); + a.href = objectUrl; + a.download = '附件.pdf'; + if (isIE) { + // 兼容IE11无法触发下载的问题 + (navigator as any).msSaveBlob(url, a.download); + } else { + a.click(); + } + a.remove(); + } } diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 57f100ae..722bb487 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -838,6 +838,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { + if(item?.poi) { const poi = item.poi; const locList = poi.location.toString().split(','); switch (type) { @@ -869,6 +870,11 @@ export class SupplyManagementBulkPublishComponent implements OnInit { this.totalTime = res.time; }); } + return true + } else { + this.service.msgSrv.warning('请重新手动选择地址！') + return false + } } }); } diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 78ce97a5..d7383ec2 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -725,6 +725,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { + if(item?.poi) { const poi = item.poi; const locList = poi.pois; switch (type) { @@ -753,6 +754,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { this.totalTime = res.time; }); } + return true + } else { + this.service.msgSrv.warning('请重新手动选择地址！') + return false + } } }); } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 3c8848cd..107e87f5 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -1080,37 +1080,44 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { - 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; - this.getInsurersPrice(); // 计算保费金额 - }); + console.log(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 (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; + this.getInsurersPrice(); // 计算保费金额 + }); + } + return true + } else { + this.service.msgSrv.warning('请重新手动选择地址！') + return false } } }); diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 0f607efa..4b8b2798 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -999,6 +999,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { + if(item?.poi) { const poi = item.poi; const locList = poi.pois; switch (type) { @@ -1029,6 +1030,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.getInsurersPrice(); // 计算保费金额 }); } + return true + } else { + this.service.msgSrv.warning('请重新手动选择地址！') + return false + } } }); } diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index 6a71e343..bb3aae92 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -38,7 +38,7 @@ export class ETCInvoicedListComponent implements OnInit { nzTitle: '运单交易明细', nzContent: TransactionDetailsComponent, nzWidth: 900, - nzComponentParams: { data: [] }, + nzComponentParams: { data: item }, nzOnOk: com => { console.log(com.selectedData); }, @@ -147,8 +147,8 @@ export class ETCInvoicedListComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '运单号', index: 'wayBillCode' }, - { title: '订单号', index: 'billCode' }, + { title: '运单号', index: 'wayBillCode',width: 200 }, + { title: '订单号', index: 'billCode',width: 200 }, { title: '开票状态', index: 'invoicingStatus', @@ -157,12 +157,12 @@ export class ETCInvoicedListComponent implements OnInit { width: 120 }, { title: '订单类型', index: 'billTypeLabel', width: 120 }, - { title: '装货地', index: 'loadingPlace' }, - { title: '卸货地', index: 'dischargePlace' }, - { title: '司机信息', render: 'call1No' }, - { title: '车辆信息', render: 'call12No' }, - { title: '托运人', index: 'shipperAppUserName' }, - { title: '网络货运人', index: 'enterpriseInfoName' }, + { title: '装货地', index: 'loadingPlace',width: 200 }, + { title: '卸货地', index: 'dischargePlace' ,width: 200}, + { title: '司机信息', render: 'call1No' ,width: 200}, + { title: '车辆信息', render: 'call12No',width: 200 }, + { title: '托运人', index: 'shipperAppUserName',width: 200 }, + { title: '网络货运人', index: 'enterpriseInfoName' ,width: 200}, { title: '开票金额', index: 'invoicingAmount', @@ -179,10 +179,11 @@ export class ETCInvoicedListComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicingNumber }) } }, - { title: '申请时间', index: 'orderReceivingTime', type: 'date' }, + { title: '申请时间', index: 'orderReceivingTime', type: 'date',width: 200 }, { title: '操作', className: 'text-center', + width: 120, buttons: [ { text: '交易明细', diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html index 2dbe9ec4..c5ec8500 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html @@ -1,16 +1,32 @@ +
-
- -
-
- - -
+
+ +
+
+ + +
- -
\ No newline at end of file + +
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts index 9af44778..56fe6d59 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-14 14:17:38 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-11 21:33:13 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-list\\transaction-details\\transaction-details.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; @@ -10,7 +20,7 @@ import { TicketService } from '../../../services/ticket.service'; templateUrl: './transaction-details.component.html' }) export class TransactionDetailsComponent implements OnInit { - data = []; + data :any= []; selectedData = []; url = `/api/fcc/ficoEtcInvoiceH/list/page`; @ViewChild('st', { static: true }) @@ -21,7 +31,7 @@ export class TransactionDetailsComponent implements OnInit { { title: '交易id', index: 'id' }, { title: '交易流水号', index: 'tradeFlowNo' }, { title: '交易金额', index: 'fee' }, - { title: '开票状态', index: 'state', type: 'enum', enum: { '0': '待开具', '1': '开具中', '2': '已开具', '3': '开票失败' } }, + { title: '开票状态', index: 'stateLabel' }, { title: '交易时间', index: 'exTime', type: 'date' } ]; searchSchema: SFSchema = { @@ -53,24 +63,29 @@ export class TransactionDetailsComponent implements OnInit { } }; - reqParams = {}; constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} - ngOnInit(): void {} - - beforeReq = (requestOptions: STRequestOptions) => { - if (this.sf) { - Object.assign(requestOptions.body, { - ...this.sf.value, - exTime: { - start: this.sf.value.exTime?.[0] || null, - end: this.sf.value.exTime?.[1] || null - } - }); + ngOnInit(): void { + console.log(this.data); + + } + get reqParams() { + const a: any = {}; + if (this.data?.id) { + a.wayBillId = this.data?.wayBillId; } - return requestOptions; - }; + const params: any = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + return { + ...a, + ...params, + exTime: { + start: this.sf?.value?.exTime?.[0] || '', + end: this.sf?.value?.exTime?.[1] || '' + } + }; + } /** * 重置表单 diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index f7fb8a20..1f5cb96d 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -52,7 +52,7 @@ (click)="this.rejectAction(selectedRows)">驳回 - +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index bc45e80e..c58695a6 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -165,7 +165,7 @@ export class InvoiceRequestedComponent { return; } const modal = this.nzModalService.create({ - nzTitle: '打印面单', + nzTitle: '快递下单', nzContent: PrintOrderModalComponent, nzWidth: 650, nzComponentParams: { vatappcodes: this.selectedRows.map(item => item.vatappcode) }, diff --git a/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts index 49e4d2a7..c7e8acc9 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts @@ -39,12 +39,14 @@ export class PrintOrderModalComponent implements OnInit { sure() { if (this.type === 1) { - this.service.request(this.service.$api_create_express, this.vatappcodes).subscribe(res => { - if (res?.length > 0) { - this.getPDF(res); - } else { - this.service.msgSrv.warning('请到快递信息页面打印'); - this.modal.destroy(true); + this.service.request(this.service.$api_create_express + '?_allow_badcode=true', this.vatappcodes).subscribe(res => { + if (res.status === 200) { + if (res?.data?.length > 0) { + this.getPDF(res.data); + } else { + this.service.msgSrv.success('快递下单成功，请到快递信息页面打印'); + this.modal.destroy(true); + } } }); } else { @@ -62,12 +64,14 @@ export class PrintOrderModalComponent implements OnInit { delete this.data.scontactInfo.ltdId; delete this.data.scontactInfo.shipperId; delete this.data.scontactInfo.id; - this.service.request(this.service.$api_get_order_summary, params).subscribe(res => { - if (res?.length > 0) { - this.service.reviewPDF(res); - } else { - this.service.msgSrv.warning('请到快递信息页面打印'); - this.modal.destroy(true); + this.service.request(this.service.$api_get_order_summary + '?_allow_badcode=true', params).subscribe(res => { + if (res.status === 200) { + if (res?.data?.length > 0) { + this.service.reviewPDF(res?.data); + } else { + this.service.msgSrv.success('快递下单成功，请到快递信息页面打印'); + this.modal.destroy(true); + } } }); } @@ -80,14 +84,12 @@ export class PrintOrderModalComponent implements OnInit { this.modal.destroy(true); this.service.reviewPDF(res.pdfUrl); } else { - this.service.msgSrv.warning('下载失败'); + this.service.msgSrv.success('快递下单成功，请到快递信息页面打印'); this.modal.destroy(true); } }); } - - close() { this.modal.destroy(); }