资金上传接口对接
This commit is contained in:
@ -1,14 +1,15 @@
|
|||||||
<nz-spin [nzSpinning]="service.http.loading"></nz-spin>
|
<div>
|
||||||
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_fund_valid_result" [columns]="columns"
|
<nz-spin [nzSpinning]="service.http.loading"></nz-spin>
|
||||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_fund_valid_result" [columns]="columns"
|
||||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
|
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams,process: beforeReq }"
|
||||||
[bordered]="true">
|
[res]="{ reName: { list: 'data' } }" [page]="{ show: false,showSize:false}" [loading]="false" [bordered]="true">
|
||||||
<ng-template st-row="freightDetails" let-item>
|
<ng-template st-row="freightDetails" let-item>
|
||||||
<div *ngFor="let item of item.freightDetails">
|
<div *ngFor="let item of item.freightDetails">
|
||||||
<div>{{item.expenseName}}:{{item.price | currency}} </div>
|
<div>{{item.expenseName}}:{{item.price | currency}} </div>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
</st>
|
</st>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button nz-button type="submit" nzType="primary" (click)="close()">确定</button>
|
<button nz-button type="submit" nzType="primary" (click)="close()">确定</button>
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { STColumn, STComponent } from '@delon/abc/st';
|
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
|
||||||
import { SFSchema } from '@delon/form';
|
import { SFSchema } from '@delon/form';
|
||||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||||
import { NzModalRef } from 'ng-zorro-antd/modal';
|
import { NzModalRef } from 'ng-zorro-antd/modal';
|
||||||
@ -21,6 +21,14 @@ export class DatatableReportingFundInfoComponent implements OnInit {
|
|||||||
get reqParams() {
|
get reqParams() {
|
||||||
return { capitalCode: this?.record?.orderCode };
|
return { capitalCode: this?.record?.orderCode };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
beforeReq(requestOptions: STRequestOptions) {
|
||||||
|
delete requestOptions?.body?.pageSize;
|
||||||
|
delete requestOptions?.body?.pageIndex;
|
||||||
|
return requestOptions;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
|
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -34,22 +42,22 @@ export class DatatableReportingFundInfoComponent implements OnInit {
|
|||||||
*/
|
*/
|
||||||
initST() {
|
initST() {
|
||||||
this.columns = [
|
this.columns = [
|
||||||
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
|
{ title: '序号', type: 'no', className: 'text-center', width: '10%', },
|
||||||
{ title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', },
|
{ title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '15%', },
|
||||||
{ title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', },
|
{ title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '15%', },
|
||||||
{ title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', },
|
{ title: '归属模块', index: 'orderStatus', className: 'text-center', width: '15%', },
|
||||||
{
|
{
|
||||||
title: '是否必填',
|
title: '是否必填',
|
||||||
index: 'orderStatus',
|
index: 'orderStatus',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
width: '100px',
|
width: '10%',
|
||||||
type: 'enum',
|
type: 'enum',
|
||||||
enum: {
|
enum: {
|
||||||
'0': '非必填',
|
'0': '非必填',
|
||||||
'1': '必填',
|
'1': '必填',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
|
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', },
|
||||||
{
|
{
|
||||||
title: '本地校验',
|
title: '本地校验',
|
||||||
index: 'checkStatus',
|
index: 'checkStatus',
|
||||||
@ -60,9 +68,9 @@ export class DatatableReportingFundInfoComponent implements OnInit {
|
|||||||
'1': '通过',
|
'1': '通过',
|
||||||
'2': '不通过'
|
'2': '不通过'
|
||||||
},
|
},
|
||||||
width: '100px',
|
width: '10%',
|
||||||
},
|
},
|
||||||
{ title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
|
{ title: '错误内容', index: 'remark', className: 'text-center', width: '20%', },
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -34,8 +34,8 @@
|
|||||||
<span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.billStatusLabel}}</span>
|
<span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.billStatusLabel}}</span>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="verifyStatus" let-item>
|
<ng-template st-row="verifyStatus" let-item>
|
||||||
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
|
<a (click)="viewResult(item)" *ngIf="item?.verifyStatus === '1'">1111{{item?.verifyStatusLabel}}</a>
|
||||||
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
|
<span *ngIf="item?.verifyStatus !== '1'">{{item?.verifyStatusLabel}}</span>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="orderCode" let-item>
|
<ng-template st-row="orderCode" let-item>
|
||||||
<span class="text-blue-dark">{{item?.orderCode}}</span>
|
<span class="text-blue-dark">{{item?.orderCode}}</span>
|
||||||
@ -43,11 +43,6 @@
|
|||||||
<ng-template st-row="wayBillCode" let-item>
|
<ng-template st-row="wayBillCode" let-item>
|
||||||
<span class="text-blue-dark">{{item?.wayBillCode}}</span>
|
<span class="text-blue-dark">{{item?.wayBillCode}}</span>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
<ng-template st-row="localValid" let-item let-index="index">
|
|
||||||
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
|
|
||||||
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
|
|
||||||
</ng-template>
|
|
||||||
<ng-template st-row="tolalAmount" let-item let-index="index">
|
<ng-template st-row="tolalAmount" let-item let-index="index">
|
||||||
<div class="text-right">{{item?.tolalAmount | currency }}</div>
|
<div class="text-right">{{item?.tolalAmount | currency }}</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|||||||
@ -175,7 +175,9 @@ export class DatatableFundReportingComponent implements OnInit {
|
|||||||
placeholder: '请选择',
|
placeholder: '请选择',
|
||||||
widget: 'select',
|
widget: 'select',
|
||||||
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
|
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
|
||||||
|
visibleIf: {
|
||||||
|
_$expand: (value: boolean) => value,
|
||||||
|
},
|
||||||
allowClear: true
|
allowClear: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -363,6 +365,7 @@ export class DatatableFundReportingComponent implements OnInit {
|
|||||||
const modalRef = this.modal.create({
|
const modalRef = this.modal.create({
|
||||||
nzTitle: '校验结果',
|
nzTitle: '校验结果',
|
||||||
nzWidth: 1200,
|
nzWidth: 1200,
|
||||||
|
|
||||||
nzContent: DatatableReportingFundInfoComponent,
|
nzContent: DatatableReportingFundInfoComponent,
|
||||||
nzComponentParams: {
|
nzComponentParams: {
|
||||||
record
|
record
|
||||||
@ -377,7 +380,7 @@ export class DatatableFundReportingComponent implements OnInit {
|
|||||||
* 查看监管审核结果
|
* 查看监管审核结果
|
||||||
*/
|
*/
|
||||||
viewAuditResult(record: any) {
|
viewAuditResult(record: any) {
|
||||||
if (record?.billStatus !== '2') {
|
if (record?.verifyStatus !== '1') {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this.openWainingModal('监管审核结果', record?.result)
|
this.openWainingModal('监管审核结果', record?.result)
|
||||||
|
|||||||
@ -29,18 +29,40 @@
|
|||||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||||
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
|
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
|
||||||
<ng-template st-row="orderStatus" let-item let-index="index">
|
<ng-template st-row="orderCheckStatus" let-item let-index="index">
|
||||||
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
|
<a (click)="viewAuditResult(item)"
|
||||||
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
|
*ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
|
||||||
|
<span *ngIf="item?.orderCheckStatus !== '2'">{{filterStatus(item?.orderCheckStatus)}}</span>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template st-row="driverCheckStatus" let-item let-index="index">
|
||||||
|
<a (click)="viewAuditResult(item)"
|
||||||
|
*ngIf="item?.driverCheckStatus === '2'">{{filterStatus(item?.driverCheckStatus)}}</a>
|
||||||
|
<span *ngIf="item?.driverCheckStatus !== '2'">{{filterStatus(item?.driverCheckStatus)}}</span>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template st-row="orderCheckStatus" let-item let-index="index">
|
||||||
|
<a (click)="viewAuditResult(item)"
|
||||||
|
*ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
|
||||||
|
<span *ngIf="item?.orderCheckStatus !== '2'">{{filterStatus(item?.orderCheckStatus)}}</span>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
<ng-template st-row="localValid" let-item let-index="index">
|
<ng-template st-row="checkStatus" let-item let-index="index">
|
||||||
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
|
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{filterStatus(item?.checkStatus)}}</a>
|
||||||
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
|
<span *ngIf="item?.billStatus !== '2'">{{filterStatus(item?.checkStatus)}}</span>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template st-row="amount" let-item let-index="index">
|
<ng-template st-row="billCode" let-item>
|
||||||
<div class="text-right">{{item?.amount | currency :' '}}</div>
|
<span class="text-red-dark">{{item?.billCode}}</span>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template st-row="wayBillCode" let-item>
|
||||||
|
<span class="text-red-dark">{{item?.wayBillCode}}</span>
|
||||||
|
</ng-template>
|
||||||
|
|
||||||
|
<ng-template st-row="freightAmount" let-item let-index="index">
|
||||||
|
<div class="text-right">{{item?.freightAmount | currency :' '}}</div>
|
||||||
|
</ng-template>
|
||||||
|
<ng-template st-row="goodsInfoList" let-item let-index="index">
|
||||||
|
<div *ngFor="let _item of item?.goodsInfoList">
|
||||||
|
{{_item?.goodsTypeName}}/{{_item?.goodsName}}/{{_item?.weight}}吨/{{_item?.volume}}m³
|
||||||
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
<ng-template st-row="car" let-item let-index="index">
|
<ng-template st-row="car" let-item let-index="index">
|
||||||
|
|||||||
@ -95,7 +95,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
properties: {
|
properties: {
|
||||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||||
billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
|
billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
|
||||||
resourceCode: {
|
wayBillCode: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
title: '运单号',
|
title: '运单号',
|
||||||
ui: {
|
ui: {
|
||||||
@ -113,7 +113,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
allowClear: true
|
allowClear: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
externalResourceCode: {
|
shipperName: {
|
||||||
title: '货主',
|
title: '货主',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -143,33 +143,40 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
serviceType: {
|
putStatus: {
|
||||||
title: '上传状态',
|
title: '上传状态',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
enum: [
|
||||||
|
{ label: '待上传', value: 0 },
|
||||||
|
{ label: '已上传', value: 1 },
|
||||||
|
{ label: '异常', value: 2 }
|
||||||
|
],
|
||||||
|
|
||||||
ui: {
|
ui: {
|
||||||
placeholder: '请选择',
|
placeholder: '请选择',
|
||||||
widget: 'dict-select',
|
widget: 'select',
|
||||||
params: { dictKey: 'service:type' },
|
|
||||||
containsAllLabel: true,
|
|
||||||
visibleIf: {
|
visibleIf: {
|
||||||
_$expand: (value: boolean) => value,
|
_$expand: (value: boolean) => value,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
serviceType1: {
|
checkStatus: {
|
||||||
title: '本地校验',
|
title: '本地校验',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
enum: [
|
||||||
|
{ label: '校验中', value: 0 },
|
||||||
|
{ label: '通过', value: 1 },
|
||||||
|
{ label: '不通过', value: 2 }
|
||||||
|
],
|
||||||
ui: {
|
ui: {
|
||||||
placeholder: '请选择',
|
placeholder: '请选择',
|
||||||
widget: 'dict-select',
|
widget: 'select',
|
||||||
params: { dictKey: 'service:type' },
|
|
||||||
containsAllLabel: true,
|
|
||||||
visibleIf: {
|
visibleIf: {
|
||||||
_$expand: (value: boolean) => value,
|
_$expand: (value: boolean) => value,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
createTime: {
|
putTime: {
|
||||||
title: '上传时间',
|
title: '上传时间',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -181,7 +188,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
} as SFDateWidgetSchema,
|
} as SFDateWidgetSchema,
|
||||||
},
|
},
|
||||||
createTime1: {
|
orderReceivingTime: {
|
||||||
title: '运单生成时间',
|
title: '运单生成时间',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -193,7 +200,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
} as SFDateWidgetSchema,
|
} as SFDateWidgetSchema,
|
||||||
},
|
},
|
||||||
createTime2: {
|
dispatchedDate: {
|
||||||
title: '发货时间',
|
title: '发货时间',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -205,7 +212,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
} as SFDateWidgetSchema,
|
} as SFDateWidgetSchema,
|
||||||
},
|
},
|
||||||
createTime3: {
|
receivingDate: {
|
||||||
title: '收货时间',
|
title: '收货时间',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
ui: {
|
ui: {
|
||||||
@ -218,7 +225,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
} as SFDateWidgetSchema,
|
} as SFDateWidgetSchema,
|
||||||
},
|
},
|
||||||
|
|
||||||
loadingPlace: {
|
trajectoryDataAppStatus: {
|
||||||
title: '车辆轨迹',
|
title: '车辆轨迹',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
enum: [
|
enum: [
|
||||||
@ -234,7 +241,7 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
loadingPlace1: {
|
trajectoryDataStatus: {
|
||||||
title: '司机轨迹',
|
title: '司机轨迹',
|
||||||
type: 'string',
|
type: 'string',
|
||||||
enum: [
|
enum: [
|
||||||
@ -264,48 +271,65 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
initST() {
|
initST() {
|
||||||
this.columns = [
|
this.columns = [
|
||||||
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
|
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
|
||||||
{ title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', },
|
{ title: '订单状态', render: 'orderCheckStatus', className: 'text-center', width: '120px', },
|
||||||
{ title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', },
|
{ title: '司机状态', render: 'driverCheckStatus', className: 'text-center', width: '120px', },
|
||||||
|
|
||||||
{ title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
|
{ title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
|
||||||
{ title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', },
|
|
||||||
|
{ title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
|
||||||
{
|
{
|
||||||
title: '订单号',
|
title: '订单号',
|
||||||
render: 'billComplianceVOS',
|
render: 'billCode',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
width: '150px',
|
width: '150px',
|
||||||
},
|
},
|
||||||
{ title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', },
|
{ title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', },
|
||||||
|
|
||||||
{
|
{
|
||||||
title: '网络货运人',
|
title: '网络货运人',
|
||||||
render: 'serviceType',
|
index: 'enterpriseInfoName',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
width: '180px',
|
width: '180px',
|
||||||
},
|
},
|
||||||
{ title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
|
||||||
{ title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' },
|
{ title: '统一社会信用代码', index: 'unifiedSocialCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||||
{ title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' },
|
{ title: '运单生成时间', index: 'wayBillCreateTime', className: 'text-center', width: '180px' },
|
||||||
{ title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' },
|
{ title: '发货时间', index: 'dispatchedDate', className: 'text-center', width: '180px' },
|
||||||
{ title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' },
|
{ title: '收货时间', index: 'receivingDate', className: 'text-center', width: '180px' },
|
||||||
{ title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' },
|
{ title: '托运人名称', index: 'shipperName', className: 'text-center', width: '250px' },
|
||||||
{ title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
{ title: '托运人统一社会信用代码', index: 'shipperCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||||
{ title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' },
|
{ title: '装货地址', index: 'loadingAddress', render: 'dischargePlace', className: 'text-center', width: '200px' },
|
||||||
{ title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' },
|
{ title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' },
|
||||||
{ title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' },
|
{ title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' },
|
||||||
{ title: '运费金额', render: 'amount', className: 'text-center', width: '250px' },
|
{ title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' },
|
||||||
{ title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' },
|
{ title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' },
|
||||||
{ title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' },
|
{
|
||||||
{ title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' },
|
title: '车牌颜色',
|
||||||
{ title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' },
|
index: 'carNoColor',
|
||||||
{ title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' },
|
className: 'text-center',
|
||||||
{ title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' },
|
width: '250px',
|
||||||
{ title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' },
|
type: 'enum',
|
||||||
{ title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' },
|
enum: {
|
||||||
|
"4": "绿色",
|
||||||
|
"3": "黄绿色",
|
||||||
|
"2": "黄色",
|
||||||
|
"1": "蓝色"
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
{ 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: 'goodsInfoList', className: 'text-center', width: '180px' },
|
||||||
|
{ title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' },
|
||||||
|
{ title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' },
|
||||||
|
|
||||||
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
|
{ title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||||
|
|
||||||
{ title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
|
{ title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' },
|
||||||
{ title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
|
{ title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' },
|
||||||
{ title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' },
|
{ title: '上传次数', index: 'putNumber', className: 'text-center', width: '150px' },
|
||||||
{ title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' },
|
{ title: '上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' },
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -455,5 +479,18 @@ export class DatatableOrderReportingComponent implements OnInit {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filterStatus(status: string) {
|
||||||
|
switch (status) {
|
||||||
|
case '0':
|
||||||
|
return '校验中';
|
||||||
|
case '1':
|
||||||
|
return '通过';
|
||||||
|
case '2':
|
||||||
|
return '不通过';
|
||||||
|
default:
|
||||||
|
return '';
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -5,7 +5,7 @@
|
|||||||
</nz-tabset>
|
</nz-tabset>
|
||||||
</div>
|
</div>
|
||||||
<div style="width: 90%;">
|
<div style="width: 90%;">
|
||||||
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
|
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
|
||||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
[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">
|
[bordered]="true">
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import { BaseService } from '@shared';
|
|||||||
})
|
})
|
||||||
export class ReportingService extends BaseService {
|
export class ReportingService extends BaseService {
|
||||||
|
|
||||||
$api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
|
$api_get_order_reporting_page = `/api/sdc/regulation/list/page`; // 订单上报列表
|
||||||
$api_recall_reporting = ``; // 撤回
|
$api_recall_reporting = ``; // 撤回
|
||||||
$api_async_export_order_reporting_list = ``; // 导出订单上报
|
$api_async_export_order_reporting_list = ``; // 导出订单上报
|
||||||
$api_get_upload_setting = ``; // 修改上传设置
|
$api_get_upload_setting = ``; // 修改上传设置
|
||||||
@ -16,6 +16,8 @@ export class ReportingService extends BaseService {
|
|||||||
$api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传
|
$api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传
|
||||||
$api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回
|
$api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回
|
||||||
$api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表
|
$api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表
|
||||||
|
|
||||||
|
|
||||||
constructor(public injector: Injector) {
|
constructor(public injector: Injector) {
|
||||||
super(injector);
|
super(injector);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user