车辆对接

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

@@ -2,11 +2,11 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
+import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
 import { SupplyManagementService } from '../../services/order-management.service';
 
-
 @Component({
   selector: 'app-supply-management-risk',
   templateUrl: './risk.component.html',
@@ -65,7 +65,7 @@ export class OrderManagementRiskComponent implements OnInit {
     count: 0,
   },
   ];
-  constructor(public service: SupplyManagementService, private modal: NzModalService) { }
+  constructor(public service: SupplyManagementService, public service2: ShipperBaseService, private modal: NzModalService) { }
 
   /**
  * 查询参数
@@ -93,19 +93,19 @@ export class OrderManagementRiskComponent implements OnInit {
     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: '外部订单号'
         },
-        no3: {
+        loadingPlace: {
           type: 'string',
           title: '装货地',
           ui: {
@@ -114,7 +114,7 @@ export class OrderManagementRiskComponent implements OnInit {
             },
           }
         },
-        no4: {
+        dischargePlace: {
           type: 'string',
           title: '卸货地',
           ui: {
@@ -123,7 +123,7 @@ export class OrderManagementRiskComponent implements OnInit {
             },
           }
         },
-        no7: {
+        driverName: {
           type: 'string',
           title: '承运司机',
           ui: {
@@ -150,23 +150,41 @@ export class OrderManagementRiskComponent implements OnInit {
             },
           }
         },
-        sex: {
+        freightType: {
           title: '运单类型',
           type: 'string',
-          default: 0,
-          enum: [
-            { label: '未知', value: 0 },
-            { label: '男', value: 1 },
-            { label: '女', value: 2 },
-            { label: '保密', value: 3 },
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'BulkFreightUnitPriceType' },
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
           } as SFSelectWidgetSchema,
         },
+        shipperId: {
+          title: '托运人',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'BulkFreightUnitPriceType' },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+        },
+        enterpriseInfoName: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.service2.getNetworkFreightForwarder(),
+          },
+        },
         createTime: {
           title: '创建时间',
           type: 'string',
@@ -194,61 +212,71 @@ export class OrderManagementRiskComponent implements OnInit {
         title: '申诉状态',
         width: '100px',
         className: 'text-center',
-        render: 'goodsId'
+        index: 'representationsStatusLabel'
       },
       {
-        title: '运单号',
+        title: '订单号',
         width: '100px',
         className: 'text-center',
-        render: 'goodsId'
+        render: 'billCode'
       },
       {
         title: '异常信息',
         width: '100px',
         className: 'text-center',
+        index: 'abnormalCause',
       },
-      { title: '托运方', index: 'externalSn', width: '120px', className: 'text-center' },
-      { title: '无车承运人', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
       {
         title: '运费明细',
         className: 'text-center',
         width: '120px',
+        render: 'billExpenseDetailVOList',
       },
       {
-        title: '运单类型',
+        title: '服务类型',
         className: 'text-center',
         width: '120px',
+        index: 'serviceType',
       }, {
         title: '装货地',
         className: 'text-center',
-        width: '120px',
+        width: '180px',
+        index: 'loadingPlace',
+
       },
       {
         title: '卸货地',
         className: 'text-center',
-        width: '120px',
+        width: '180px',
+        index: 'dischargePlace',
+
       },
       {
         title: '货物信息',
         className: 'text-center',
-        width: '120px',
+        width: '180px',
+        render: 'goodsInfoVOList',
+
       },
       {
         title: '承运司机',
         className: 'text-center',
         width: '120px',
-        render: 'enStatusStr27878'
+        render: 'driverName'
       },
       {
         title: '收款人',
         className: 'text-center',
         width: '120px',
-        render: 'feiong'
+        render: 'payeeName'
       },
       {
         title: '运输信息',
         className: 'text-center',
         width: '120px',
+        render: 'timeer'
       },
       {
         title: '操作',