edit

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.
  */
@@ -18,19 +18,9 @@ module.exports = {
   //   secure: false, // Ignore invalid SSL certificates
   //   changeOrigin: true
   // }
-  '//api': {
-    target: {
-      host: 'tms-api.yunduoxing.com',
-      protocol: 'https:',
-      port: 443
-    },
-    secure: false,
-    changeOrigin: true,
-    logLevel: 'debug'
-  },
   // '//api': {
   //   target: {
-  //     host: 'tms-api-dev.eascs.com',
+  //     host: 'tms-api.yunduoxing.com',
   //     protocol: 'https:',
   //     port: 443
   //   },
@@ -38,4 +28,14 @@ module.exports = {
   //   changeOrigin: true,
   //   logLevel: 'debug'
   // },
+  '//api': {
+    target: {
+      host: 'tms-api-dev.eascs.com',
+      protocol: 'https:',
+      port: 443
+    },
+    secure: false,
+    changeOrigin: true,
+    logLevel: 'debug'
+  },
 };

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);
   }
 }

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: {

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) {

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: {
@@ -140,7 +140,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
             visibleIf: {
               _$expand: (value: boolean) => value
             },
-            asyncData: () => this.service.getNetworkFreightForwarder()
+            asyncData: () => this.service.getNetworkEnterpriseName()
           }
         }
       }