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

fix bug

Browse Source
This commit is contained in:
Lingzi
2022-03-30 17:55:46 +08:00
parent 5baa6b5f12 3908fc321a
commit dec3592a67
65 changed files with 2168 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/app/routes/datatable/components/compliance/index/index.component.ts
View File

@ -82,14 +82,6 @@ export class DatatableComplianceIndexComponent implements OnInit {
}
data = [
{ Date: '22 February', 订单合格率: 50000, 付款及时率: 125000 },
{ Date: '28 February', 订单合格率: 60000, 付款及时率: 150000 },
{ Date: '3 March', 订单合格率: 100000, 付款及时率: 250000 },
{ Date: '20 March', 订单合格率: 200000, 付款及时率: 500000 },
{ Date: '7 April', 订单合格率: 250000, 付款及时率: 625000 },
{ Date: '13 June', 订单合格率: 210000, 付款及时率: 525000 }
];
render(el: ElementRef<HTMLDivElement>) {
this.ngZone.runOutsideAngular(() => this.init(el.nativeElement));
}
@ -102,24 +94,105 @@ export class DatatableComplianceIndexComponent implements OnInit {
});
// 以三组数据为例, 需要展示 91/92/93年中a/b/c数据走势
const data = [
{x: '1991', z: 'a', y: 1},
{x: '1991', z: 'b', y: 2},
{x: '1991', z: 'c', y: 3},
{ data: '1月', label: '订单合格率', value: 5 },
{ data: '2月', label: '订单合格率', value: 10 },
{ data: '3月', label: '订单合格率', value: 25 },
{ data: '4月', label: '订单合格率', value: 35 },
{ data: '5月', label: '订单合格率', value: 15 },
{ data: '6月', label: '订单合格率', value: 5 },
{ data: '7月', label: '订单合格率', value: 95 },
{ data: '8月', label: '订单合格率', value: 45 },
{x: '1992', z: 'a', y: 11},
{x: '1992', z: 'b', y: 22},
{x: '1992', z: 'c', y: 33},
{x: '1993', z: 'a', y: 1},
{x: '1993', z: 'b', y: 2},
{x: '1993', z: 'c', y: 3}
];
{ data: '1月', label: '付款及时率', value: 10 },
{ data: '2月', label: '付款及时率', value: 15 },
{ data: '3月', label: '付款及时率', value: 30 },
{ data: '4月', label: '付款及时率', value: 8 },
{ data: '5月', label: '付款及时率', value: 9 },
{ data: '6月', label: '付款及时率', value: 5 },
{ data: '7月', label: '付款及时率', value: 80 },
{ data: '8月', label: '付款及时率', value: 55 },
{ data: '1月', label: '货源占比率', value: 90 },
{ data: '2月', label: '货源占比率', value: 30 },
{ data: '3月', label: '货源占比率', value: 45 },
{ data: '4月', label: '货源占比率', value: 35 },
{ data: '5月', label: '货源占比率', value: 95 },
{ data: '6月', label: '货源占比率', value: 35 },
{ data: '7月', label: '货源占比率', value: 65 },
{ data: '8月', label: '货源占比率', value: 63 },
{ data: '1月', label: '运费直付占比', value: 30 },
{ data: '2月', label: '运费直付占比', value: 60 },
{ data: '3月', label: '运费直付占比', value: 25 },
{ data: '4月', label: '运费直付占比', value: 35 },
{ data: '5月', label: '运费直付占比', value: 15 },
{ data: '6月', label: '运费直付占比', value: 55 },
{ data: '7月', label: '运费直付占比', value: 50 },
{ data: '8月', label: '运费直付占比', value: 30 },
];
chart.data(data);
//刻度自定义
chart.scale({
data: {
range: [0, 1],
},
value: {
min: 0,
nice: true,
},
});
// 图表下方图形文字自定义
chart.legend({
items:[
{
name: '订单合格率',
value: 'node_load1',
marker: {
symbol: 'circle',
style: {fill: '#6193f7'}
},
},
{
name: '付款及时率',
value: 'node_load2',
marker: {symbol: 'circle',style: {fill: '#58d3a2'}},
},
{
name: '货源占比率',
value: 'node_load13',
marker: {symbol: 'circle',style: {fill: '#5b6d8f'}},
},
{
name: '运费直付占比',
value: 'node_load13',
marker: {symbol: 'circle',style: {fill: '#f0b915'}},
},
]
});
// 提示自定义
chart.tooltip({
showCrosshairs: true,
shared: true,
});
//数据格式化
chart.axis('value', {
label: {
formatter: (val) => {
return val + ' %';
},
},
});
// 在x*y的坐标点上按z值绘制线条, 如果z值相同将使用直线连接
chart.line().position('x*y').color('z');
chart.line().position('data*value').color('label').tooltip('label*value', (name:any, value:any) => {
return {
name: name,
value: value + '%'
};
});;
// 在x*y的坐标上按z值绘制圆点
chart.point().position('x*y').size(4).color('z').shape('circle');
chart.point().position('data*value').size(4).color('label').shape('circle');
chart.render();
}
}

19
src/app/routes/datatable/components/invoicetable/invoicetable.component.html
View File

@ -3,12 +3,27 @@
<nz-card nzTitle="开票数据报表">
<st
#st
[data]="data"
[data]="service.$api_findInvoiceReport"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[res]="{ reName: { list: 'data', total: 'data.total' }}"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loadingDelay]="500"
>
<ng-template st-row="totalInvoicedAmount" let-item let-index="index">
{{item.totalInvoicedAmount | currency}}
</ng-template>
<ng-template st-row="invAmountMonth" let-item let-index="index">
{{item.invAmountMonth | currency}}
</ng-template>
<ng-template st-row="applyWaitInvAmount" let-item let-index="index">
{{item.applyWaitInvAmount | currency}}
</ng-template>
<ng-template st-row="unInvoicedAmountHistory" let-item let-index="index">
{{item.unInvoicedAmountHistory | currency}}
</ng-template>
<ng-template st-row="unInvoicedAmountCurMonth" let-item let-index="index">
{{item.unInvoicedAmountCurMonth | currency}}
</ng-template>
</st>
</nz-card>

45
src/app/routes/datatable/components/invoicetable/invoicetable.component.ts
View File

@ -1,7 +1,8 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { DataService } from '../../services/data.service';
@Component({
selector: 'app-datatable-invoicetable',
@ -13,7 +14,7 @@ export class DatatableInvoicetableComponent implements OnInit {
columns!: STColumn[];
data=[{name1:1111}]
constructor(private http: _HttpClient, private modal: ModalHelper) { }
constructor(private http: _HttpClient, private modal: ModalHelper,public service :DataService) { }
/**
* 查询参数
@ -23,48 +24,48 @@ export class DatatableInvoicetableComponent implements OnInit {
}
ngOnInit(): void {
this.initST();
}
initST() {
this.columns = [
{
title: '运营主体',
index: 'name1'
index: 'operationName'
},
{
title: '已开票总金额',
index: 'name1'
index: 'totalInvoicedAmount',
render: 'totalInvoicedAmount',
},
{
title: '当月已开票金额',
index: 'name1'
index: 'invAmountMonth',
render: 'invAmountMonth',
},
{
title: '当月已开票张数',
index: 'numInvAmountMonth',
},
{
title: '已申请待开金额',
index: 'name1'
index: 'applyWaitInvAmount',
render: 'applyWaitInvAmount',
},
{
title: '申请待开客户',
index: 'applyWaitCustomer',
},
{
title: '未申请开票金额（历史）',
index: 'name1'
index: 'unInvoicedAmountHistory',
render: 'unInvoicedAmountHistory',
},
{
title: '未申请开票金额（当月）',
index: 'name1'
index: 'unInvoicedAmountCurMonth',
render: 'unInvoicedAmountCurMonth',
},
{
title: '当月发票张数',
index: 'name1'
},
{
title: '剩余发票张数',
index: 'name1'
},
];
}
add(): void {
// this.modal
// .createStatic(FormEditComponent, { i: { id: 0 } })
// .subscribe(() => this.st.reload());
}
}

7
src/app/routes/datatable/datatable-routing.module.ts
View File

@ -16,6 +16,7 @@ import { DatatableMancustomtableComponent } from './components/customtable/mancu
import { DatatablePartnertableComponent } from './components/customtable/partnertable/partnertable.component';
import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component';
import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component';
import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
const routes: Routes = [
{ path: 'dataindex', component: DatatableDataindexComponent },
@ -33,8 +34,10 @@ const routes: Routes = [
{ path: 'invoicetable', component: DatatableInvoicetableComponent },
{ path: 'reporting/fund', component: DatatableFundReportingComponent },
{ path: 'busitable/busiindex', component: DatatableBusiindexComponent },
{ path: 'busitable/mantable', component: DatatableMantableComponent }];
{ path: 'busitable/mantable', component: DatatableMantableComponent },
{ path: 'reporting/fund', component: DatatableFundReportingComponent },
{ path: 'fund-info', component: DatatableReportingFundInfoComponent }];
@NgModule({
imports: [RouterModule.forChild(routes)],

8
src/app/routes/datatable/datatable.module.ts
View File

@ -23,6 +23,7 @@ import { DatatableBusiindexComponent } from './components/busitable/busiindex/bu
import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component';
import { busitableCurveComponent } from './components/busitable/busiindex/curve/curve.component';
import { busitablePillarComponent } from './components/busitable/busiindex/pillar/pillar.component';
import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
const COMPONENTS: Type<void>[] = [
DatatableDataindexComponent,
@ -46,9 +47,10 @@ const COMPONENTS: Type<void>[] = [
DatatableBusiindexComponent,
DatatableMantableComponent,
busitableCurveComponent,
busitablePillarComponent
]
busitablePillarComponent,
DatatableFundReportingComponent,
DatatableReportingFundInfoComponent]
@NgModule({
imports: [

15
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html Normal file
View File

@ -0,0 +1,15 @@
<nz-spin [nzSpinning]="service.http.loading"></nz-spin>
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
[bordered]="true">
<ng-template st-row="freightDetails" let-item>
<div *ngFor="let item of item.freightDetails">
<div>{{item.expenseName}}:{{item.price | currency}} </div>
</div>
</ng-template>
</st>
<div class="modal-footer">
<button nz-button type="submit" nzType="primary" (click)="close()">确定</button>
</div>

24
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatatableReportingFundInfoComponent } from './fund-info.component';
describe('DatatableReportingFundInfoComponent', () => {
let component: DatatableReportingFundInfoComponent;
let fixture: ComponentFixture<DatatableReportingFundInfoComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [DatatableReportingFundInfoComponent]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DatatableReportingFundInfoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

74
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts Normal file
View File

@ -0,0 +1,74 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
@Component({
selector: 'app-datatable-fund-info',
templateUrl: './fund-info.component.html',
})
export class DatatableReportingFundInfoComponent implements OnInit {
url = `/user`;
searchSchema!: SFSchema;
@ViewChild('st') private readonly st!: STComponent;
columns: STColumn[] = [];
record: any = {}
get reqParams() {
return {};
}
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
}
ngOnInit(): void {
this.initST();
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
{ title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', },
{ title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
]
}
add(): void {
// this.modal
// .createStatic(FormEditComponent, { i: { id: 0 } })
// .subscribe(() => this.st.reload());
}
selectTab(e: any) {
}
update() {
if (this.record?.billType === '1') {
window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`)
} else if (this.record.billType === '2') {
window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
}
}
close(): void {
this.modalRef.destroy();
}
}

4
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
View File

@ -42,6 +42,9 @@
<ng-template st-row="amount" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div>
</ng-template>
<ng-template st-row="total" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div>
</ng-template>
</st>
</nz-card>
<ng-template #extraTemplate>
@ -52,6 +55,5 @@
</div>
<button nz-button nzType="primary" (click)="upload()">上传</button>
<button nz-button nzType="primary" (click)="recall()">撤回</button>
<button nz-button nzType="primary" (click)="uploadSetting()">上传设置</button>
</div>
</ng-template>

200
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -102,26 +102,12 @@ export class DatatableFundReportingComponent implements OnInit {
placeholder: '请输入',
},
},
enterpriseInfoId: {
title: '网络货运人',
type: 'string',
ui: {
placeholder: '请选择',
widget: 'select',
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
allowClear: true
}
},
externalResourceCode: {
title: '货主',
resourceCode1: {
type: 'string',
title: '流水单号',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
},
driverName: {
title: '承运司机',
@ -143,6 +129,17 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
carNo1: {
title: '车队长',
type: 'string',
maxLength: 9,
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
serviceType: {
title: '上传状态',
type: 'string',
@ -169,6 +166,41 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
enterpriseInfoId: {
title: '网络货运人',
type: 'string',
ui: {
placeholder: '请选择',
widget: 'select',
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
allowClear: true
}
},
externalResourceCode: {
title: '货主',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
createTime1: {
title: '交易时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
createTime: {
title: '上传时间',
type: 'string',
@ -181,75 +213,6 @@ export class DatatableFundReportingComponent implements OnInit {
},
} as SFDateWidgetSchema,
},
createTime1: {
title: '运单生成时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
createTime2: {
title: '发货时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
createTime3: {
title: '收货时间',
type: 'string',
ui: {
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
loadingPlace: {
title: '车辆轨迹',
type: 'string',
enum: [
{ label: '全部', value: '' },
{ label: '有', value: '1' },
{ label: '无', value: '0' }
],
ui: {
placeholder: '请选择',
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
loadingPlace1: {
title: '司机轨迹',
type: 'string',
enum: [
{ label: '全部', value: '' },
{ label: '有', value: '1' },
{ label: '无', value: '0' }
],
ui: {
placeholder: '请选择',
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
},
};
this.ui = {
@ -264,10 +227,9 @@ export class DatatableFundReportingComponent implements OnInit {
initST() {
this.columns = [
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
{ title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
{ title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
{ title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
{ title: '流水单号', render: 'freightDetails', className: 'text-center', width: '150px', },
{
title: '订单号',
render: 'billComplianceVOS',
@ -282,28 +244,19 @@ export class DatatableFundReportingComponent implements OnInit {
className: 'text-center',
width: '180px',
},
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
{ title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
{ title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
{ title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' },
{ title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '实际承运人名称', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '实际承运人证件号码', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '车牌号', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
{ title: '车牌颜色', render: 'driver', className: 'text-center', width: '180px' },
{ title: '总金额', render: 'amount', className: 'text-center', width: '250px' },
{ title: '付款方式', render: 'payeeName', className: 'text-center', width: '180px' },
{ title: '车队长', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '收款账户', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '收款银行', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
{ title: '银行流水号', render: 'driver', className: 'text-center', width: '150px' },
{ title: '实际支付金额', render: 'total', className: 'text-center', width: '150px' },
{ title: '交易时间', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
];
@ -320,12 +273,21 @@ export class DatatableFundReportingComponent implements OnInit {
this.openWainingModal('请选择需要撤回的数据');
return;
}
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.search();
this.modal.confirm({
nzTitle: '撤回提示',
nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
nzOkText: '确定',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('撤销成功');
this.search();
}
})
}
})
});
}
@ -375,6 +337,12 @@ export class DatatableFundReportingComponent implements OnInit {
this.openWainingModal('请选择需要上传的数据');
return;
}
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('上传成功');
this.search();
}
})
}

9
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -28,7 +28,7 @@
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="orderStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
@ -42,6 +42,13 @@
<ng-template st-row="amount" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div>
</ng-template>
<ng-template st-row="car" let-item let-index="index">
<a (click)="viewAuditResult(item)">查看轨迹</a>
</ng-template>
<ng-template st-row="driver" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">查看轨迹</a>
</ng-template>
</st>
</nz-card>
<ng-template #extraTemplate>

32
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -285,12 +285,12 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver', className: 'text-center', width: '180px' },
{ title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' },
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
{ title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
{ title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' },
{ title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' },
{ title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
@ -302,8 +302,8 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' },
{ title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
{ title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
];
@ -320,12 +320,20 @@ export class DatatableOrderReportingComponent implements OnInit {
this.openWainingModal('请选择需要撤回的数据');
return;
}
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.search();
this.modal.confirm({
nzTitle: '撤回提示',
nzContent: '撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
nzOkText: '确定',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('撤销成功');
this.search();
}
})
}
})
});
}
@ -375,6 +383,12 @@ export class DatatableOrderReportingComponent implements OnInit {
this.openWainingModal('请选择需要上传的数据');
return;
}
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('上传成功');
this.search();
}
})
}

3
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
View File

@ -7,7 +7,8 @@
<div style="width: 90%;">
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false">
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
[bordered]="true">
<ng-template st-row="freightDetails" let-item>
<div *ngFor="let item of item.freightDetails">
<div>{{item.expenseName}}:{{item.price | currency}} </div>

4
src/app/routes/datatable/services/data.service.ts
View File

@ -31,6 +31,10 @@ export class DataService extends BaseService {
$api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`;
// 业绩报表柱状图
$api_performanceReportHistogram = `/api/sdc/report/performanceReportHistogram`;
// 查询开票数据报表
$api_findInvoiceReport = `/api/fcc/invoiceReport/findInvoiceReport`;
constructor(public injector: Injector) {
super(injector);
}