Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-26 20:42:48 +08:00
parent 9f76dfbc69 53f295ed8d
commit f8135db6dc
5 changed files with 325 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/app/routes/ticket-management/components/billing-order/billing-order.component.html Normal file
View File

@ -0,0 +1,37 @@
<page-header-wrapper [title]="'可开票订单'">
</page-header-wrapper>
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x:'1200px' }">
<ng-template st-row="sts" let-item let-index="index">
<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>

277
src/app/routes/ticket-management/components/billing-order/billing-order.component.ts Normal file
View File

@ -0,0 +1,277 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-billing-order',
templateUrl: './billing-order.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class BillingOrderComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) { }
ngOnInit(): void { }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
});
}
return requestOptions;
};
routeTo(item: any) {
// return;
this.router.navigateByUrl(`/order-management/vehicle/vehicle-detail/${item.billId}`);
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
export() {
this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_InvoicedBillInfoPage);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
billCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
serviceType: {
title: '服务类型',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
shipperAppUserName: {
type: 'string',
title: '货主名称',
ui: {
placeholder: '请输入',
}
},
vatappcode: {
type: 'string',
title: '申请编号',
ui: {
autocomplete: 'off',
visibleIf: {
expand: (value: boolean) => value
}
}
},
vatinvcode: {
type: 'string',
title: '分票编号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
vatappdate: {
title: '申请时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd HH:mm:ss',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
sts: {
type: 'string',
title: '开票状态',
ui: {
widget: 'dict-select',
params: { dictKey: 'etc:invoicing:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
invoiceno: {
type: 'string',
title: '发票号码',
ui: {
placeholder: '请输入',
autocomplete: 'off',
visibleIf: {
expand: (value: boolean) => value
}
}
},
invoicedate: {
title: '开票日期',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
},
asyncData: () => this.service.getNetworkFreightForwarder()
}
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '订单号', index: 'billCode', type:'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
{ title: '运单号', index: 'wayBillCode', width: 180, className: 'text-center' },
{ title: '银行类型', index: 'bankTypeLabel', render: 'bankType', width: 100, className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: 220, className: 'text-center' },
{
title: '开票金额', // TODO
index: 'vatmoney',
width: 120,
type: 'widget',
className: 'text-center',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
},
{
title: '总费用',
index: 'totalAmount',
width: 120,
type: 'widget',
className: 'text-center',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
},
{
title: '运输费',
index: 'price',
width: 120,
type: 'widget',
className: 'text-center',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.price }) }
},
{
title: '技术服务费',
index: 'insurancePremium',
width: 120,
type: 'widget',
className: 'text-center',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.insurancePremium }) }
},
{
title: '附加费',
index: 'surcharge',
width: 120,
type: 'widget',
className: 'text-center',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.surcharge }) }
},
{
title: '附加费率',
className: 'text-center',
index: 'paymentMethodRate',
width: 130,
format: record => `${record.paymentMethodRate}%`
},
{ title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
{ title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', },
{
title: '服务类型',
index: 'serviceTypeLabel',
width: '180px',
className: 'text-center'
},
{ 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: '承运司机',
index:'driverName',
className: 'text-center',
width: '180px',
},
{
title: '车队长',
className: 'text-center',
width: '180px',
index: 'carCaptainName',
},
{ 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: 130, 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, type: 'widget',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.surcharge }) }
}
];
}
}

5
src/app/routes/ticket-management/services/ticket.service.ts
View File

@ -146,6 +146,11 @@ export class TicketService extends ShipperBaseService {
// ETC白名单（车辆）导出接口
$api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportCarWhiteList';
// 可开票订单list查询
$api_invoicedBillInfo_page = '/api/fcc/invoicedBillInfo/getInvoicedBillInfoPage';
// 可开票订单导出
$api_export_InvoicedBillInfoPage = '/api/fcc/invoicedBillInfo/exportInvoicedBillInfoPage'
constructor(public injector: Injector) {
super(injector);
}

4
src/app/routes/ticket-management/ticket-management-routing.module.ts
View File

@ -1,5 +1,6 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { BillingOrderComponent } from './components/billing-order/billing-order.component';
import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component';
import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist.component';
import { ETCInvoicedListComponent } from './components/etc-invoiced-list/etc-invoiced-list.component';
@ -28,7 +29,8 @@ const routes: Routes = [
{ path: 'input-invoice', component: InputInvoiceComponent },
{ path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent },
{ path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent },
{ path: 'express-info', component: ExpressInfoComponent }
{ path: 'express-info', component: ExpressInfoComponent },
{ path: 'billing-order', component: BillingOrderComponent }
];
@NgModule({

4
src/app/routes/ticket-management/ticket-management.module.ts
View File

@ -26,6 +26,7 @@ import { PrintOrderModalComponent } from './components/invoice-requested/print-o
import { ExpressInfoComponent } from './components/express-info/express-info.component';
import { ExpressDetailModalComponent } from './components/express-info/express-detail-modal/express-detail-modal.component';
import { UpdateAddressModalComponent } from './components/invoice-requested/update-address-modal/update-address-modal.component';
import { BillingOrderComponent } from './components/billing-order/billing-order.component';
const COMPONENTS: any = [
ETCInvoicedListComponent,
@ -41,7 +42,8 @@ const COMPONENTS: any = [
InputInvoiceComponent,
InputInvoiceDetailComponent,
EditCollectionInvoiceComponent,
ExpressInfoComponent
ExpressInfoComponent,
BillingOrderComponent
];
const NOTROUTECOMPONENTS: any = [
TransactionDetailsComponent,