From 495b5e2b0b04529db593dc0a988e70f581a2e1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 30 Mar 2022 17:15:49 +0800 Subject: [PATCH 1/2] - --- .../fund-info/fund-info.component.html | 2 +- .../fund-reporting.component.html | 22 ++++-- .../fund-reporting.component.ts | 75 ++++++++----------- .../order-reporting.component.html | 2 +- .../verify-result.component.html | 2 +- .../reporting/services/reporting.service.ts | 4 +- .../order-reporting.component.html | 4 +- .../verify-result.component.html | 2 +- .../services/tax-management.service.ts | 4 +- 9 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html index 4f50f097..ab8abf9d 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -1,5 +1,5 @@ - diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index d2d66960..07ad3e63 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -25,25 +25,33 @@ - - + + {{item?.billStatusLabel}} + + {{item?.billStatusLabel}} {{item?.billStatusLabel}} - + + + {{item?.orderCode}} + + + {{item?.wayBillCode}} {{item?.billStatusLabel}} {{item?.billStatusLabel}} - -
{{item?.amount | currency :' '}}
+ +
{{item?.tolalAmount | currency :' '}}
 - -
{{item?.amount | currency :' '}}
+ +
{{item?.payAmount | currency :' '}}
 diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index 3db9b481..fd6157e3 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -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' }, ]; } diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index e3ac3ddb..b16b7973 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -25,7 +25,7 @@ - diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index e155b1bd..8d3df409 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 1343c918..bc10de77 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -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); } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 32d82bd3..5ab12419 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -1,5 +1,5 @@ - diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html index e155b1bd..8d3df409 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index 93821ee1..d60ef650 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2021-12-27 10:30:56 @@ -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 = ``; // 修改上传设置 From 9c9985fced813043f985d9b96f5081a280d09aaa Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 17:57:38 +0800 Subject: [PATCH 2/2] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 19c73767..b69356f5 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -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 @@
-

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

+

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）

到付