优化
This commit is contained in:
weiyu
@ -23,10 +23,15 @@
|
||||
</nz-card>
|
||||
|
||||
<nz-card class="content-box" nzBordered>
|
||||
<st #st [data]="service.$api_get_invoice_logs_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
|
||||
<st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
|
||||
[loading]="false" [scroll]="{ x:'1200px' }">
|
||||
<ng-template st-row="call3No" let-item let-index="index" let-column="column">
|
||||
{{item.driverName}}<br>{{item.driverCellphone}}
|
||||
<ng-template st-row="sts" let-item let-index="index" let-column="column">
|
||||
<span *ngIf="item.sts === '1'">待受理</span>
|
||||
<span *ngIf="item.sts === '2'">处理中</span>
|
||||
<span *ngIf="item.sts === '3'">已完成</span>
|
||||
<span *ngIf="item.sts === '5'">已拒绝</span>
|
||||
<span *ngIf="item.sts === '6'">已撤销</span>
|
||||
<span *ngIf="item.sts === '7'">已作废</span>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
@ -20,22 +20,14 @@ export class BillingOrderComponent implements OnInit {
|
||||
|
||||
_$expand = false;
|
||||
|
||||
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
|
||||
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) { }
|
||||
|
||||
ngOnInit(): void {}
|
||||
ngOnInit(): void { }
|
||||
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
exTime: {
|
||||
start: this.sf.value.exTime?.[0] || '',
|
||||
end: this.sf.value.exTime?.[1] || ''
|
||||
},
|
||||
invoiceMakeTime: {
|
||||
start: this.sf.value.invoiceMakeTime?.[0] || '',
|
||||
end: this.sf.value.invoiceMakeTime?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
@ -91,7 +83,6 @@ export class BillingOrderComponent implements OnInit {
|
||||
serviceType: {
|
||||
title: '服务类型',
|
||||
type: 'string',
|
||||
default: '',
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
@ -101,14 +92,14 @@ export class BillingOrderComponent implements OnInit {
|
||||
}
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseName: {
|
||||
shipperAppUserName: {
|
||||
type: 'string',
|
||||
title: '货主名称',
|
||||
ui: {
|
||||
placeholder: '请输入',
|
||||
}
|
||||
},
|
||||
vatappHCode: {
|
||||
vatappcode: {
|
||||
type: 'string',
|
||||
title: '申请编号',
|
||||
ui: {
|
||||
@ -128,19 +119,19 @@ export class BillingOrderComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
createTime: {
|
||||
vatappdate: {
|
||||
title: '申请时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to-search',
|
||||
format: 'yyyy-MM-dd HH:mm:ss',
|
||||
nzShowTime: true,
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
invoicingStatus: {
|
||||
sts: {
|
||||
type: 'string',
|
||||
title: '开票状态',
|
||||
ui: {
|
||||
@ -150,10 +141,9 @@ export class BillingOrderComponent implements OnInit {
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
},
|
||||
default: ''
|
||||
}
|
||||
},
|
||||
invoiceNum: {
|
||||
invoiceno: {
|
||||
type: 'string',
|
||||
title: '发票号码',
|
||||
ui: {
|
||||
@ -164,30 +154,19 @@ export class BillingOrderComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
approvalTime: {
|
||||
title: '审核时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to-search',
|
||||
format: 'yyyy-MM-dd HH:mm:ss',
|
||||
nzShowTime: true,
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
invoiceMakeTime: {
|
||||
invoicedate: {
|
||||
title: '开票日期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to-search',
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
ltdId: {
|
||||
enterpriseInfoId: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
@ -198,8 +177,7 @@ export class BillingOrderComponent implements OnInit {
|
||||
expand: (value: boolean) => value
|
||||
},
|
||||
asyncData: () => this.service.getNetworkFreightForwarder()
|
||||
},
|
||||
default: ''
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -207,97 +185,95 @@ export class BillingOrderComponent implements OnInit {
|
||||
|
||||
private initST(): STColumn[] {
|
||||
return [
|
||||
{ title: '订单号', index: 'billCode', width: 180 },
|
||||
{ title: '运单号', index: 'waybillCode', width: 180 },
|
||||
{ title: '银行类型', index: 'bankTypeLabel', width: 100 },
|
||||
{ title: '网络货运人', index: 'enterpriseInfoName', width: 220 },
|
||||
{ title: '订单号', index: 'billCode', className: 'text-center', width: 180 },
|
||||
{ title: '运单号', index: 'wayBillCode', width: 180,className: 'text-center'},
|
||||
{ title: '银行类型', index: 'bankType', width: 100,className: 'text-center' },
|
||||
{ title: '网络货运人', index: 'enterpriseInfoName', width: 220,className: 'text-center' },
|
||||
{
|
||||
title: '开票金额（元）',
|
||||
index: 'invoiceAmount',
|
||||
title: '开票金额', // TODO
|
||||
index: 'vatmoney',
|
||||
width: 120,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
className: 'text-center',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
|
||||
},
|
||||
{
|
||||
title: '总费用（元）',
|
||||
title: '总费用',
|
||||
index: 'totalAmount',
|
||||
width: 120,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
className: 'text-center',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
|
||||
},
|
||||
{
|
||||
title: '运输费（元）',
|
||||
index: 'shippingFee',
|
||||
title: '运输费',
|
||||
index: 'price',
|
||||
width: 120,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
className: 'text-center',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shippingFee }) }
|
||||
},
|
||||
{
|
||||
title: '技术服务费（元）',
|
||||
index: 'invoiceAmount',
|
||||
title: '技术服务费',
|
||||
index: 'insurancePremium',
|
||||
width: 120,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
className: 'text-center',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
|
||||
},
|
||||
{
|
||||
title: '附加费（元）',
|
||||
index: 'aliasFee',
|
||||
title: '附加费',
|
||||
index: 'surcharge',
|
||||
width: 120,
|
||||
type: 'widget',
|
||||
className: 'text-right',
|
||||
className: 'text-center',
|
||||
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.aliasFee }) }
|
||||
},
|
||||
{
|
||||
title: '附加费率',
|
||||
className: 'text-right',
|
||||
index: 'aliasFeeRatio',
|
||||
className: 'text-center',
|
||||
index: 'paymentMethodRate',
|
||||
width: 130,
|
||||
format: record => `${record.aliasFeeRatio}%`
|
||||
format: record => `${record.paymentMethodRate}%`
|
||||
},
|
||||
{ title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' },
|
||||
{ title: '所属项目', index: 'projectName', width: 100 },
|
||||
{ title: '货主名称', index: 'shipperAppUserName',width: '180px', className: 'text-center' },
|
||||
{ title: '所属项目', index: 'enterpriseProjectName',width: '180px', className: 'text-center', },
|
||||
{
|
||||
title: '服务类型',
|
||||
index: 'serviceTypeLabel',
|
||||
width: 150
|
||||
index: 'serviceType',
|
||||
width: '180px',
|
||||
className: 'text-center'
|
||||
},
|
||||
{ title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-left' },
|
||||
{ title: '卸货地', index: 'dischargeAddress', className: 'text-center'},
|
||||
{ title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' },
|
||||
{ title: '车牌号', index: 'carNo', width: 100 },
|
||||
{ title: '装货地', index: 'consignor',width: '180px', className: 'text-center' },
|
||||
{ title: '卸货地', index: 'consignee',width: '180px', className: 'text-center' },
|
||||
{ title: '货物信息', index: 'goodsName', className: 'text-center',width: '180px' },
|
||||
{ title: '车牌号', index: 'carNo',className: 'text-center',width: '180px' },
|
||||
{
|
||||
title: '承运司机',
|
||||
className: 'text-right',
|
||||
width: '150px',
|
||||
render: 'driverName'
|
||||
className: 'text-center',
|
||||
width: '180px',
|
||||
},
|
||||
{
|
||||
title: '车队长',
|
||||
className: 'text-left',
|
||||
className: 'text-center',
|
||||
width: '180px',
|
||||
index: 'payeeName',
|
||||
render: 'payeeName'
|
||||
index: 'carCaptainName',
|
||||
},
|
||||
{ title: '业务员',width: '100px', index: 'salesmanName',className: 'text-center', },
|
||||
{ title: '录单时间', index: 'recordTime',type: 'date', className: 'text-center', width: '150px' },
|
||||
{ title: '装货时间', index: 'loadingTime', type: 'date', width: '150px',className: 'text-center', },
|
||||
{ title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px',className: 'text-center', },
|
||||
{ title: '订单完成时间', index: 'billfinTime', type: 'date', width: 150,className: 'text-center', },
|
||||
{ title: '支付完成时间', index: 'payfinTime', type: 'date', width: 150,className: 'text-center', },
|
||||
{ title: '开票状态', index: 'approvalStatus2', className: 'text-center', width: 180 },
|
||||
{ title: '申请开票时间', index: 'approvalInvoiceTime',type: 'date', className: 'text-center', width: 180 },
|
||||
{ title: '申请开票编号', index: 'approvalInvoiceNO', className: 'text-center', width: 180 },
|
||||
{ title: '分票编号', index: 'vatinvcode',className: 'text-center', },
|
||||
{ title: '发票号码', index: 'invoiceNum', width: 100,className: 'text-center', },
|
||||
{ title: '发票代码', index: 'invoiceCode', width: 130 },
|
||||
{ title: '审核时间', index: 'approveTime',type: 'date', width: 130 },
|
||||
{ title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
|
||||
{ title: '作废日期', index: 'invalidTime', type: 'date', width: 150 },
|
||||
{ title: 'ETC开票金额', render: 'vatmoney', className: 'text-left', width: 200 }
|
||||
{ title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', },
|
||||
// { title: '录单时间', index: 'recordTime', type: 'date', className: 'text-center', width: '150px' }, //TODO
|
||||
{ title: '装货时间', index: 'loadTime', type: 'date', width: '150px', className: 'text-center', },
|
||||
{ title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', },
|
||||
{ title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', },
|
||||
{ title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', },
|
||||
{ title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 180 },
|
||||
{ title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 },
|
||||
{ title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 180 },
|
||||
{ title: '分票编号', index: 'vatinvcode',width: '180px', className: 'text-center', },
|
||||
{ title: '发票号码', index: 'invoiceno', width: 100, className: 'text-center', },
|
||||
{ title: '发票代码', index: 'invoiceno2', width: 130,className: 'text-center' },
|
||||
{ title: '开票日期', index: 'invoicedate', type: 'date', width: 150,className: 'text-center' },
|
||||
// { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO
|
||||
{ title: 'ETC开票金额', render: 'vatmoney', className: 'text-center', width: 200 }
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@ -146,6 +146,9 @@ export class TicketService extends ShipperBaseService {
|
||||
// ETC白名单（车辆）导出接口
|
||||
$api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportCarWhiteList';
|
||||
|
||||
// 可开票订单list查询
|
||||
$api_invoicedBillInfo_page = '/api/fcc/invoicedBillInfo/findInvoicedBillInfoPage';
|
||||
|
||||
constructor(public injector: Injector) {
|
||||
super(injector);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user