From e1f3d60e9fbb6afe1db7559ec51a4a5977405b93 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 11 May 2022 15:49:06 +0800
Subject: [PATCH] fix bug

---
 .../individual-collect.component.ts           | 11 +++-
 .../individual-declare.component.ts           | 13 +++--
 .../individual-income.component.ts            | 11 +++-
 .../order-reporting.component.html            | 56 ++++++++++---------
 .../order-reporting.component.ts              | 22 ++++----
 5 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
index 05582e51..afc71b8e 100644
--- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
+++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
@@ -245,7 +245,16 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent
    * @param params 更新数据
    */
   uploadSetting() {
-    this.service.request(this.service.$api_get_updateData).subscribe((res: any) => {
+    let params: any;
+    if (this.selectedRows.length === 0) {
+      params ={}
+    } else{
+      params = [];
+      this.selectedRows.forEach(item => {
+        params.push(item.billId);
+      });
+    }
+    this.service.request(this.service.$api_get_updateData,params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('更新成功');
         this.search();
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 3c70d41c..8c42895a 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
@@ -381,14 +381,15 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent
    * @param params 更新数据
    */
   resetData() {
+    let params: any;
     if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要更新的数据');
-      return;
+      params ={}
+    } else{
+      params = [];
+      this.selectedRows.forEach(item => {
+        params.push(item.billId);
+      });
     }
-    let params: any[] = [];
-    this.selectedRows.forEach(item => {
-      params.push(item.id);
-    });
     this.service.request(this.service.$api_get_taxDeclaration_updateAll, params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('更新成功');
diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
index 28b29378..2ec165c0 100644
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
@@ -326,7 +326,16 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent
    * @param params 更新数据
    */
   uploadSetting() {
-    this.service.request(this.service.$api_update_individual_income_page).subscribe((res: any) => {
+    let params: any;
+    if (this.selectedRows.length === 0) {
+      params ={}
+    } else{
+      params = [];
+      this.selectedRows.forEach(item => {
+        params.push(item.billId);
+      });
+    }
+    this.service.request(this.service.$api_update_individual_income_page, params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('更新成功');
         this.search();
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
index 73ab8a36..47f7d738 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@@ -20,33 +20,37 @@
 <nz-card class="table-box">
   <div class="tab_header">
     <label class="page_title"> <label class="driver">|</label> 订单上报</label>
-    <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
-      <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
-      </nz-tab>
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
+      <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
     </nz-tabset>
   </div>
 
   <!-- 数据列表 -->
-  <st #st [scroll]="{x:'1200px',y:scrollY}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
-    [req]="{  params: reqParams }" [page]="{ }" [loading]="service.http.loading">
+  <st
+    #st
+    [scroll]="{ x: '1200px', y: scrollY }"
+    [data]="service.$api_getTaxOrderPage_page"
+    [columns]="columns"
+    [req]="{ params: reqParams }"
+    [page]="{}"
+    [loading]="service.http.loading"
+  >
     <ng-template st-row="putStatus" let-item let-index="index">
       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
       <span *ngIf="item?.putStatus == '0'">待上传</span>
       <span *ngIf="item?.putStatus == '1'">已上传</span>
       <span *ngIf="item?.putStatus == '3'">上传中</span>
-      <span *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
-
+      <span *ngIf="item?.putStatus == '2'" style="color: red" (click)="unnormal(item)">上传异常</span>
     </ng-template>
     <ng-template st-row="checkStatus" let-item let-index="index">
       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
       <span *ngIf="item?.checkStatus == '0'">校验中</span>
       <span *ngIf="item?.checkStatus == '1'">通过</span>
       <!-- <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
-      <a *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</a>
-
+      <a *ngIf="item?.checkStatus == '2'" style="color: red" (click)="viewResult(item)">不通过</a>
     </ng-template>
     <ng-template st-row="driverName" let-item let-index="index">
-      <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
+      <div> {{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }} </div>
     </ng-template>
     <!-- <ng-template st-row="localValid" let-item let-index="index">
       <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
@@ -73,6 +77,10 @@
         </div>
       </div>
     </ng-template>
+    <ng-template st-row="goodsName" let-item let-index="index">
+      <div> 货物名称：{{ item.goodsName ? item.goodsName : '--' }} </div>
+      <div> {{ item.loadWeight ? item.loadWeight : '--' }}吨/{{ item.loadVolume ?item.loadVolume: '--' }}方 </div>
+    </ng-template>
     <ng-template st-row="signatureForm" let-item let-index="index">
       <div class="imgBox">
         <div *ngIf="item.signatureForm">
@@ -81,7 +89,7 @@
       </div>
     </ng-template>
     <ng-template st-row="orderAmount" let-item let-index="index">
-      <div class="text-right">{{item?.orderAmount | currency }}</div>
+      <div class="text-right">{{ item?.orderAmount | currency }}</div>
     </ng-template>
   </st>
 </nz-card>
@@ -91,26 +99,20 @@
       已选择
       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
     </div>
-    <button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']"
-      (click)="openDrawer()">筛选</button>
+    <button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" (click)="openDrawer()"
+      >筛选</button
+    >
     <button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']"> 导出</button>
     <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
-      更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
+      更多<i nz-icon nzType="down" nzTheme="outline"></i
+    ></button>
     <nz-dropdown-menu #menu="nzDropdownMenu">
       <ul nz-menu>
-        <li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']">
-          上传
-        </li>
-        <li nz-menu-item (click)="recall() " acl [acl-ability]="['TAX-ORDERREPORT-recall']">
-          撤回
-        </li>
-        <li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-resetData']">
-          更新数据
-        </li>
-        <li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-uploadSetting']">
-          税务设置
-        </li>
+        <li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']"> 上传 </li>
+        <li nz-menu-item (click)="recall()" acl [acl-ability]="['TAX-ORDERREPORT-recall']"> 撤回 </li>
+        <li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-resetData']"> 更新数据 </li>
+        <li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-uploadSetting']"> 税务设置 </li>
       </ul>
     </nz-dropdown-menu>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
index 93b7dcd7..118f5ca7 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@@ -230,13 +230,13 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
       { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' },
       { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' },
       { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },
-      { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' },
+      { title: '结束时间', index: 'orderPayTime', className: 'text-center', width: '150px' },
       { title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' },
       { title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' },
-      { title: '司机身份证号', index: 'transpdriverCertificateNumberortInfo', className: 'text-center', width: '180px' },
+      { title: '司机身份证号', index: 'driverCertificateNumber', className: 'text-center', width: '180px' },
       { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' },
-      { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' },
-      { title: '运费金额', render: 'payeeName', className: 'text-center', width: '100px' },
+      { title: '货物信息', render: 'goodsName', className: 'text-center', width: '200px' },
+      { title: '运费金额', render: 'orderAmount', className: 'text-center', width: '100px' },
       { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' },
       { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' },
       { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' },
@@ -285,14 +285,16 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
    * @param record 记录实例
    */
   resetData() {
+    let params: any;
     if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要更新的数据！');
-      return;
+      params ={}
+    } else{
+      params = [];
+      this.selectedRows.forEach(item => {
+        params.push(item.billId);
+      });
     }
-    let params: any[] = [];
-    this.selectedRows.forEach(item => {
-      params.push(item.billId);
-    });
+  
     this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('更新成功');