fix bug

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>

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 };
   }