Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/datatable/components/datascreen/datascreen.component.ts

@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-14 16:19:06
+ * @LastEditTime : 2022-04-14 16:21:00
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -108,10 +108,6 @@ export class DatatableDatascreenComponent implements OnInit {
   }
    genData(): any{
     let value: any = [];
-    console.log('9999999');
-    
-    // let value: any = [{city: '深圳市', weight: 5070.4}
-    // ,{city: '济宁市', weight: 338}];
     this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => {
       console.log(res);
       res.forEach((element: any) => {
@@ -122,7 +118,6 @@ export class DatatableDatascreenComponent implements OnInit {
       });
       this.salesData2 = value
     });
-    console.log(value);
   }
   initPillarData(){
         // this.curve.reRender()

src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts

@@ -24,10 +24,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   tabType!: string;
   tabs: any[] = [
-    { name: '待申报', value: '1' },
-    { name: '待审核', value: '2' },
-    { name: '已通过', value: '3' },
-    { name: '不通过', value: '4' },
+    { name: '待申报', value: '0' },
+    { name: '待审核', value: '1' },
+    { name: '已通过', value: '2' },
+    { name: '不通过', value: '3' },
     { name: '全部', value: '' }
   ];
   selectedIndex = ''; //选择的项目
@@ -54,7 +54,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    */
   get reqParams() {
     const params = Object.assign({}, this.sf?.value || {}, {
-      representationsStatus: this.selectedIndex
+      declareStatus: this.selectedIndex
     });
     delete params._$expand;
     return { ...params };
@@ -331,7 +331,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
   }
 
   selectChange(item: any) {
-    this.selectedIndex = item?.representationsStatus || '';
+    this.selectedIndex = item?.value || '';
     setTimeout(() => {
       this.st.load(1);
     });
@@ -390,7 +390,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
    */
    resetData() {
     if (this.selectedRows.length === 0) {
-      this.openWainingModal('请选择需要上传的数据');
+      this.openWainingModal('请选择需要更新的数据');
       return;
     }
     let params: any[] = [];

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-08 11:44:33
+ * @LastEditTime : 2022-04-14 16:38:56
  * @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
@@ -176,7 +176,8 @@
       附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
     </div>
   </div>
-  <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
+  <div *ngIf=" i?.payee?.name !== i?.driver?.name">车队长：{{ i?.payee?.name }}{{ i?.payee?.phone ? "/" +
+    i?.payee?.phone : ''}}/{{ i?.payee?.idNo }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>