From ec007f0428f70b57564bc1f180865802b601bd31 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 16:22:24 +0800 Subject: [PATCH 1/8] fix bug --- .../advance-collection/advance-collection.component.ts | 2 +- .../financial-management/services/freight-account.service.ts | 4 +++- .../components/abnormal-warning/abnormal-warning.component.ts | 2 +- .../order-management/services/order-management.service.ts | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index a614608d..c76652f4 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -47,7 +47,7 @@ export class AdvanceCollectionComponent { } exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,); + this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_reportYskBla,); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index f13f8a01..e00bb7f9 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 15:57:44 * @LastEditors : Shiming - * @LastEditTime : 2022-04-09 15:33:41 + * @LastEditTime : 2022-04-09 16:21:52 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -153,6 +153,8 @@ export class FreightAccountService extends ShipperBaseService { $api_get_exportShipperAccountBalanceByOperator = '/api/fcc/accountBalance/exportShipperAccountBalanceByOperator'; // 运营端导出导出平台账户信息 $api_get_exportPlatformAccountBalanceByOperator = '/api/fcc/accountBalance/exportPlatformAccountBalanceByOperator'; + // 导出预收款余额 + $api_get_reportYskBla = '/api/fcc/ficoYskBla/reportYskBla'; constructor(public injector: Injector) { super(injector); diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 6da6b3cc..4e3b658f 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -285,6 +285,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { // 导出 exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList); + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport); } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index f3b441f8..733e8c27 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 09:49:44 + * @LastEditTime : 2022-04-09 16:16:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -200,6 +200,8 @@ export class OrderManagementService extends ShipperBaseService { $api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`; // 异步导出单据审核导出 $api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`; + // 异步导出单据审核导出 + $api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`; /** * 根据企业ID，获取企业历史网络货运人 * @returns From 81de151125481bbc0ff4b3165e65b89072ba2607 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 16:43:21 +0800 Subject: [PATCH 2/8] fix bug --- proxy.conf.js | 4 +-- .../voucher-management.component.ts | 28 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index f232c57a..e6de13f2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-09 15:08:08 + * @LastEditTime : 2022-04-09 16:39:20 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index 4509f291..ff9a84dc 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 15:57:44 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 17:18:16 + * @LastEditTime : 2022-04-09 16:36:42 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -172,7 +172,7 @@ export class VoucherManagementComponent implements OnInit { } } as SFDateWidgetSchema }, - inpinvcosde: { + remarks: { type: 'string', title: '凭证摘要', ui: { @@ -195,18 +195,18 @@ export class VoucherManagementComponent implements OnInit { }, default: '' }, - subid: { - type: 'string', - title: '科目', - ui: { - widget: 'dict-select', - params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } - } - }, + // subid: { + // type: 'string', + // title: '科目', + // ui: { + // widget: 'dict-select', + // params: { dictKey: 'refund:apply:status' }, + // placeholder: '请选择', + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // }, drmoney: { type: 'string', title: '借方金额', From 40ddeacd61c00e871970ed7eb30f5eeef3502df1 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 16:54:45 +0800 Subject: [PATCH 3/8] fix bug --- .../components/cost-management/cost-management.component.ts | 6 +++++- .../components/receipt-order/receipt-order.component.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index b9385b34..78ec7e3a 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -156,7 +156,11 @@ export class CostManagementComponent implements OnInit { feeSubId: { type: 'string', title: '费用科目', - enum: [{ label: '全部', value: '全部' }], + enum: [ + { label: '全部', value: '全部' }, + { label: '运输费', value: '1475197820443299842' }, + { label: '附加费', value: '1476197820443299842 ' }, + ], ui: { widget: 'select', placeholder: '请选择', diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 820d90b9..cb5cee51 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -217,7 +217,7 @@ export class ReceiptOrderComponent implements OnInit { // }, remarks: { type: 'string', - title: '付款备注', + title: '收款备注', ui: { placeholder: '请输入', visibleIf: { From d8ec7e2b168df9745fc4ecf25ec577e02f870db7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 16:59:42 +0800 Subject: [PATCH 4/8] fix bug --- .../components/receipt-order/receipt-order.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index cb5cee51..bf8006d6 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -104,7 +104,7 @@ export class ReceiptOrderComponent implements OnInit { placeholder: '请输入' } }, - ltdid: { + ltdId: { type: 'string', title: '网络货运人', ui: { From 60e96b0fead9f17f4b5df214ad51c5e723460174 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 17:02:04 +0800 Subject: [PATCH 5/8] fix bug --- .../payable-order/payable-order.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 65872e27..c42174ca 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -45,11 +45,11 @@ export class PayableOrderComponent implements OnInit { } }); } - if (this.sf.value?.ahxdate) { + if (this.sf.value?.phxdate) { Object.assign(requestOptions.body, { - ahxdate: { - start: this.sf.value.ahxdate?.[0] || null, - end: this.sf.value.ahxdate?.[1] || null + phxdate: { + start: this.sf.value.phxdate?.[0] || null, + end: this.sf.value.phxdate?.[1] || null } }); } @@ -210,7 +210,7 @@ export class PayableOrderComponent implements OnInit { }, remarks: { type: 'string', - title: '付款备注', + title: '核销备注', ui: { autocomplete: 'off', placeholder: '请选择', From 2e5203df4320d35161fb51659b336a93594b90d2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 17:11:41 +0800 Subject: [PATCH 6/8] fix bug --- .../etc-blacklist.component.html | 75 ++++++++++++------- .../etc-blacklist/etc-blacklist.component.ts | 10 ++- .../services/ticket.service.ts | 6 +- 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html index 007c85c4..94d5cf5f 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html @@ -1,36 +1,57 @@ + - - - - - + + + + + -
-
- -
-
- - - -
+
+
+
+
+ + + +
+
-
- - -
- 已选择 - {{ selectedRows.length }} 条数据 - 清空 -
+
+ + +
+ 已选择 + {{ selectedRows.length }} 条数据 + 清空
- - \ No newline at end of file +
+ + diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index 413fe016..a899ade5 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -245,7 +245,7 @@ export class ETCBlacklistComponent implements OnInit { tabType: (value: number) => this.tabType === 2 } } - }, + } // params6: { // title: '手机号', // type: 'string', @@ -294,4 +294,12 @@ export class ETCBlacklistComponent implements OnInit { } ]; } + // 导出 + exprot() { + if (this.tabType == 1) { + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_aficoShipperWhiteList_asyncExport); + } else { + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_ficoCarWhiteList_asyncExport); + } + } } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 51225f25..77f68a0c 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-29 13:12:35 - * @LastEditTime : 2022-04-09 15:49:11 + * @LastEditTime : 2022-04-09 17:08:15 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts @@ -136,6 +136,10 @@ export class TicketService extends ShipperBaseService { $api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList'; // ETC开票记录导出 $api_get_asyncExportEtcApplyRecordList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyRecordList'; + // ETC白名单（货主）导出接口 + $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoShipperWhiteList/asyncExport'; + // ETC白名单（车辆）导出接口 + $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoCarWhiteList/asyncExport'; constructor(public injector: Injector) { super(injector); From 18b7a30b1729cefdda937f98910ddda92294f34b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 17:13:20 +0800 Subject: [PATCH 7/8] fix bug --- .../components/transaction-flow/transaction-flow.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 7e8eb745..7f26b5ca 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -151,7 +151,7 @@ export class TransactionFlowComponent { }, default: '' }, - enterpriseName: { + roleName: { type: 'string', title: '账户名称', ui: { From 5fe34208af76f19ffead852f50e273d9964619f9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 9 Apr 2022 17:21:05 +0800 Subject: [PATCH 8/8] fix bug --- .../abnormal-warning.component.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 4e3b658f..29a61f01 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -99,7 +99,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { ui: { } }, - wayCode: { + wayBillCode: { type: 'string', title: '运单号', ui: { @@ -213,13 +213,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { */ initST() { this.columns = [ - { - title: '运单号', - width: '180px', - fixed: 'left', - className: 'text-left', - index: 'wayCode' - }, { title: '订单号', width: '180px', @@ -227,6 +220,13 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { className: 'text-left', index: 'billCode' }, + { + title: '运单号', + width: '180px', + fixed: 'left', + className: 'text-left', + index: 'wayCode' + }, { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => { return item?.resourceTypeLabel + item?.serviceTypeLabel } },