车辆对接

2021-12-16 11:23:34 +08:00
parent 1a8468a8a9
commit fc53095c17
15 changed files with 450 additions and 140 deletions
--- a/src/app/routes/order-management/components/risk/risk.component.html
+++ b/src/app/routes/order-management/components/risk/risk.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-07 14:42:43
+ * @LastEditTime: 2021-12-16 10:36:33
 * @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
@ -43,34 +43,31 @@
    </nz-tab>
  </nz-tabset>
  <div style="margin-top: 15px;">
-    <!-- [req]="{ method: 'GET', 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" [loading]="service.http.loading" -->
-    <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
-      <ng-template st-row="goodsId" let-item let-index="index">
-        <a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.no}}</a>
+    <st
+    #st
+    [bordered]="true"
+    [scroll]="{ x: '2000px' }"
+    [data]="service.$api_get_listRiskPage"
+    [columns]="columns"
+    [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"
+    [loading]="service.http.loading"
+    >
+      <ng-template st-row="billCode" let-item let-index="index">
+        <a [routerLink]="'/order-management/risk-detail/'+item.id">{{item?.billCode}}</a>
      </ng-template>
-      <!-- <ng-template st-row="externalSn" let-item let-index="index">
-        <span class="mr-xs">{{111111}}</span>
-        <a (click)="editEnternalSn(item)">编辑</a>
-      </ng-template> -->
-      <ng-template st-row="enStatusStr27878" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
-      </ng-template>
-      <ng-template st-row="feiong" let-item let-index="index">
-        <div style="color: aqua;" >
-          {{item.no}}
+      <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
+        <div *ngFor="let i of item?.billExpenseDetailVOList">
+          <p>{{i?.costName}}：¥{{i?.price}}</p>
        </div>
      </ng-template>
-      <ng-template #contentTemplate>
-        <div>
-          <p>预付：¥200.00</p>
-          <p>到付：¥200.00</p>
-          <p>油卡：¥200.00</p>
-          <p>回单付：¥200.00</p>
-          <p>小计：¥200.00</p>
-          <p>附加费：¥200.00</p>
+      <ng-template st-row="goodsInfoVOList" let-item let-index="index">
+        <div *ngFor="let i of item?.goodsInfoVOList">
+          <p>货物名称：{{i?.goodsName}}</p>
+          <p>重量/体积：{{i?.weight}}吨/{{i?.volume}}方</p>
+          <p>车型/车长：{{i?.maxWeight}}/ {{i?.maxCube}}</p>
        </div>
      </ng-template>
    </st>
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/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: '操作',