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 fd6157e3..1d704f71 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 @@ -28,7 +28,7 @@ export class DatatableFundReportingComponent implements OnInit { { name: '异常', value: '4' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 + selectedIndex = '1'; //选择的项目 serviceTel = ''; constructor( public service: ReportingService, @@ -51,7 +51,7 @@ export class DatatableFundReportingComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex, + uploadStatus: this.selectedIndex, }); delete params._$expand; return { ...params }; @@ -237,7 +237,7 @@ export class DatatableFundReportingComponent implements OnInit { { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '250px' }, - { title: '付款方式', index: 'payType', className: 'text-center', width: '180px' }, + { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '180px' }, { title: '车队长', index: 'payee', className: 'text-center', width: '250px' }, { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '200px' }, @@ -281,7 +281,7 @@ export class DatatableFundReportingComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); }) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 1c0a7051..f40d2d70 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -34,7 +34,6 @@ export class OrderManagementComplaintDetailComponent implements OnInit { } ngOnInit(): void { - if (this.id) { this.getDetail(this.id); @@ -64,7 +63,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit { initSF() { this.schema = { properties: { - complaintCauseLabel: { + drvComplaintCauseLabel: { title: '投诉原因', type: 'string', maxLength: 30, @@ -82,7 +81,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit { change: (value, orgData) => console.log(value, orgData), } as SFSelectWidgetSchema, }, - complainantPartyLabel: { + handlerIdLabel: { title: '司机', type: 'string', maxLength: 30, diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index cc8d7995..835a7e4c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 11:10:20 + * @LastEditTime : 2022-03-31 16:05:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -82,7 +82,7 @@
- {{ data.expenseName }}:{{ data.price | currency }} + {{ data.expenseName }}:{{ data?.expenseCode === 'FL' ? (data.price * 100 + '%' ) : (data.price | currency) }} 待申请 已支付