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

src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts

@@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2022-01-12 14:01:08
+ * @LastEditTime: 2022-01-13 16:19:28
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
@@ -75,7 +75,7 @@ export class ConfirReceiptComponent implements OnInit {
       console.log(res.success)
       if(res) {
         this.service.msgSrv.success('确认签收成功！')
-        this.modal.destroy();
+        this.modal.destroy(true);
       } else {
         this.service.msgSrv.error(res.msg)
       }
@@ -102,7 +102,7 @@ export class ConfirReceiptComponent implements OnInit {
    
   }
   close(): void {
-    this.modal.destroy();
+    this.modal.destroy(true);
   }
   userAction() {
 

src/app/routes/order-management/modal/bulk/sure-depart/sure-depart.component.ts

@@ -195,7 +195,7 @@ export class SureDepartComponent implements OnInit {
   }
 
   close(): void {
-    this.modal.destroy();
+    this.modal.destroy(true);
   }
 
 }

src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts

@@ -437,7 +437,7 @@ export class VehicleSureArriveComponent implements OnInit {
       this.service.request(this.service.$api_get_insertWholeUnloadCarInfo, params).subscribe((res) => {
         if(res) {
           this.service.msgSrv.success('确认到车成功！')
-           this.modal.destroy();
+           this.modal.destroy(true);
         } else{
           this.service.msgSrv.error(res.msg)
         }
@@ -462,7 +462,7 @@ export class VehicleSureArriveComponent implements OnInit {
         this.service.request(this.service.$api_get_insertBulkUnloadCarInfo, params).subscribe((res) => {
           if(res) {
             this.service.msgSrv.success('确认到车成功！')
-             this.modal.destroy();
+             this.modal.destroy(true);
           } else{
             this.service.msgSrv.error(res.msg)
           }
@@ -503,7 +503,7 @@ export class VehicleSureArriveComponent implements OnInit {
     })
   }
   close(): void {
-    this.modal.destroy();
+    this.modal.destroy(true);
   }
 
 }

src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts

@@ -282,7 +282,7 @@ export class VehicleSureDepartComponent implements OnInit {
       this.service.request(this.service.$api_get_insertWholeStartCarInfo, params).subscribe((res) => {
         if(res) {
           this.service.msgSrv.success('确认发车成功！')
-           this.modal.destroy();
+           this.modal.destroy(true);
         } else{
           this.service.msgSrv.error(res.msg)
         }
@@ -305,7 +305,7 @@ export class VehicleSureDepartComponent implements OnInit {
         this.service.request(this.service.$api_get_insertBulkStartCarInfo, params).subscribe((res) => {
           if(res) {
             this.service.msgSrv.success('确认发车成功！')
-             this.modal.destroy();
+             this.modal.destroy(true);
           } else{
             this.service.msgSrv.error(res.msg)
           }
@@ -315,7 +315,7 @@ export class VehicleSureDepartComponent implements OnInit {
   }
 
   close(): void {
-    this.modal.destroy();
+    this.modal.destroy(true);
   }
 
 }

src/app/routes/supply-management/components/bulk/bulk.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-13 15:16:07
+ * @LastEditTime: 2022-01-13 16:02:08
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk\bulk.component.html
@@ -41,10 +41,6 @@
   </div>
 </ng-template>
 <nz-card>
-  <!-- <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
-    </nz-tab>
-  </nz-tabset> -->
   <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
     <nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
     <nz-tab [nzTitle]="'进行中('+tabs?.stayQuantity+')'"></nz-tab>

src/app/routes/vehicle/components/audit/audit.component.html

@@ -34,7 +34,7 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
         <button nz-button nzType="primary"  [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="st?.load(1)">导出</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()">导出</button>
         <button nz-button  [disabled]="service.http.loading"(click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { of } from 'rxjs';
+import { of, Subject } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { VehicleService } from '../../../vehicle/services/vehicle.service';
 @Component({
@@ -217,4 +217,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
     this.sf.reset();
     this._$expand = false;
   }
+  // 导出
+  exportFire() {
+    this.service.downloadFile(this.service.$api_carLicense_export,  this.reqParams );
+  }
 }

src/app/routes/vehicle/components/list/list.component.html

@@ -34,7 +34,7 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
         <button nz-button nzType="primary"  [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="export()">导出</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()">导出</button>
         <button nz-button  [disabled]="service.http.loading"(click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/vehicle/components/list/list.component.ts

@@ -280,9 +280,6 @@ export class VehicleComponentsListComponent implements OnInit {
       },
     ];
   }
-  daoyun(item: any) {
-    this.router.navigate(['./view', item.id], { relativeTo: this.ar });
-  }
   expandToggle() {
     this._$expand = !this._$expand;
     this.sf?.setValue('/expand', this._$expand);
@@ -298,7 +295,7 @@ export class VehicleComponentsListComponent implements OnInit {
     this._$expand = false;
   }
   // 导出
-  export() {
+  exportFire() {
  this.service.downloadFile(this.service.$api_carLicense_export,  this.reqParams );
   }
 }

src/app/routes/vehicle/services/vehicle.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2022-01-13 15:37:22
+ * @LastEditTime: 2022-01-13 15:56:57
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
@@ -52,6 +52,8 @@ export class VehicleService extends BaseService {
 
   // 导出（车辆认证表）
   $api_carLicense_export= `/api/mdc/cuc/carLicense/operate/export`;
+  // 导出（车辆审核认证表）
+  $api_carLicenseAudit_export= `/api/mdc/cuc/carLicenseAudit/operate/export`;
 
 
 

src/app/routes/waybill-management/components/bulk/bulk.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-12 14:53:26
+ * @LastEditTime: 2022-01-13 16:14:43
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -24,7 +24,7 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
         <button nz-button nzType="primary"  [nzLoading]="service.http.loading"
-          (click)="st?.load(1)">查询</button>
+        (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,11 +38,11 @@
 
 <nz-card>
   <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
-  <nz-tab [nzTitle]="'全部'"></nz-tab>
+  <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]="'已完成'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
   <nz-tab [nzTitle]="'已取消'"></nz-tab>
 </nz-tabset>
   <div style="margin-top: 15px;">

src/app/routes/waybill-management/components/bulk/bulk.component.less

@@ -3,6 +3,9 @@
      ::ng-deep nz-range-picker{
          width: 100%;
      }
+     p{
+        margin-bottom: 0
+    }
      .left_btn {
           width: 50px;
          height: 32px; 

src/app/routes/waybill-management/components/bulk/bulk.component.ts

@@ -55,7 +55,8 @@ tabs = {
   signQuantity: 0,
   cancelQuantity: 0,
   receivedQuantity: 0,
-  stayQuantity: 0
+  totalQuantity: 0,
+  compolatelQuantity: 0
 };
   constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) { }
 
@@ -351,73 +352,73 @@ tabs = {
       {
         title: '运单号',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'wayBillCode'
       },
       {
         title: '运费明细',
         width: '150px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'billExpenseDetailVOList'
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
+      { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
-      { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
+      { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
-      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
+      { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
-      { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
+      { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
       {
         title: '卸货地',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         index: 'dischargePlace'
       },
      {
         title: '货物信息',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         render: 'goodsInfos'
       },
       {
         title: '运费单价',
-        className: 'text-center',
+        className: 'text-left',
         width: '120px',
         index: 'freightPrice'
       },
       {
         title: '接单数量',
-        className: 'text-center',
+        className: 'text-left',
         width: '120px',
         index: 'orderReceivingQuantity'
 
       },
       {
         title: '结算重量',
-        className: 'text-center',
+        className: 'text-left',
         width: '200px',
         index: 'settlementWeight'
       },
       {
         title: '承运司机',
-        className: 'text-center',
+        className: 'text-left',
         width: '200px',
         index: 'driverName'
       },
       {
         title: '收款人',
-        className: 'text-center',
+        className: 'text-left',
         width: '120px',
         index: 'payeeName'
       },
       {
         title: '装卸货时间',
-        className: 'text-center',
+        className: 'text-left',
         width: '200px',
         render: 'loadingTime'
       },
       {
         title: '创建时间',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'createTime',
       },
       {
@@ -496,6 +497,10 @@ tabs = {
       { title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
     ];
   }
+  search() {
+    this.st?.load(1);
+    this.getGoodsSourceStatistical()
+  }
   /**
    * 查询字段个数
    */
@@ -599,11 +604,9 @@ tabs = {
   getGoodsSourceStatistical() {
     this.service.request(this.service.$api_get_getBulkStatistics).subscribe(res => {
       if (res) {
+        let totalCount = 0;
         res.forEach((ele: any) => {
           switch(ele.wayBillStatus) {
-            case '1':
-            this.tabs.stayQuantity = ele?.count;
-            break;
             case '2':
               this.tabs.receivedQuantity = ele?.count;
               break;
@@ -613,10 +616,13 @@ tabs = {
             case '4':
               this.tabs.signQuantity = ele?.count;
             break;
-      
+            case '5':
-
+              this.tabs.compolatelQuantity = ele?.count;
+            break;
           }
+          totalCount += ele.count
        });
+       this.tabs.totalQuantity = totalCount
       }
     })
   }
@@ -633,6 +639,10 @@ tabs = {
         },
         nzFooter: null
       });
+      modalRef.afterClose.subscribe((result: any) => {
+        this.st.load(1);
+        this.getGoodsSourceStatistical()
+    });
     }
     // 确认到车
     sureArrive(item: any) {
@@ -646,5 +656,9 @@ tabs = {
         },
         nzFooter: null
       });
+      modalRef.afterClose.subscribe((result: any) => {
+        this.st.load(1);
+        this.getGoodsSourceStatistical()
+    });
     }
 }

src/app/routes/waybill-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-12 14:51:05
+ * @LastEditTime: 2022-01-13 16:14:58
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -24,7 +24,7 @@
       </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)="st?.load(1)">查询</button>
+        (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,12 +38,12 @@
 
 <nz-card>
   <nz-tabset (nzSelectedIndexChange)="selectChange($event)">
-    <nz-tab [nzTitle]="'全部'"></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]="'已完成'"></nz-tab>
+    <nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
     <nz-tab [nzTitle]="'已取消'"></nz-tab>
   </nz-tabset>
   <div style="margin-top: 15px;">

src/app/routes/waybill-management/components/vehicle/vehicle.component.less

@@ -1,4 +1,7 @@
 :host ::ng-deep{
+    p{
+        margin-bottom: 0
+    }
     ::ng-deep nz-range-picker{
         width: 100%;
     }

src/app/routes/waybill-management/components/vehicle/vehicle.component.ts

@@ -51,7 +51,9 @@ export class WaybillManagementVehicleComponent implements OnInit {
     signQuantity: 0,
     cancelQuantity: 0,
     receivedQuantity: 0,
-    stayQuantity: 0
+    stayQuantity: 0,
+    totalQuantity: 0,
+    compolatelQuantity: 0
   };
   constructor(public service: WaybillManagementServe, private modal: NzModalService, public service2: ShipperBaseService) {}
 
@@ -301,66 +303,66 @@ export class WaybillManagementVehicleComponent implements OnInit {
       { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
       {
         title: '运单号',
-        width: '100px',
+        width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'wayBillCode'
       },
-      {
-        title: '货主出价',
-        width: '250px',
-        className: 'text-center',
-        render: 'billExpenseDetailVOList2'
-      },
       {
         title: '货源编号',
         width: '150px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'resourceCode'
       },
+      {
+        title: '货主出价',
+        width: '250px',
+        className: 'text-left',
+        render: 'billExpenseDetailVOList2'
+      },
       {
         title: '费用明细',
         width: '250px',
-        className: 'text-center',
+        className: 'text-left',
         render: 'billExpenseDetailVOList'
       },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
-      { title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-center' },
+      { title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-left' },
-      { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
+      { title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
-      { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
+      { title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
       {
         title: '卸货地',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         index: 'dischargePlace'
       },
       {
         title: '货物信息',
-        className: 'text-center',
+        className: 'text-left',
         width: '180px',
         render: 'goodsInfos'
       },
       {
         title: '承运司机',
-        className: 'text-center',
+        className: 'text-left',
         width: '120px',
         index: 'driverName'
       },
       {
         title: '收款人',
-        className: 'text-center',
+        className: 'text-left',
         width: '120px',
         index: 'payeeName'
       },
       {
         title: '装卸货时间',
-        className: 'text-center',
+        className: 'text-left',
         width: '200px',
         render: 'loadingTime'
       },
       {
         title: '创建时间',
         width: '180px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'createTime'
       },
       {
@@ -462,7 +464,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
     this.sf.reset();
     this._$expand = false;
   }
-
+  search() {
+    this.st?.load(1);
+    this.getGoodsSourceStatistical()
+  }
   // 获取录单员
   getCatalogueMember() {
     const params = {};
@@ -533,6 +538,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
   getGoodsSourceStatistical() {
     this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => {
       if (res) {
+        let totalCount = 0;
         res.forEach((ele: any) => {
           switch (ele.wayBillStatus) {
             case '1':
@@ -547,8 +553,13 @@ export class WaybillManagementVehicleComponent implements OnInit {
             case '4':
               this.tabs.signQuantity = ele?.count;
               break;
+              case '5':
+                this.tabs.compolatelQuantity = ele?.count;
+              break;
           }
+          totalCount += ele.count
         });
+       this.tabs.totalQuantity = totalCount
       }
     });
   }
@@ -565,6 +576,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
       },
       nzFooter: null
     });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.st.load(1);
+      this.getGoodsSourceStatistical()
+  });
   }
   // 确认到车
   sureArrive(item: any) {
@@ -578,5 +593,9 @@ export class WaybillManagementVehicleComponent implements OnInit {
       },
       nzFooter: null
     });
+    modalRef.afterClose.subscribe((result: any) => {
+      this.st.load(1);
+      this.getGoodsSourceStatistical()
+  });
   }
 }