车辆对接

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-14 10:21:33
+ * @LastEditTime: 2021-12-20 09:56:30
  * @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
@@ -47,7 +47,7 @@
     #st
     [bordered]="true"
     [scroll]="{ x: '2000px' }"
-    [data]="service.$api_get_bulkPage_list"
+    [data]="service.$api_get_getWholeBillDetail"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@@ -55,9 +55,26 @@
     [loadingDelay]="500"
     [loading]="service.http.loading"
     >
-      <ng-template st-row="goodsId" let-item let-index="index">
-        <a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.id}}</a>
-      </ng-template>
+    <ng-template st-row="billCode" let-item let-index="index">
+      <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
+      <div>
+        <span *ngIf="item?.wayBillStatus == 1">待接单</span>
+        <span *ngIf="item?.wayBillStatus == 2">待发车</span>
+        <span *ngIf="item?.wayBillStatus == 3">运输中</span>
+        <span *ngIf="item?.wayBillStatus == 4">待签收</span>
+        <span *ngIf="item?.wayBillStatus == 5">已完成</span>
+        <span *ngIf="item?.wayBillStatus == 6">已取消</span>
+      </div>
+    </ng-template>
+    <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
+      <div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
+        <span >{{i?.costName}}：{{i?.price}}</span>
+      </div>
+    </ng-template>
+    <ng-template st-row="loadingTime" let-item let-index="index">
+      <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
+      <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
+    </ng-template>
       <!-- <ng-template st-row="externalSn" let-item let-index="index">
         <span class="mr-xs">{{111111}}</span>
         <a (click)="editEnternalSn(item)">编辑</a>
@@ -92,13 +109,14 @@
     multiSort
     size="small"
     [bordered]="true"
-    [data]="datass"
+    [data]="service.$api_get_getWholeBillDetail"
     [columns]="columnsFloat"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loadingDelay]="500"
   >
+
   </st>
   </ng-container>
   <ng-template #nzModalFooter>

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

@@ -10,7 +10,7 @@ import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receip
 import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure-arrive.component';
 import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component';
 import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component';
-import { SupplyManagementService } from '../../services/order-management.service';
+import { OrderManagementService } from '../../services/order-management.service';
 
 
 @Component({
@@ -80,7 +80,7 @@ export class OrderManagementVehicleComponent implements OnInit {
     count: 0,
   },
   ];
-  constructor(public service: SupplyManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
+  constructor(public service: OrderManagementService, private modal: NzModalService,public service2: ShipperBaseService,) { }
 
   /**
  * 查询参数
@@ -117,9 +117,9 @@ export class OrderManagementVehicleComponent implements OnInit {
           type: 'string',
           title: '货源编号'
         },
-        externalResourceCode: {
+        shipperAppUserId: {
           type: 'string',
-          title: '外部订单号'
+          title: '货主'
         },
         loadingPlace: {
           type: 'string',
@@ -139,15 +139,6 @@ export class OrderManagementVehicleComponent implements OnInit {
             }
           }
         },
-        // driverName: {
-        //   type: 'string',
-        //   title: '承运司机',
-        //   ui: {
-        //     visibleIf: {
-        //       _$expand: (value: boolean) => value,
-        //     },
-        //   }
-        // },
         driverId: {
           title: '承运司机',
           type: 'string',
@@ -171,60 +162,67 @@ export class OrderManagementVehicleComponent implements OnInit {
             }
           } as SFSelectWidgetSchema
         },
-        no9: {
-          type: 'string',
+
+        carNo: { 
           title: '车牌号',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
-        no10: {
           type: 'string',
-          title: '收款人',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
-        wayBillType: {
-          title: '运单类型',
-          type: 'string',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'goodresourceType' },
-            containAllLable: true,
-            visibleIf: {
-              _$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
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            onSearch: (q: any) => {
+              if (!!q) {
+                return this.service
+                  .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))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
             },
-            allowClear: true,
-            asyncData: () => this.service2.getNetworkFreightForwarder()
-          }
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+         },
+         payeeId: {
+          title: '车队长',
+          type: 'string',
+          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,
+            },
+          } as SFSelectWidgetSchema,
+        }, 
+        paymentstatus: {
+          title: '支付状态',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'payment:status' },
+            containAllLable:true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
         },
         createTime: {
           title: '创建时间',
@@ -237,7 +235,63 @@ export class OrderManagementVehicleComponent implements OnInit {
               _$expand: (value: boolean) => value
             }
           } as SFDateWidgetSchema
-        }
+        },
+        isRiskSheet: {
+          type: 'string',
+          title: '是否风险单',
+          default: '0',
+          enum: [
+            { label: '全部', value: '0' },
+            { label: '是', value: '1' },
+            { label: '否', value: '2' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          },
+        },
+        enterpriseInfoName: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.service2.getNetworkFreightForwarder(),
+          },
+        },
+        goodsName: {
+          type: 'string',
+          title: '货物名称',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.getCatalogueMember(),
+          },
+        },
+        serviceType: {
+          title: '服务类型',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
+            containAllLable:true,
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
       },
       type: 'object'
     };
@@ -260,17 +314,18 @@ export class OrderManagementVehicleComponent implements OnInit {
         title: '运费明细',
         width: '100px',
         className: 'text-center',
-        index: 'externalSn',
+        render: 'billExpenseDetailVOList',
       },
-      { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '货主', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoId', width: '120px', className: 'text-center' },
+      { title: '货主', index: 'shipperAppUserId', width: '120px', className: 'text-center' },
       { title: '关联运单号', index: 'linkUrl', width: '120px', className: 'text-center' },
-      { title: '货源编号', index: 'linkUrl', width: '120px', className: 'text-center' },
-      { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
+      { title: '装货地', index: 'loadingPlace', width: '120px', className: 'text-center' },
       {
         title: '卸货地',
         className: 'text-center',
         width: '120px',
+        index: 'dischargePlace'
       },
       {
         title: '货物信息',
@@ -280,33 +335,24 @@ export class OrderManagementVehicleComponent implements OnInit {
         title: '承运司机',
         className: 'text-center',
         width: '120px',
-      },
-      {
-        title: '承运司机',
-        className: 'text-center',
-        width: '120px',
+        index: 'driverId'
       },
       {
         title: '收款人',
         className: 'text-center',
-        index: 'enStatusStr2',
-        type: 'badge',
+        index: 'payeeId',
         width: '100px',
-        badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
-        },
       },
       {
         title: '装卸货时间',
         width: '170px',
         className: 'text-center',
+        render: 'loadingTime'
       },
       {
         title: '创建时间',
         className: 'text-center',
-        index: 'enStatusStr3',
+        index: 'createTime',
       },
       {
         title: '操作',