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

src/app/routes/order-management/components/risk/risk.component.html

@@ -38,10 +38,14 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
+  [nzTabBarExtraContent]="extraTemplate">
-    </nz-tab>
+  <nz-tab [nzTitle]="'全部'"></nz-tab>
-  </nz-tabset>
+  <nz-tab [nzTitle]="'待申诉('+tabs?.stayQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'申诉中('+tabs?.stayQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'申诉成功('+tabs?.receivedQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'申诉失败('+tabs?.cancelQuantity+')'"></nz-tab>
+</nz-tabset>
   <div style="margin-top: 15px;">
     <st
     #st

src/app/routes/order-management/components/risk/risk.component.ts

@@ -23,38 +23,18 @@ export class OrderManagementRiskComponent implements OnInit {
   auditMany = false;
   auditId: any;
   isVisibleRE = false;
+  resourceStatus: any;
   _$expand = false;
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
-  tabs = [
+  tabs = {
-    {
+    totalQuantity: 0,
-      name: '全部',
+    cancelQuantity: 0,
-      type: 5,
+    receivedQuantity: 0,
-      count: 0
+    stayQuantity: 0
-    },
+  };
-    {
-      name: '待申诉',
-      type: 5,
-      count: 0
-    },
-    {
-      name: '申诉中',
-      type: 5,
-      count: 0
-    },
-    {
-      name: '申诉成功',
-      type: 5,
-      count: 0
-    },
-    {
-      name: '申诉失败',
-      type: 5,
-      count: 0
-    }
-  ];
   constructor(
     public service: SupplyManagementService,
     public service2: ShipperBaseService,
@@ -65,9 +45,14 @@ export class OrderManagementRiskComponent implements OnInit {
   /**
    * 查询参数
    */
-  get reqParams() {
+   get reqParams() {
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.representationsStatus = this.resourceStatus 
+    }
     return {
-      ...this.sf?.value
+      ...a,
+      ...this.sf?.value,
     };
   }
   get selectedRows() {
@@ -401,6 +386,11 @@ export class OrderManagementRiskComponent implements OnInit {
 
   selectChange(e: number) {
     console.log(e);
+    this.resourceStatus = e;
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
   }
   /**
    * 导入货源

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

@@ -2,6 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -79,7 +80,7 @@ export class OrderManagementVehicleComponent implements OnInit {
     count: 0,
   },
   ];
-  constructor(public service: SupplyManagementService, private modal: NzModalService) { }
+  constructor(public service: SupplyManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
 
   /**
  * 查询参数
@@ -104,41 +105,50 @@ export class OrderManagementVehicleComponent implements OnInit {
   /**
  * 初始化查询表单
  */
-  initSF() {
+   initSF() {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
-        no: {
+        billCode: {
           type: 'string',
-          title: '订单号',
+          title: '订单号'
         },
-        no2: {
+        resourceCode: {
           type: 'string',
           title: '货源编号'
         },
-        no1: {
+        externalResourceCode: {
           type: 'string',
-          title: '货主'
+          title: '外部订单号'
         },
-        no3: {
+        loadingPlace: {
           type: 'string',
           title: '装货地',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
-        no4: {
+        dischargePlace: {
           type: 'string',
           title: '卸货地',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
-        brandId: {
+        // driverName: {
+        //   type: 'string',
+        //   title: '承运司机',
+        //   ui: {
+        //     visibleIf: {
+        //       _$expand: (value: boolean) => value,
+        //     },
+        //   }
+        // },
+        driverId: {
           title: '承运司机',
           type: 'string',
           ui: {
@@ -149,68 +159,72 @@ export class OrderManagementVehicleComponent implements OnInit {
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
+                  .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  model: 1, type: 1 })
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
               }
             },
             visibleIf: {
-              expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFSelectWidgetSchema,
+          } as SFSelectWidgetSchema
         },
         no9: {
           type: 'string',
           title: '车牌号',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
-        brandId2: {
+        no10: {
-          title: '车队长',
           type: 'string',
+          title: '收款人',
           ui: {
-            widget: 'select',
-            serverSearch: true,
-            searchDebounceTime: 300,
-            searchLoadingText: '搜索中...',
-            onSearch: (q: any) => {
-              if (!!q) {
-                return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
-                  model: 1, type: 2 })
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
-                  .toPromise();
-              } else {
-                return of([]);
-              }
-            },
             visibleIf: {
-              expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFSelectWidgetSchema,
+          }
         },
-        sex: {
+        wayBillType: {
-          title: '支付状态',
+          title: '运单类型',
           type: 'string',
-          default: 0,
+          ui: {
-          enum: [
+            widget: 'dict-select',
-            { label: '未知', value: 0 },
+            params: { dictKey: 'goodresourceType' },
-            { label: '男', value: 1 },
+            containAllLable: true,
-            { label: '女', value: 2 },
+            visibleIf: {
-            { label: '保密', value: 3 },
+              _$expand: (value: boolean) => value
-          ],
+            }
+          } as SFSelectWidgetSchema
+        },
+        shipperId: {
+          title: '托运人',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'BulkFreightUnitPriceType' },
+            containAllLable: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
+        enterpriseInfoName: {
+          type: 'string',
+          title: '网络货运人',
           ui: {
             widget: 'select',
+            placeholder: '请选择',
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
             },
-          } as SFSelectWidgetSchema,
+            allowClear: true,
+            asyncData: () => this.service2.getNetworkFreightForwarder()
+          }
         },
         createTime: {
           title: '创建时间',
@@ -220,72 +234,12 @@ export class OrderManagementVehicleComponent implements OnInit {
             mode: 'range',
             format: 'yyyy-MM-dd',
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFDateWidgetSchema,
+          } as SFDateWidgetSchema
-        },
+        }
-        appId: {
-          type: 'string',
-          title: '是否风险单',
-          ui: {
-            widget: 'select',
-            placeholder: '请选择',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-            allowClear: true,
-            asyncData: () => this.getCatalogueMember(),
-          },
-        },
-        sex3: {
-          title: '网络货运人',
-          type: 'string',
-          default: 0,
-          enum: [
-            { label: '未知', value: 0 },
-            { label: '男', value: 1 },
-            { label: '女', value: 2 },
-            { label: '保密', value: 3 },
-          ],
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-        },
-        sex4: {
-          title: '货物名称',
-          type: 'string',
-          default: 0,
-          enum: [
-            { label: '未知', value: 0 },
-            { label: '男', value: 1 },
-            { label: '女', value: 2 },
-            { label: '保密', value: 3 },
-          ],
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-        },
-        serviceType: {
-          title: '服务类型',
-          type: 'string',
-          default: '',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'ServiceType' },
-            containAllLable:true,
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-        },
       },
-      type: 'object',
+      type: 'object'
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
@@ -296,12 +250,11 @@ export class OrderManagementVehicleComponent implements OnInit {
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
-      
       {
         title: '订单号',
         width: '100px',
         className: 'text-center',
-        render: 'goodsId'
+        render: 'billCode'
       },
       {
         title: '运费明细',

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

@@ -76,15 +76,20 @@ export class VehicleComponentsAuditComponent implements OnInit {
           ui: {
             widget: 'select',
             serverSearch: true,
-            searchDebounceTime: 300,
+            searchDebounceTime: 250,
             searchLoadingText: '搜索中...',
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
+                  .request(this.service.$api_get_getCarLicenseListByCarNo_audit, {
                     carNo: q
                   })
-                  .pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
+                  .pipe(map((res: any) => (res.records as any[]).map((i) => (
+                    { label: i.carNo, value: i.carNo 
+                    } as SFSchemaEnum)
+                    )
+                    )
+                    )
                   .toPromise();
               } else {
                 return of([]);

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-15 16:38:35
+ * @LastEditTime: 2021-12-17 17:29:51
  * @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\components\freight\list\list.component.html
@@ -67,6 +67,17 @@
           {{ item?.isSelf ? '是' : '否' }}
       </div>
     </ng-template>
+    <ng-template st-row="approvalAuditStatus" let-item let-index="index">
+      <div>
+        <span *ngIf="item?.auditStatusEnum === -1 || item?.auditStatusEnum === '-1' && item?.isSelf">未上传</span>
+        <span *ngIf="item?.auditStatusEnum === 0 || item?.auditStatusEnum === '0' && item?.isSelf">草稿</span>
+        <span *ngIf="item?.auditStatusEnum === 10 || item?.auditStatusEnum === '10' && item?.isSelf">待审核</span>
+        <span *ngIf="item?.auditStatusEnum === 20 || item?.auditStatusEnum === '20' && item?.isSelf">已审核</span>
+        <span *ngIf="item?.auditStatusEnum === 30 || item?.auditStatusEnum === '30' && item?.isSelf">已驳回</span>
+        <span *ngIf="item?.auditStatusEnum === 40 || item?.auditStatusEnum === '40' && item?.isSelf">证件过期</span>
+        <span *ngIf="!item?.isSelf">-</span>
+      </div>
+    </ng-template>
     <ng-template st-row="stateCol" let-item let-index="index">
       <nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>
       <nz-tag *elseBlock nzColor="success">正常</nz-tag>

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

@@ -77,7 +77,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ui: {
             widget: 'select',
             serverSearch: true,
-            searchDebounceTime: 300,
+            searchDebounceTime: 250,
             searchLoadingText: '搜索中...',
             onSearch: (q: any) => {
               if (!!q) {
@@ -85,7 +85,12 @@ export class VehicleComponentsListComponent implements OnInit {
                   .request(this.service.$api_get_getCarLicenseListByCarNo, {
                     carNo: q
                   })
-                  .pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
+                  .pipe(map((res: any) => (res.records as any[]).map((i) => (
+                    { label: i.carNo, value: i.carNo 
+                    } as SFSchemaEnum)
+                    )
+                    )
+                    )
                   .toPromise();
               } else {
                 return of([]);
@@ -234,7 +239,7 @@ export class VehicleComponentsListComponent implements OnInit {
       },
       { title: '所有人', className: 'text-center', index: 'carOwner' },
       { title: '是否挂靠', className: 'text-center', render: 'isSelf', },
-      { title: '挂靠协议', className: 'text-center', index: 'carNo' },
+      { title: '挂靠协议', className: 'text-center', render: 'approvalAuditStatus' },
 
       {
         title: '操作',

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

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-17 09:34:09
+ * @LastEditTime: 2021-12-17 17:17:17
  * @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
@@ -44,8 +44,11 @@ export class VehicleService extends BaseService {
   // 上传司机挂靠协议
   $api_get_upLoadCarProtocal= `/api/mdc/cuc/carLicenseAudit/operate/upLoadCarProtocal`;
 
-  // 根据车牌号查询车辆信息
+  // 根据车牌号查询车辆信息（车辆认证表）
-  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
+  $api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/operate/findCarLicenseListByCarNo`;
+
+  // 根据车牌号查询车辆信息（车辆审核认证表）
+  $api_get_getCarLicenseListByCarNo_audit= `/api/mdc/cuc/carLicenseAudit/operate/findCarLicenseAuditListByCarNo`;
 
 
 

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: 2021-12-17 16:00:41
+ * @LastEditTime: 2021-12-17 16:41: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\supply-management\components\vehicle\vehicle.component.html
@@ -36,10 +36,15 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate" >
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
+  [nzTabBarExtraContent]="extraTemplate">
-    </nz-tab>
+  <nz-tab [nzTitle]="'全部'"></nz-tab>
-  </nz-tabset>
+  <nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'待签收('+tabs?.cancelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+</nz-tabset>
   <div style="margin-top: 15px;">
     <st
     #st

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

@@ -34,6 +34,7 @@ export class WaybillManagementBulkComponent implements OnInit {
   columnsFloat: STColumn[] = [];
   columnsFloatView: STColumn[] = [];
   demoValue: any;
+  resourceStatus: any;
   datass: any = [
     {
     one: '1',
@@ -48,44 +49,24 @@ export class WaybillManagementBulkComponent implements OnInit {
     id: 2
    },
 ];
-  tabs = [  {
+tabs = {
-    name: '全部',
+  totalQuantity: 0,
-    type: 5,
+  cancelQuantity: 0,
-    count: 0,
+  receivedQuantity: 0,
-  },
+  stayQuantity: 0
-  {
+};
-    name: '待发车',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '运输中',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '代签收',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已完成',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已取消',
-    type: 5,
-    count: 0,
-  },
-  ];
   constructor(public service: SupplyManagementService, private modal: NzModalService, public service2: ShipperBaseService) { }
 
   /**
  * 查询参数
  */
   get reqParams() {
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.wayBillStatus = this.resourceStatus 
+    }
     return {
+      ...a,
       ...this.sf?.value,
     };
   }
@@ -537,6 +518,13 @@ export class WaybillManagementBulkComponent implements OnInit {
 
   selectChange(e: number) {
     console.log(e);
+    if(e>=1) {
+    this.resourceStatus = e + 1;
+    }
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
   }
   /**
    * 导入货源

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

@@ -36,10 +36,16 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
+  [nzTabBarExtraContent]="extraTemplate">
-    </nz-tab>
+  <nz-tab [nzTitle]="'全部'"></nz-tab>
-  </nz-tabset>
+  <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?.cancelQuantity+')'"></nz-tab>
+  <nz-tab [nzTitle]="'已完成'"></nz-tab>
+  <nz-tab [nzTitle]="'已取消'"></nz-tab>
+</nz-tabset>
   <div style="margin-top: 15px;">
     <st
     #st

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

@@ -22,6 +22,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
   isVisibleEvaluate = false;
   isVisible = false;
   _$expand = false;
+  resourceStatus: any;
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('stFloat') private readonly stFloat!: STComponent;
   @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@@ -44,44 +45,24 @@ export class WaybillManagementVehicleComponent implements OnInit {
     id: 2
    },
 ];
-  tabs = [  {
+tabs = {
-    name: '全部',
+  totalQuantity: 0,
-    type: 5,
+  cancelQuantity: 0,
-    count: 0,
+  receivedQuantity: 0,
-  },
+  stayQuantity: 0
-  {
+};
-    name: '待发车',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '运输中',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '代签收',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已完成',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '已取消',
-    type: 5,
-    count: 0,
-  },
-  ];
   constructor(public service: SupplyManagementService, private modal: NzModalService, public service2: ShipperBaseService) { }
 
   /**
  * 查询参数
  */
-  get reqParams() {
+   get reqParams() {
+    const a:any = {};
+    if(this.resourceStatus) {
+      a.wayBillStatus = this.resourceStatus 
+    }
     return {
+      ...a,
       ...this.sf?.value,
     };
   }
@@ -448,6 +429,11 @@ export class WaybillManagementVehicleComponent implements OnInit {
 
   selectChange(e: number) {
     console.log(e);
+    this.resourceStatus = e;
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
   }
   /**
    * 导入货源