diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index fa7ecd77..4dbd6634 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -248,7 +248,7 @@ export class DatatableFundReportingComponent implements OnInit { { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' }, { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' }, { title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' }, - { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, + { title: '车牌颜色', index: 'carColorLabel', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' }, { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' }, 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 52d5bad7..1d8a4f94 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 @@ -46,7 +46,7 @@ - {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} {{filterCheckStatus(item?.checkStatus)}} diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 7b27f0bc..f95f59d1 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -76,7 +76,7 @@ export class DriverAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportAccountBalanceDriverByOperatorPage, { ...this.sf.value, pageSize: -1 }); } goBack() { diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html index 9fe32a52..325369c1 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html @@ -1,32 +1,43 @@ - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
- - - {{ (parseFloat(item.availableBalance) + - parseFloat(item.freezeBalance)).toFixed(2) | currency}} - - - \ No newline at end of file + + + {{ + (parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency + }} + + + diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 9d0545cc..99daad10 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -18,7 +18,7 @@ export class DriverAccountComponent implements OnInit { st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - + loading: boolean = true; searchSchema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); _$expand = false; @@ -40,9 +40,16 @@ export class DriverAccountComponent implements OnInit { }); } } + this.loading = true; return requestOptions; }; - + afterRes = (data: any[], rawData?: any) => { + console.log(data) + this.loading = false + return data.map(item => ({ + ...item, + })); + }; showAccountDetail(item: any) { this.modal.create({ nzTitle: '账户明细', @@ -74,7 +81,7 @@ export class DriverAccountComponent implements OnInit { } exportList() { - this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 410c7fac..bb1b21f9 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -83,7 +83,7 @@ export class FreightAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportAccountBalanceShipperByOperatorPage, { ...this.sf.value, pageSize: -1 }); } goBack() { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 610f1efe..5abfbe19 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit { } exportList() { - this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts index ed00c9f4..20acc782 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts @@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportAccountBalanceByPage, { ...this.sf.value, pageSize: -1 }); } goBack() { diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index 0cda0ad8..e1928689 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -46,7 +46,7 @@
- +
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index 87b42163..b69a5245 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -194,4 +194,7 @@ export class PlatformAccountComponent implements OnInit { } ]; } + exportList() { + this.service.downloadFile(this.service.$api_get_exportPlatformAccountBalanceByOperator, { ...this.sf.value, pageSize: -1 }); + } } diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index e45f63bb..01927beb 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -79,7 +79,7 @@ export class RechargeRecordComponent implements OnInit { } exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.downloadFile(this.service.$api_get_exportPageByOperator, { ...this.sf.value, pageSize: -1 }); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index 77fc9628..bd7fb2aa 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -11,7 +11,7 @@ class="text-right"> - + diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index ed60003b..413fe016 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -246,16 +246,16 @@ export class ETCBlacklistComponent implements OnInit { } } }, - params6: { - title: '手机号', - type: 'string', - ui: { - placeholder: '请输入', - visibleIf: { - tabType: (value: number) => this.tabType === 2 - } - } - } + // params6: { + // title: '手机号', + // type: 'string', + // ui: { + // placeholder: '请输入', + // visibleIf: { + // tabType: (value: number) => this.tabType === 2 + // } + // } + // } } }; } 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 e7bf1e89..56dc5ef8 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 @@ -95,7 +95,7 @@ export class ETCInvoicedListComponent implements OnInit { title: '订单类型', ui: { widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, + params: { dictKey: 'bill:type' }, placeholder: '请选择' } }, diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html index 774444c3..5c72a373 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html @@ -12,7 +12,7 @@ class="text-right"> - + - + @@ -114,8 +114,9 @@ - + {{ item.vatname }} diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index ce250896..ca1c11da 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -42,6 +42,8 @@ export class InvoiceDetailComponent implements OnInit { type: any = 1; selectedIndex = 0; + + services: any[] = []; constructor(public service: TicketService, private route: ActivatedRoute) { this.isCanEdit = route.snapshot.queryParams.type === '1'; const expressno = route.snapshot.queryParams.expressno; @@ -54,7 +56,9 @@ export class InvoiceDetailComponent implements OnInit { } } - ngOnInit(): void {} + ngOnInit(): void { + this.getDictByKey(); + } beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatinvHId: this.id }); @@ -67,6 +71,12 @@ export class InvoiceDetailComponent implements OnInit { return requestOptions; }; + getDictByKey() { + this.service.request('/api/mdc/pbc/dictItems/getDictValue', { dictKey: 'invoice:service:type' }).subscribe(res => { + this.services = res; + }); + } + loadInvoiceHeader(id: string) { this.service.request(this.service.$api_get_invoice_header_detail, { id }).subscribe(res => { if (res) { @@ -87,7 +97,23 @@ export class InvoiceDetailComponent implements OnInit { } saveInvoices() { - this.isEdit = false; + const list = this.invoiceST._data.map(item => { + const rs = { ...item }; + delete rs._values; + return rs; + }); + this.service + .request(this.service.$api_update_evatinh, { + id: this.id, + updatEvatinvDetailDTO: list + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('修改成功'); + this.invoiceST.load(1); + this.isEdit = false; + } + }); } /** @@ -107,6 +133,16 @@ export class InvoiceDetailComponent implements OnInit { } } + exportList() { + const params = { listSource: 1, pageSize: -1, vatinvHId: this.id }; + if (this.orderSf) { + Object.assign(params, { + ...this.orderSf.value + }); + } + this.service.exportStart(params, this.service.$api_export_invoice_order_detail); + } + private initOrderSF(): SFSchema { return { properties: { diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 3453d2cb..401e2a10 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -189,6 +189,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { */ resetSF() { this.sf.reset(); + this._$expand = false; } /** @@ -267,7 +268,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { } } }, - orderS22n2: { + drivercarinfo: { type: 'string', title: '车牌号', ui: { 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 1978a0f9..bc45e80e 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 @@ -420,7 +420,7 @@ export class InvoiceRequestedComponent { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '申请编号', render: 'vatappcode', width: 190 }, - { title: '发票类型', index: 'vatapptypeLable', width: 140 }, + { title: '发票类型', index: 'vatapptypeLabel', width: 140 }, { title: '网络货运人', index: 'ltdName', width: 170 }, { title: '货主名称', index: 'artoName', width: 170 }, { title: '订单数', index: 'ordlines', width: 90 }, @@ -459,7 +459,7 @@ export class InvoiceRequestedComponent { params: ({ record }) => ({ value: record.invoicedMoney }) } }, - { title: '已开票张数', index: 'invoicedNum', width: 160 }, + { title: '已开票张数', className: 'text-right', index: 'invoicedNum', width: 160 }, { title: '开户行', index: 'bankName', width: 160 }, { title: '银行账户', index: 'bankAccount', width: 140 }, { title: '注册地址', index: 'registerAddr', width: 140 }, diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 23e50119..7ac5413f 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -1,10 +1,10 @@ /* * @Author: your name * @Date: 2021-12-29 13:12:35 - * @LastEditTime: 2022-01-04 10:36:02 - * @LastEditors: Please set LastEditors + * @LastEditTime : 2022-04-08 16:37:58 + * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\ticket-management\services\ticket.service.ts + * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts */ import { Injectable, Injector } from '@angular/core'; import { EACacheService, ShipperBaseService } from '@shared'; @@ -73,6 +73,8 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_header_detail = '/api/fcc/ficoVatinvH/get'; // 获取分票发票抬头开票申请订单明细 $api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId'; + // 货主/运营端获取开票申请订单明细导出 + $api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatapp'; // 获取分票发票抬头开票申请费用明细 $api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId'; // 获取分票发票明细 @@ -85,6 +87,8 @@ export class TicketService extends ShipperBaseService { $api_delete_deletebatch = '/api/fcc/ficoVatinvH/deletebatch'; // 保存开票申请费用明细 $api_ficoVatappFee_save = '/api/fcc/ficoVatappFee/save'; + // 更新销项发票信息 + $api_update_evatinh = '/api/fcc/ficoVatinvH/updatEvatinvH'; // 查询ETC白名单（货主） $api_get_etc_shipper_list = '/api/fcc/ficoShipperWhiteList/list/page'; @@ -128,6 +132,8 @@ export class TicketService extends ShipperBaseService { // 根据地区code查询列表 $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; + // ETC申请开票导出 + $api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList'; constructor(public injector: Injector) { super(injector); diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 047604d4..91b2323f 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -10,7 +10,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service'; import { CarSettleCarauthComponent } from '../list/carauth/carauth.component'; @Component({ selector: 'app-Vehicle-components-audit', - templateUrl: './audit.component.html', + templateUrl: './audit.component.html' }) export class VehicleComponentsAuditComponent implements OnInit { _$expand = false; @@ -22,7 +22,13 @@ export class VehicleComponentsAuditComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { } + constructor( + public service: VehicleService, + private modal: NzModalService, + private router: Router, + private ar: ActivatedRoute, + private modalHelper: ModalHelper + ) {} /** * 查询字段个数navigate */ @@ -36,26 +42,26 @@ export class VehicleComponentsAuditComponent implements OnInit { get reqParams() { const a: any = {}; if (this.resourceStatus === 1) { - a.approvalStatus = 10 + a.approvalStatus = 10; } else if (this.resourceStatus === 2) { - a.approvalStatus = 20 + a.approvalStatus = 20; } else if (this.resourceStatus === 3) { - a.approvalStatus = 30 + a.approvalStatus = 30; } return { ...a, - ...this.sf?.value, + ...this.sf?.value }; } get selectedRows() { - return this.st?.list.filter((item) => item.checked) || []; + return this.st?.list.filter(item => item.checked) || []; } ngOnInit() { this.initSF(); this.initST(); - this.ar.url.subscribe((params) => { + this.ar.url.subscribe(params => { this.st?.load(1); }); } @@ -71,8 +77,8 @@ export class VehicleComponentsAuditComponent implements OnInit { expand: { type: 'boolean', ui: { - hidden: true, - }, + hidden: true + } }, carNo: { title: '车牌号', @@ -106,7 +112,7 @@ export class VehicleComponentsAuditComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'car:color' }, - containsAllLabel: true, + containsAllLabel: true } }, isSelf: { @@ -114,11 +120,11 @@ export class VehicleComponentsAuditComponent implements OnInit { title: '是否挂靠', enum: [ { label: '是', value: 1 }, - { label: '否', value: 0 }, + { label: '否', value: 0 } ], ui: { widget: 'select', - allowClear: true, + allowClear: true } }, saveUser: { @@ -126,10 +132,10 @@ export class VehicleComponentsAuditComponent implements OnInit { title: '录入人员', ui: { visibleIf: { - expand: (value: boolean) => value, - }, - }, - }, + expand: (value: boolean) => value + } + } + } // approvalStatus: { // type: 'string', // title: '审核状态', @@ -149,7 +155,7 @@ export class VehicleComponentsAuditComponent implements OnInit { // }, // }, // }, - }, + } }; this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; } @@ -162,7 +168,7 @@ export class VehicleComponentsAuditComponent implements OnInit { { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' }, { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' }, { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' }, - { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', }, + { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser' }, { title: '审核状态', className: 'text-center', @@ -176,8 +182,8 @@ export class VehicleComponentsAuditComponent implements OnInit { 10: { text: '待审核', color: 'warning' }, 20: { text: '已审核', color: 'success' }, 30: { text: '已驳回', color: 'error' }, - 40: { text: '证件过期', color: 'error' }, - }, + 40: { text: '证件过期', color: 'error' } + } }, { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' }, { @@ -189,13 +195,13 @@ export class VehicleComponentsAuditComponent implements OnInit { { text: '查看', acl: { ability: ['VEHICLE-AUDIT-view'] }, - click: (item) => { + click: item => { this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); - }, - }, - ], - }, + } + } + ] + } ]; } selectChange(e: number) { @@ -213,7 +219,7 @@ export class VehicleComponentsAuditComponent implements OnInit { this.sf?.setValue('/expand', this._$expand); } creat() { - this.router.navigate(['./new',], { relativeTo: this.ar }); + this.router.navigate(['./new'], { relativeTo: this.ar }); } /** * 重置表单 @@ -224,19 +230,16 @@ export class VehicleComponentsAuditComponent implements OnInit { } // 导出 exportFire() { - this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => { - if(res) { - this.service.msgSrv.success('导出成功,请去右上角下载中心下载') - return - } - }); + let params = Object.assign({}, this.reqParams || {}); + params.pageSize = -1; + this.service.exportStart(params, this.service.$api_carLicenseAudit_export); } addModal() { const i = { - appUserId: '', - } - this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => { - this.st.load() + appUserId: '' + }; + this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe(res => { + this.st.load(); }); } } diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 7f81c557..ef828516 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit { @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { } + constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {} /** * 查询参数 @@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit { expand: (value: boolean) => value } } - }, + } // putOnRecord: { // type: 'string', // title: '是否已备案', @@ -278,7 +278,7 @@ export class VehicleComponentsListComponent implements OnInit { text: '查看', acl: { ability: ['VEHICLE-LIST-view'] }, click: item => { - this.router.navigate(['/vehicle/list/detail/' + item.id] ); + this.router.navigate(['/vehicle/list/detail/' + item.id]); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); } } @@ -308,11 +308,8 @@ export class VehicleComponentsListComponent implements OnInit { } // 导出 exportFire() { - this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => { - if(res) { - this.service.msgSrv.success('导出成功,请去右上角下载中心下载') - return - } - }); + let params = Object.assign({}, this.reqParams || {}); + params.pageSize = -1; + this.service.exportStart(params, this.service.$api_carLicense_export); } } 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 cb6a8a74..e3b993be 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -480,6 +480,6 @@ export class WaybillManagementBulkComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams,this.service.$api_asyncExportBulkList) + this.service.exportStart(this.reqParams,this.service.$api_asyncExportBulkList) } } 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 189a802a..eb87999f 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -489,6 +489,6 @@ export class WaybillManagementVehicleComponent implements OnInit { } // 导出 exprot() { - this.service.asyncExport(this.reqParams, this.service.$api_asyncExportWholeList); + this.service.exportStart(this.reqParams, this.service.$api_asyncExportWholeList); } }