From 16ac86586680d09b5fa5a2cd6158fa3c8d588ee3 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 15 Apr 2022 17:14:15 +0800
Subject: [PATCH] fix bug

---
 .../customer/customer.component.html          | 13 ++--
 .../customer/customer.component.less          | 11 +++
 .../compliance/customer/customer.component.ts | 73 +++++++++++++------
 3 files changed, 66 insertions(+), 31 deletions(-)
 create mode 100644 src/app/routes/datatable/components/compliance/customer/customer.component.less

diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html
index 45f01672..91c993cd 100644
--- a/src/app/routes/datatable/components/compliance/customer/customer.component.html
+++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html
@@ -4,17 +4,16 @@
  * @Author       : Shiming
  * @Date         : 2022-03-30 13:55:41
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-15 16:40:11
+ * @LastEditTime : 2022-04-15 17:13:53
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- 页头 -->
 <page-header-wrapper [title]="'数据报表'"></page-header-wrapper>
 <nz-card>
-  <sf   #sf mode="search" [schema]="searchSchema" (formSubmit)="st.reset($event)" (formReset)="st.reset($event)"></sf>
+  <sf   #sf mode="search" [schema]="searchSchema" button="none"></sf>
   <div class="chooseBox">
-    <!-- <button nz-button nzType="primary" (click)="exportFun()">导出</button> -->
-    <!-- <div class="timeBox">
+    <div class="timeBox">
       <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
         <label nz-radio-button nzValue="year">年</label>
         <label nz-radio-button nzValue="month">月</label>
@@ -26,7 +25,7 @@
         <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
       </div>
 
-    </div> -->
+    </div>
   </div>
   <st
   #st
@@ -34,8 +33,8 @@
   [scroll]="{ x: '2000px' }"
   [data]="service.$api_listCusComplianceReportPage"
   [columns]="columns"
-  [req]="{  process: beforeReq }"
-  [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
+  [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+  [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
   [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
   [loading]="false"
 >
diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.less b/src/app/routes/datatable/components/compliance/customer/customer.component.less
new file mode 100644
index 00000000..6b4b1cba
--- /dev/null
+++ b/src/app/routes/datatable/components/compliance/customer/customer.component.less
@@ -0,0 +1,11 @@
+.chooseBox{
+    display: flex;
+}
+.timeBox{
+    display: flex;
+    margin: 0 0 0 10px;
+}
+.dateBox{
+    display: inline-block;
+    margin: 0 0 0 10px;
+}
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts
index 2971ed5b..72bd8ee4 100644
--- a/src/app/routes/datatable/components/compliance/customer/customer.component.ts
+++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts
@@ -5,26 +5,31 @@ import { SFComponent } from '@delon/form';
  * @Author       : Shiming
  * @Date         : 2022-03-30 13:55:41
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-15 16:35:10
+ * @LastEditTime : 2022-04-15 17:13:03
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFSchema } from '@delon/form';
-import { ModalHelper, _HttpClient } from '@delon/theme';
+import { ModalHelper, _HttpClient ,DatePipe} from '@delon/theme';
 import { DataService } from '../../../services/data.service';
+import { differenceInCalendarDays } from 'date-fns';
 
 @Component({
   selector: 'app-datatable-compliance-customer',
   templateUrl: './customer.component.html',
+  styleUrls: ['./customer.component.less'],
+  providers: [DatePipe]
+
 })
 export class DatatableComplianceCustomerComponent implements OnInit {
   @ViewChild('sf', {static: false}) sf!: SFComponent
   mode = 'year';
+  type = 1;
   date: any = null;
   defineDate = [];
-  time: any = ['2022-01-01 00:00:00']
+  time: any = ['2022']
   dateFormat = 'yyyy';
   dateNext: any = null;
   modeNext = 'year';
@@ -67,29 +72,49 @@ export class DatatableComplianceCustomerComponent implements OnInit {
   
   ];
 
-  constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,) { }
-  beforeReq = (requestOptions: STRequestOptions) => {
+  constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,private datePipe: DatePipe) { }
+    /**
+   * 查询参数
+   */
+     get reqParams() {
+      if (this.mode === 'year') {
+        this.type = 1
+      } else if (this.mode === 'month') {
+        this.type = 2
+      } else if (this.mode === 'date') {
+        this.type = 3
+      } else {
+        this.type = 4
+      }
     const params: any = Object.assign({}, this.sf?.value || {});
-    delete params._$expand;
-    console.log(params);
-    if (this.sf) {
-      Object.assign(requestOptions.body, {
-        ...params,
-      });
+       params.type = this.type
+       params.queryTime = this.time
+      delete params._$expand;
+      return { ...params };
     }
-    return requestOptions;
-  };
-  afterRes = (data: any[], rawData?: any) => {
-    return data.map(item => ({
-      ...item,
-    }));
-  };
   ngOnInit(): void { }
-
-  add(): void {
-    // this.modal
-    //   .createStatic(FormEditComponent, { i: { id: 0 } })
-    //   .subscribe(() => this.st.reload());
+  onChange(result: any) {
+    if (this.mode === 'year') {
+      this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00']
+    } else if (this.mode === 'month') {
+      this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00']
+    } else if (this.mode === 'date') {
+      this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00']
+    } else {
+      this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00']
+    }
+    this.st.reload({ ...this.reqParams });
   }
-
+  changeData() {
+    if (this.mode === 'year') {
+      this.dateFormat = 'yyyy'
+    } else if (this.mode === 'month') {
+      this.dateFormat = 'yyyy-MM'
+    } else {
+      this.dateFormat = 'yyyy-MM-dd'
+    }
+  }
+  disabledDate = (current: Date): boolean =>
+  // Can not select days before today and today
+  differenceInCalendarDays(current, this.today) > 0;
 }