From 0d3f205c5a8e0533d7ec3fdf9b1fbe24adf2ed4b Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 12 Apr 2022 09:54:40 +0800
Subject: [PATCH] edit

---
 .../voucher-summary.component.html             |  5 +++--
 .../voucher-summary.component.ts               | 18 +++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
index bd2dffe4..0c1d57e9 100644
--- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
+++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
@@ -13,12 +13,13 @@
 
 <nz-card class="search-box" nzBordered>
     <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
             <sf #sf [schema]="searchSchema"
                 [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
                 [button]="'none'"></sf>
         </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+            [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
             <!-- <button nz-button nzType="primary" [disabled]="false"> 导出</button>
diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts
index fbf1eba6..ddb69827 100644
--- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts
+++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts
@@ -11,7 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-voucher-summary',
   templateUrl: './voucher-summary.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class VoucherSummaryComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -39,12 +39,12 @@ export class VoucherSummaryComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         createtime: {
-          start: this.sf.value.createtime?.[0] || null,
-          end: this.sf.value.createtime?.[1] || null
+          start: this.sf.value.createtime?.[0] || '',
+          end: this.sf.value.createtime?.[1] || ''
         },
         vctime: {
-          start: this.sf.value.vctime?.[0] || null,
-          end: this.sf.value.vctime?.[1] || null
+          start: this.sf.value.vctime?.[0] || '',
+          end: this.sf.value.vctime?.[1] || ''
         }
       });
     }
@@ -286,8 +286,8 @@ export class VoucherSummaryComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
-      { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 140 },
-      { title: '帐套', index: 'vcltdcode', width: 120 },
+      { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 180 },
+      { title: '帐套', index: 'vcltdcode', width: 180 },
       { title: '凭证时间', index: 'createTime', type: 'date', width: 150 },
       {
         title: '统计区间',
@@ -307,7 +307,7 @@ export class VoucherSummaryComponent implements OnInit {
       {
         title: '借方金额',
         index: 'drmoney',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.drmoney }) }
@@ -315,7 +315,7 @@ export class VoucherSummaryComponent implements OnInit {
       {
         title: '贷方金额',
         index: 'crmoney',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.crmoney }) }