diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
index 2974f6d8..fb343fa0 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@@ -306,7 +306,7 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' },
{ title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' },
{ title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' },
- { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' },
+ { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '100px' },
{ title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' },
{
title: '车牌颜色',
@@ -325,11 +325,11 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '司机姓名', index: 'driverName', className: 'text-center', width: '150px' },
{ title: '司机手机号码', index: 'driverPhone', className: 'text-center', width: '200px' },
{ title: '司机身份证号', index: 'driverIdentityNo', className: 'text-center', width: '150px' },
- { title: '货物信息', render: 'goodsName', className: 'text-center', width: '180px' },
+ { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' },
{ title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' },
- { title: '实际承运人道路运输许可证号', render: 'roadTransportNo', className: 'text-center', width: '150px' },
+ { title: '实际承运人道路运输许可证号', index: 'roadTransportNo', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
@@ -518,7 +518,7 @@ export class DatatableOrderReportingComponent implements OnInit {
* 异步导出
*/
export() {
- this.service.exportStart({...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order);
+ this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order);
}
openWainingModal(content: string, title = '提示') {
diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
index c42174ca..703c57de 100644
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@@ -40,16 +40,16 @@ export class PayableOrderComponent implements OnInit {
if (this.sf.value?.createTime) {
Object.assign(requestOptions.body, {
createTime: {
- start: this.sf.value.createTime?.[0] || null,
- end: this.sf.value.createTime?.[1] || null
+ start: this.sf.value.createTime?.[0] || '',
+ end: this.sf.value.createTime?.[1] || ''
}
});
}
if (this.sf.value?.phxdate) {
Object.assign(requestOptions.body, {
phxdate: {
- start: this.sf.value.phxdate?.[0] || null,
- end: this.sf.value.phxdate?.[1] || null
+ start: this.sf.value.phxdate?.[0] || '',
+ end: this.sf.value.phxdate?.[1] || ''
}
});
}
diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
index 93bb090b..9c15fa53 100644
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@@ -23,23 +23,23 @@ export class PaymentOrderComponent implements OnInit {
_$expand = false;
selectedRows: any[] = [];
- constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
+ constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
- ngOnInit(): void { }
+ ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
let params = { ...this.sf.value };
if (params.payDate) {
- const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] }
+ const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] };
params.payDate = payDate;
}
if (params.payDate2) {
- const payDate2 = { start: this.sf?.value?.payDate2?.[0], end: this.sf?.value?.payDate2?.[1] }
+ const payDate2 = { start: this.sf?.value?.payDate2?.[0], end: this.sf?.value?.payDate2?.[1] };
params.payDate2 = payDate2;
}
if (params.createTime) {
- const createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] }
+ const createTime = { start: this.sf?.value?.createTime?.[0] || '', end: this.sf?.value?.createTime?.[1] || '' };
params.createTime = createTime;
}
Object.assign(requestOptions.body, params);
@@ -95,7 +95,7 @@ export class PaymentOrderComponent implements OnInit {
},
paycode: {
type: 'string',
- title: '付款单号',
+ title: '付款单号'
},
ltdId: {
type: 'string',
@@ -125,7 +125,7 @@ export class PaymentOrderComponent implements OnInit {
widget: 'dict-select',
containsAllLabel: true,
params: { dictKey: 'pay:type' },
- placeholder: '请选择',
+ placeholder: '请选择'
}
},
paymode: {
@@ -264,7 +264,7 @@ export class PaymentOrderComponent implements OnInit {
{
text: '浏览',
click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
- },
+ }
// {
// text: '修改',
// }
diff --git a/src/index.html b/src/index.html
index 3afb9aef..124d149d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,5 +1,5 @@
@@ -82,4 +82,4 @@
// }
\ No newline at end of file
+ -->