From d18d3bf3ec790b6234408b992cedcb21b74f7cf6 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 19:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../receipt-order.component.html              | 86 +++++++++++--------
 .../receipt-order/receipt-order.component.ts  | 36 ++++----
 .../services/freight-account.service.ts       |  7 +-
 .../vehicle/components/list/list.component.ts | 10 ---
 4 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
index b0c357ba..e642a8e9 100644
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
@@ -1,42 +1,60 @@
-<page-header-wrapper [title]="'收款单'">
-</page-header-wrapper>
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-18 18:43:42
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-01-18 18:58:32
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="'收款单'"> </page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
-    <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-                [button]="'none'"></sf>
-        </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button nzType="primary" > 导出</button>
-            <button nz-button nzType="primary" > 导出核销</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
+  <div nz-row nzGutter="8">
+    <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <sf
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      <button nz-button (click)="resetSF()">重置</button>
+      <button nz-button nzType="primary"> 导出</button>
+      <button nz-button nzType="primary"> 导出核销</button>
+      <button nz-button nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-
-    <div class="d-flex align-items-center mb-md mt-md">
-        <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
-        <button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button>
-        <div class="ml-md">
-            已选择
-            <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
-            <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-        </div>
+  <div class="d-flex align-items-center mb-md mt-md">
+    <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
+    <button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button>
+    <div class="ml-md">
+      已选择
+      <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
+      <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
     </div>
+  </div>
 
-    <st #st [data]="service.$api_get_receipt_page" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '450px' }" (change)="stChange($event)">
-    </st>
-</nz-card>
\ No newline at end of file
+  <st
+    #st
+    [data]="service.$api_get_receipt_page"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px', y: '450px' }"
+    (change)="stChange($event)"
+  >
+  </st>
+</nz-card>
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 37d462dd..68fb6231 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
@@ -222,14 +222,14 @@ export class ReceiptOrderComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' },
-      { title: '收款单号', index: 'brmcode', type: 'link', width: 140 },
-      { title: '网络货运人', index: 'ltdId', width: 140 },
-      { title: '到账日期', index: 'brmdate', type: 'date', width: 140 },
-      { title: '收款账户', index: 'ltdaccountId', width: 140 },
+      { title: '收款单号', index: 'brmcode', type: 'link', width: 180 , className: 'text-left'},
+      { title: '网络货运人', index: 'ltdId', width: 200 , className: 'text-left'},
+      { title: '到账日期', index: 'brmdate', type: 'date', width: 200 , className: 'text-left'},
+      { title: '收款账户', index: 'ltdaccountId', width: 200 , className: 'text-left'},
       {
         title: '到账金额',
         index: 'brmmoney',
-        width: 120,
+        width: 200,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.brmmoney }) }
@@ -237,7 +237,7 @@ export class ReceiptOrderComponent implements OnInit {
       {
         title: '核销金额',
         index: 'armoney',
-        width: 120,
+        width: 200,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
@@ -245,23 +245,23 @@ export class ReceiptOrderComponent implements OnInit {
       {
         title: '预收金额',
         index: 'yskmoney',
-        width: 120,
+        width: 200,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }
       },
-      { title: '银行类型', index: 'paybanktype', width: 120 },
-      { title: '收款类型', index: 'brmtype', width: 120 },
-      { title: '收款方式', index: 'brmmode', width: 120 },
-      { title: '付款人', index: 'artoname', width: 120 },
-      { title: '银行水单', index: 'bankreceipt', width: 140 },
-      { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
-      { title: '创建人', index: 'createUserId', width: 120 },
-      { title: '收款状态', index: 'sts', width: 120 },
-      { title: '收款备注', index: 'remarks', width: 180 },
+      { title: '银行类型', index: 'paybanktype', width: 200 , className: 'text-left'},
+      { title: '收款类型', index: 'brmtype', width: 150 , className: 'text-left'},
+      { title: '收款方式', index: 'brmmode', width: 150 , className: 'text-left'},
+      { title: '付款人', index: 'artoname', width: 200 , className: 'text-left'},
+      { title: '银行水单', index: 'bankreceipt', width: 200 , className: 'text-left'},
+      { title: '创建时间', index: 'createTime', type: 'date', width: 200 , className: 'text-left'},
+      { title: '创建人', index: 'createUserId', width: 150 , className: 'text-left'},
+      { title: '收款状态', index: 'sts', width: 200 , className: 'text-left'},
+      { title: '收款备注', index: 'remarks', width: 200 , className: 'text-left'},
       {
         title: '操作',
-        width: '90px',
+        width: '80px',
         fixed: 'right',
         className: 'text-center',
         buttons: [
@@ -270,7 +270,7 @@ export class ReceiptOrderComponent implements OnInit {
             click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
           },
           {
-            text: '修改',
+            text: '修改　',
             click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
           }
         ]
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 68e5a188..d2ee5de4 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-01-18 17:17:26
+ * @LastEditTime : 2022-01-18 19:05:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -86,6 +86,11 @@ export class FreightAccountService extends ShipperBaseService {
   // 查询收款单抬头
   $api_get_receipt_page = '/api/fcc/ficoBrmH/list/page';
 
+  // 收款单浏览抬头
+  $api_get_ficoInpinvL_page = '/api/fcc/ficoBrmH/get';
+  // 收款单浏览表格明细
+  $api_get_ficoInpinvL_getListByBrmHid = '/api/fcc/ficoBrmYsk/getListByBrmHid';
+
   constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);
   }
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index 69734c2c..170a0fcf 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -114,9 +114,6 @@ export class VehicleComponentsListComponent implements OnInit {
           ],
           ui: {
             widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value,
-            },
           },
         },
         carModel: {
@@ -143,13 +140,6 @@ export class VehicleComponentsListComponent implements OnInit {
             },
           },
         },
-        carLoad: {
-          title: '载重',
-          type: 'string',
-          visibleIf: {
-            expand: (value: boolean) => value,
-          },
-        },
         isSelf: {
           type: 'string',
           title: '是否挂靠',