From b8870850b4dfae4f0ca3d2c9dd168a1faa8ab8dd Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 13:10:42 +0800 Subject: [PATCH 1/3] fix bug --- .../mancustomtable/mancustomtable.component.ts | 10 +++++++--- .../individual-collect/individual-collect.component.ts | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index f4db64b7..33d0efd4 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -12,7 +12,6 @@ import { DataService } from '../../../services/data.service'; providers: [DatePipe] }) export class DatatableMancustomtableComponent implements OnInit { - url = `/user`; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; _$expand = false; @@ -20,6 +19,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; + columns: STColumn[] =[]; resourceStatus: number = 1; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; @@ -61,7 +61,8 @@ export class DatatableMancustomtableComponent implements OnInit { } } }; - columns: STColumn[] = [ + initST() { + this.columns =[ { title: '部门', index: 'department', className: 'text-center', width: '200px' }, { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> { @@ -94,6 +95,7 @@ export class DatatableMancustomtableComponent implements OnInit { }, { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } ]; + } /** * 查询参数 */ @@ -121,6 +123,7 @@ export class DatatableMancustomtableComponent implements OnInit { constructor(public service: DataService, private datePipe: DatePipe) {} ngOnInit(): void { this.initSF(); + this.initST(); } /** * 初始化查询表单 @@ -239,7 +242,8 @@ export class DatatableMancustomtableComponent implements OnInit { this.resourceStatus = e + 1; // this.initST(); setTimeout(() => { - this.st.load(); + this.initST(); + // this.st.load(1); }, 500); } } diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 59dd9601..2ae3d17a 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -130,7 +130,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } } as SFDateWidgetSchema }, - enterpriseInfoId: { + nsrmc: { type: 'string', title: '网络货运人', ui: { From 3fb6937c877f4ecfb71f5b2aaab879ce5fe41ea7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 13:22:11 +0800 Subject: [PATCH 2/3] fix bug --- proxy.conf.js | 4 ++-- .../individual-collect/individual-collect.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3ec9b0fd..15faf001 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-18 16:40:52 + * @LastEditTime : 2022-04-19 13:17:35 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,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/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 2ae3d17a..f893b05a 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -140,7 +140,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - asyncData: () => this.service.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkEnterpriseName() } } } From 53872812102bafd81b1302c4a902f9c8a831cbad Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 19 Apr 2022 13:56:26 +0800 Subject: [PATCH 3/3] fix bug --- .../components/customtable/owner/owner.component.ts | 12 ++++++------ src/app/routes/datatable/services/data.service.ts | 9 +++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index f9660833..54549d42 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -39,9 +39,9 @@ export class DatatableOwnerComponent implements OnInit { { title: '合伙人', index: 'partnerName', className: 'text-center', width: '100px' }, { title: '客户状态', index: 'customerStatus', className: 'text-center', width: '100px', type: 'enum', enum: { 1: '未激活', - 2: '沉默', - 3: '流失', - 4: '活跃' + 2: '流失', + 3: '活跃', + 4: '沉默' } }, { title: '订单数', index: 'zsl', className: 'text-center', width: '100px' }, { title: '订单金额', index: 'ddje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ddje }) } }, @@ -117,9 +117,9 @@ export class DatatableOwnerComponent implements OnInit { }, enum: [ {label: '未激活', value: 1}, - {label: '沉默', value: 2}, - {label: '流失', value: 3}, - {label: '活跃', value: 4}, + {label: '流失', value: 2}, + {label: '活跃', value: 3}, + {label: '沉默', value: 4}, ] }, registerTime: { diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index a75ff652..609ed1b6 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -93,6 +93,15 @@ export class DataService extends BaseService { // 业务员-合规报表 $api_listPartComplianceReportPage = `/api/sdc/report/listPartComplianceReportPage`; + // 数据报表-订单类型比例 + $api_getBillTypeProportion = `/api/sdc/reportData/getBillTypeProportion`; + // 数据报表-运单直付比例 + $api_getWayBillDirectProportion = `/api/sdc/reportData/getWayBillDirectProportion`; + // 数据报表-统计订单金额-趋势 + $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + // // 数据报表-统计订单金额-趋势 + // $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + constructor(public injector: Injector) {