From ea407440b6abfd5821fdddb080927b46bc0cebae Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Feb 2022 16:28:01 +0800
Subject: [PATCH] fix bug

---
 .../components/bulk/bulk.component.html       | 80 +++++++++++--------
 .../components/bulk/bulk.component.ts         |  8 +-
 .../components/vehicle/vehicle.component.html | 64 ++++++++-------
 3 files changed, 87 insertions(+), 65 deletions(-)

diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html
index 51a3ad0c..31431b09 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -1,20 +1,27 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-10 14:21:32
+ * @LastEditTime : 2022-02-21 16:27:35
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
 -->
 <!-- 搜索表单 -->
-<page-header-wrapper [title]="''">
-</page-header-wrapper>
+<page-header-wrapper [title]="''"> </page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -23,9 +30,8 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary"  [nzLoading]="service.http.loading"
-        (click)="search()">查询</button>
-          <button  nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -37,28 +43,34 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
-  <nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已取消('+tabs?.deltQuantity+')'"></nz-tab>
-</nz-tabset>
-  <div style="margin-top: 15px;">
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)">
+    <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
+  </nz-tabset>
+  <div style="margin-top: 15px">
     <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '2000px' }"
-    [data]="service.$api_get_Bulkpage"
-    [columns]="columns"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [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"
+      #st
+      [bordered]="true"
+      [scroll]="{ x: '2000px' }"
+      [data]="service.$api_get_Bulkpage"
+      [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [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"
     >
+      <ng-template st-row="driverName" let-item let-index="index">
+        <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
+      </ng-template>
+      <ng-template st-row="payeeName" let-item let-index="index">
+        <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
+      </ng-template>
       <ng-template st-row="wayBillCode" let-item let-index="index">
-        <a [routerLink]="'bulk-detail/'+item.id">{{item.wayBillCode}}</a>
+        <a [routerLink]="'bulk-detail/' + item.id">{{ item.wayBillCode }}</a>
         <div>
           <span *ngIf="item?.wayBillStatus == 1">待接单</span>
           <span *ngIf="item?.wayBillStatus == 2">待发车</span>
@@ -69,26 +81,26 @@
         </div>
       </ng-template>
       <ng-template st-row="freightPrice" let-item let-index="index">
-        {{ item.freightPrice | currency}}
+        {{ item.freightPrice | currency }}
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
         <div *ngIf="item.billExpenseDetailVOList.length > 0">
           <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price |currency }}
+            {{ data.costCodeLabel }}：{{ data.price | currency }}
             <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
           </p>
         </div>
       </ng-template>
       <ng-template st-row="wayBill" let-item let-index="index">
-        <a [routerLink]="'/waybill-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a>
+        <a [routerLink]="'/waybill-management/bulk-detail/' + item.id">{{ item.wayBillCode }}</a>
       </ng-template>
       <ng-template st-row="goodsInfos" let-item let-index="index">
-        <div>{{item?.goodsInfos?.goodsName}}</div>
-        <div>{{item?.goodsInfos?.goodsResource}}</div>
+        <div>{{ item?.goodsInfos?.goodsName }}</div>
+        <div>{{ item?.goodsInfos?.goodsResource }}</div>
       </ng-template>
       <ng-template st-row="loadingTime" let-item let-index="index">
-        <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
-        <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
+        <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
+        <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
       </ng-template>
     </st>
   </div>
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index ee80c2bd..a41c2ac5 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -286,14 +286,14 @@ tabs = {
       {
         title: '承运司机',
         className: 'text-left',
-        width: '200px',
-        index: 'driverName'
+        width: '250px',
+        render: 'driverName'
       },
       {
         title: '收款人',
         className: 'text-left',
-        width: '120px',
-        index: 'payeeName'
+        width: '200px',
+        render: 'payeeName',
       },
       {
         title: '装卸货时间',
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
index b9f61349..2d086f8c 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
@@ -7,14 +7,21 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
 -->
 <!-- 搜索表单 -->
-<page-header-wrapper [title]="''">
-</page-header-wrapper>
+<page-header-wrapper [title]="''"> </page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -23,8 +30,7 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-        <button nz-button nzType="primary"  [nzLoading]="service.http.loading"
-        (click)="search()">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
         <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
@@ -38,20 +44,26 @@
 
 <nz-card>
   <nz-tabset (nzSelectedIndexChange)="selectChange($event)">
-    <nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'待接单('+tabs?.stayQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
-    <nz-tab [nzTitle]="'已取消('+tabs?.deltQuantity+')'"></nz-tab>
+    <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
   </nz-tabset>
-  <div style="margin-top: 15px;">
-    <st #st [bordered]="true" [scroll]="{ x: '2000px' }" [data]="service.$api_get_wholePage" [columns]="columns"
+  <div style="margin-top: 15px">
+    <st
+      #st
+      [bordered]="true"
+      [scroll]="{ x: '2000px' }"
+      [data]="service.$api_get_wholePage"
+      [columns]="columns"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
       [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">
+      [loading]="service.http.loading"
+    >
       <ng-template st-row="driverName" let-item let-index="index">
         <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
       </ng-template>
@@ -60,21 +72,19 @@
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
         <div *ngIf="item.billExpenseDetailVOList.length > 0">
-          <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price | currency }}
-          </p>
+          <p *ngFor="let data of item.billExpenseDetailVOList"> {{ data.costCodeLabel }}：{{ data.price | currency }} </p>
         </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
         <div *ngIf="item.billExpenseDetailVOList.length > 0">
           <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price | currency}}
+            {{ data.costCodeLabel }}：{{ data.price | currency }}
             <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
           </p>
         </div>
       </ng-template>
       <ng-template st-row="wayBillCode" let-item let-index="index">
-        <a [routerLink]="'vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
+        <a [routerLink]="'vehicle-detail/' + item.id">{{ item.wayBillCode }}</a>
         <div>
           <span *ngIf="item?.wayBillStatus == 1">待接单</span>
           <span *ngIf="item?.wayBillStatus == 2">待发车</span>
@@ -85,16 +95,16 @@
         </div>
       </ng-template>
       <ng-template st-row="wayBill" let-item let-index="index">
-        <a [routerLink]="'/vehicle-detail/'+item.id">{{item.billCode}}</a>
+        <a [routerLink]="'/vehicle-detail/' + item.id">{{ item.billCode }}</a>
       </ng-template>
       <ng-template st-row="goodsInfos" let-item let-index="index">
-        <div>{{item?.goodsInfos?.goodsName}}</div>
-        <div>{{item?.goodsInfos?.goodsResource}}</div>
+        <div>{{ item?.goodsInfos?.goodsName }}</div>
+        <div>{{ item?.goodsInfos?.goodsResource }}</div>
       </ng-template>
       <ng-template st-row="loadingTime" let-item let-index="index">
-        <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
-        <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
+        <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
+        <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
       </ng-template>
     </st>
   </div>
-</nz-card>
\ No newline at end of file
+</nz-card>