From 93b3e54035f65bc511dc36ce32ff75575bde7612 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 14 Apr 2022 20:04:00 +0800
Subject: [PATCH 1/3] fix bug

---
 .../bulk-detail/bulk-detail.component.html    | 35 +++++++++++++++++--
 .../individual-declare.component.ts           |  9 +++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 8109f880..3a0d5d54 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 10:08:12
+ * @LastEditTime : 2022-04-14 20:03:33
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -127,7 +127,7 @@
     </div>
   </div>
 </nz-card>
-<nz-card nzTitle="运费信息" #distannce3>
+<!-- <nz-card nzTitle="运费信息" #distannce3>
   <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' '
     }}{{i?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
@@ -151,6 +151,37 @@
   </div>
   <div *ngIf="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" +
     i?.payeePhone : ''}}</div>
+</nz-card> -->
+<!--
+结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
+结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
+ -->
+ <nz-card [nzTitle]="priceTitel" #distannce3
+ [hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)">
+ <ng-template #priceTitel>
+   <span>运费信息</span><span
+     style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
+ </ng-template>
+ <div style="margin-bottom: 18px">
+   <span style="color: #da001b; font-size: 18px"> {{ i?.freightPrice }}{{ i?.freightTypeLabel }} </span>（{{
+   i?.settlementBasisLabel }}，{{
+   i?.ruleLabel
+   }}）
+ </div>
+ <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <ng-template st-row="prices" let-item let-index="index">
+    {{ item.price + item.surcharge | currency }}
+  </ng-template>
+   <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
+   <ng-template st-row="price" let-item let-index="index"> {{item.price | currency}} </ng-template>
+   <ng-template st-row="surcharge" let-item let-index="index"> {{item.surcharge | currency}} </ng-template>
+ </st>
+ <div>
+   总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
+   currency }}，
+   附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%）
+ </div>
+ <div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
index 0f7c54a0..39d9db59 100644
--- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
+++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
@@ -53,9 +53,12 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const params = Object.assign({}, this.sf?.value || {}, {
-      declareStatus: this.selectedIndex
-    });
+    console.log();
+    
+    const params = Object.assign({}, this.sf?.value || {});
+    if(this.selectedIndex) {
+      params.declareStatus = this.selectedIndex
+    }
     delete params._$expand;
     return { ...params };
   }

From a2f7ba9a4f417e6632693ffb7df09a3b089568d6 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 15 Apr 2022 10:06:35 +0800
Subject: [PATCH 2/3] fix bug

---
 .../bulk-detail-change.component.html         | 55 +++++++++++--------
 .../bulk-detail/bulk-detail.component.html    | 29 +---------
 .../vehicle-detail.component.html             |  4 +-
 .../bulk-detail/bulk-detail.component.html    | 54 +++++++++++-------
 4 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index 38b54fcb..85febdb2 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-06 15:40:05
+ * @LastEditTime : 2022-04-15 09:58:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -254,31 +254,38 @@
 
       </sf>
 </nz-card>
-
-<nz-card nzTitle="运费信息"#distannce3>
-  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
-  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
-    <ng-template st-row="price" let-item let-index="index">
-      {{ item.price | currency }}
-    </ng-template>
-    <ng-template st-row="prices" let-item let-index="index">
-      {{ item.price + item.surcharge  | currency }}
-    </ng-template>
-    <ng-template st-row="surcharge" let-item let-index="index">
-      {{ item.surcharge | currency }}
-    </ng-template>
-  </st>
-  <div>
-    <div>
-      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
-      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
-    </div>
-  </div>
-  <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div>
+<!--
+结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
+结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
+ -->
+ <nz-card [nzTitle]="priceTitel" #distannce3
+ [hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)">
+ <ng-template #priceTitel>
+   <span>运费信息</span><span
+     style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
+ </ng-template>
+ <div style="margin-bottom: 18px">
+   <span style="color: #da001b; font-size: 18px"> {{ i?.freightPrice }}{{ i?.freightTypeLabel }} </span>（{{
+   i?.settlementBasisLabel }}，{{
+   i?.ruleLabel
+   }}）
+ </div>
+ <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <ng-template st-row="prices" let-item let-index="index">
+    {{ item.price + item.surcharge | currency }}
+  </ng-template>
+   <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
+   <ng-template st-row="price" let-item let-index="index"> {{item.price | currency}} </ng-template>
+   <ng-template st-row="surcharge" let-item let-index="index"> {{item.surcharge | currency}} </ng-template>
+ </st>
+ <div>
+   总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
+   currency }}，
+   附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%）
+ </div>
+ <div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }}</div>
 </nz-card>
 
-
 <nz-card nzTitle="附件信息" #distannce4>
   <sv-container>
     <sv label="协议附件">
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 3a0d5d54..3d25c047 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 20:03:33
+ * @LastEditTime : 2022-04-15 09:58:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -127,31 +127,6 @@
     </div>
   </div>
 </nz-card>
-<!-- <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' '
-    }}{{i?.ruleLabel}}）</h2>
-  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
-    <ng-template st-row="prices" let-item let-index="index">
-      {{ item.price + item.surcharge | currency }}
-    </ng-template>
-    <ng-template st-row="price" let-item let-index="index">
-      {{ item.price | currency }}
-    </ng-template>
-    <ng-template st-row="surcharge" let-item let-index="index">
-      {{ item.surcharge | currency }}
-    </ng-template>
-  </st>
-  <div>
-    <div>
-      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
-      currency }}，
-      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
-    </div>
-  </div>
-  <div *ngIf="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" +
-    i?.payeePhone : ''}}</div>
-</nz-card> -->
 <!--
 结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
 结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
@@ -181,7 +156,7 @@
    currency }}，
    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%）
  </div>
- <div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+ <div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index dba53098..b38a8cd0 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 10:09:03
+ * @LastEditTime : 2022-04-15 09:56:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -158,7 +158,7 @@
     附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
   </div>
   <div *ngIf="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' +
-    i?.payeePhone : '' }}</div>
+    i?.payeePhone : '' }}/{{ i?.payeeIdNo }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index b49c9148..b075743d 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-04-14 16:38:56
+ * @LastEditTime : 2022-04-14 20:06:41
  * @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-detail\\bulk-detail.component.html
@@ -138,25 +138,7 @@
   </div>
 </div>
 </nz-card>
-<!-- <nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
-  <div style="margin-bottom: 18px">
-    <span style="color: #da001b; font-size: 18px"> {{ i?.goodsInfos?.[0]?.freightPrice | currency }}{{ i?.goodsInfos?.[0]?.freightTypeLabel }} </span>（{{ i?.goodsInfos?.[0]?.settlementBasisLabel }}，{{
-      i?.goodsInfos?.[0]?.ruleLabel
-    }}）</div
-  >
-  <st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    <ng-template st-row="price" let-item let-index="index">
-      {{ item.price | currency}}
-    </ng-template>
-  </st>
-  <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费{{
-      totalObj?.price - attObj?.price | currency
-    }}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
-  </div>
-  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
-</nz-card> -->
-<nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'"  #distannce3>
+<!-- <nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'"  #distannce3>
   <h2>{{i?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -178,8 +160,38 @@
   </div>
   <div *ngIf=" i?.payee?.name !== i?.driver?.name">车队长：{{ i?.payee?.name }}{{ i?.payee?.phone ? "/" +
     i?.payee?.phone : ''}}/{{ i?.payee?.idNo }}</div>
+</nz-card> -->
+<!--
+结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
+结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
+ -->
+ <nz-card [nzTitle]="priceTitel" #distannce3
+ [hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)">
+ <ng-template #priceTitel>
+   <span>运费信息</span><span
+     style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
+ </ng-template>
+ <div style="margin-bottom: 18px">
+   <span style="color: #da001b; font-size: 18px"> {{ i?.freightPrice }}{{ i?.freightTypeLabel }} </span>（{{
+   i?.settlementBasisLabel }}，{{
+   i?.ruleLabel
+   }}）
+ </div>
+ <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <ng-template st-row="prices" let-item let-index="index">
+    {{ item.price + item.surcharge | currency }}
+  </ng-template>
+   <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
+   <ng-template st-row="price" let-item let-index="index"> {{item.price | currency}} </ng-template>
+   <ng-template st-row="surcharge" let-item let-index="index"> {{item.surcharge | currency}} </ng-template>
+ </st>
+ <div>
+   总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
+   currency }}，
+   附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%）
+ </div>
+ <div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
-
 <nz-card nzTitle="附件信息" #distannce4>
   <sv-container>
     <sv label="协议附件">

From f7953889ba0cb8a2f624aeb8d85dbb9f58cba447 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 15 Apr 2022 10:07:25 +0800
Subject: [PATCH 3/3] fix bug

---
 .../vehicle-detail-change.component.html             | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 33d7ebdc..6598a126 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 11:08:44
+ * @LastEditTime : 2022-04-15 10:07:20
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -243,17 +243,19 @@
       {{ item.price | currency }}
     </ng-template>
     <ng-template st-row="prices" let-item let-index="index">
-      {{ item.price + item.surcharge  | currency }}
+      {{ item.price + item.surcharge | currency }}
     </ng-template>
     <ng-template st-row="surcharge" let-item let-index="index">
       {{ item.surcharge | currency }}
     </ng-template>
   </st>
   <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
-    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
+    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight |
+    currency }}，
+    附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
   </div>
-  <div *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{   i?.payeePhone ? "/" +  i?.payeePhone : ''}}</div>
+  <div *ngIf="i?.payeePhone && i?.payeePhone !== i?.driverPhone">车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' +
+    i?.payeePhone : '' }}/{{ i?.payeeIdNo }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>