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

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

Browse Source
This commit is contained in:
Lingzi
2022-03-30 18:39:46 +08:00
parent f4d53b86fd a8267e7fe4
commit d1da209214
10 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
<nz-spin [nzSpinning]="service.http.loading"></nz-spin>
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_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">

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

@ -25,25 +25,33 @@
</nz-tab>
</nz-tabset>
<!-- 数据列表 -->
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_fund_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">
<ng-template st-row="orderStatus" let-item let-index="index">
<ng-template st-row="uploadStatus" let-item>
<span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.billStatusLabel}}</span>
</ng-template>
<ng-template st-row="verifyStatus" let-item>
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>
</ng-template>
<ng-template st-row="orderCode" let-item>
<span class="text-blue-dark">{{item?.orderCode}}</span>
</ng-template>
<ng-template st-row="wayBillCode" let-item>
<span class="text-blue-dark">{{item?.wayBillCode}}</span>
</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="amount" let-item let-index="index">
<div class="text-right">{{item?.amount | currency :' '}}</div>
<ng-template st-row="tolalAmount" let-item let-index="index">
<div class="text-right">{{item?.tolalAmount | 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-row="payAmount" let-item let-index="index">
<div class="text-right">{{item?.payAmount | currency :' '}}</div>
</ng-template>
</st>
</nz-card>

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

@ -94,22 +94,22 @@ export class DatatableFundReportingComponent implements OnInit {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
resourceCode: {
orderCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } },
wayBillCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入',
},
},
resourceCode1: {
serialNumberCode: {
type: 'string',
title: '流水单号',
ui: {
placeholder: '请输入',
},
},
driverName: {
carrier: {
title: '承运司机',
type: 'string',
ui: {
@ -118,7 +118,7 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
carNo: {
carNumber: {
title: '车牌号',
type: 'string',
maxLength: 9,
@ -129,7 +129,7 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
carNo1: {
payee: {
title: '车队长',
type: 'string',
maxLength: 9,
@ -140,7 +140,7 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
serviceType: {
uploadStatus: {
title: '上传状态',
type: 'string',
ui: {
@ -153,7 +153,7 @@ export class DatatableFundReportingComponent implements OnInit {
},
}
},
serviceType1: {
verifyStatus: {
title: '本地校验',
type: 'string',
ui: {
@ -177,19 +177,7 @@ export class DatatableFundReportingComponent implements OnInit {
allowClear: true
}
},
externalResourceCode: {
title: '货主',
type: 'string',
ui: {
placeholder: '请输入',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
createTime1: {
transactionTime: {
title: '交易时间',
type: 'string',
ui: {
@ -201,7 +189,7 @@ export class DatatableFundReportingComponent implements OnInit {
},
} as SFDateWidgetSchema,
},
createTime: {
uploadTime: {
title: '上传时间',
type: 'string',
ui: {
@ -227,38 +215,39 @@ 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: 'localValid', className: 'text-center', width: '120px', },
{ title: '流水单号', render: 'freightDetails', className: 'text-center', width: '150px', },
{ title: '上传状态', render: 'uploadStatus', className: 'text-center', width: '120px', },
{ title: '本地校验', render: 'verifyStatus', className: 'text-center', width: '120px', },
{ title: '流水单号', index: 'serialNumberCode', className: 'text-center', width: '150px', },
{
title: '订单号',
render: 'billComplianceVOS',
render: 'orderCode',
className: 'text-center',
width: '150px',
},
{ title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', },
{ title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', },
{
title: '网络货运人',
render: 'serviceType',
index: 'ltdName',
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: 'amount', className: 'text-center', width: '250px' },
{ title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '200px' },
{ title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '120px' },
{ title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' },
{ title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
{ title: '总金额', render: 'tolalAmount', 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' },
{ title: '付款方式', index: 'payType', className: 'text-center', width: '180px' },
{ title: '车队长', index: 'payee', className: 'text-center', width: '250px' },
{ title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '200px' },
{ title: '收款银行', index: 'bankTypeLabel', className: 'text-center', width: '200px' },
{ title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '150px' },
{ title: '实际支付金额', render: 'payAmount', className: 'text-center', width: '150px' },
{ title: '交易时间', index: 'transactionTime', className: 'text-center', width: '150px' },
{ title: '上传次数', index: 'uploadFrequency', className: 'text-center', width: '120px' },
{ title: '上传时间', index: 'uploadTime', className: 'text-center', width: '180px' },
];
}

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

@ -25,7 +25,7 @@
</nz-tab>
</nz-tabset>
<!-- 数据列表 -->
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_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]="service.http.loading">

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

@ -5,7 +5,7 @@
</nz-tabset>
</div>
<div style="width: 90%;">
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_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">

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

@ -6,11 +6,13 @@ import { BaseService } from '@shared';
})
export class ReportingService extends BaseService {
$api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
$api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
$api_recall_reporting = ``; // 撤回
$api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = ``; // 修改上传设置
$api_upload_setting_save = ``; // 修改上传设置
$api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`;
constructor(public injector: Injector) {
super(injector);
}

4
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-03-30 09:35:49
* @LastEditTime : 2022-03-30 17:39:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -137,7 +137,7 @@
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
<h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）</h2>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
<ng-template st-row="prices" let-item let-index="index">

2
src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
View File

@ -35,7 +35,7 @@
</nz-tab>
</nz-tabset>
<!-- 数据列表 -->
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_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">

2
src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
View File

@ -5,7 +5,7 @@
</nz-tabset>
</div>
<div style="width: 90%;">
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_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">

2
src/app/routes/tax-management/services/tax-management.service.ts
View File

@ -24,7 +24,7 @@ export class TaxManagementService extends BaseService {
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
// 查询运营报表
$api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
$api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
$api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
$api_recall_reporting = ``; // 撤回
$api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = ``; // 修改上传设置