fix bug

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-07 11:11:27
+ * @LastEditTime: 2021-12-14 10:24: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
@@ -43,11 +43,18 @@
     </nz-tab>
   </nz-tabset>
   <div style="margin-top: 15px;">
-    <!-- [req]="{ method: 'GET', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    <st
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    #st
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [bordered]="true"
-      [loadingDelay]="500" [loading]="service.http.loading" -->
+    [scroll]="{ x: '2000px' }"
-    <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
+    [data]="service.$api_get_bulkPage_list"
+    [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="goodsId" let-item let-index="index">
         <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
       </ng-template>

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

@@ -13,7 +13,6 @@ import { SupplyManagementService } from '../../services/order-management.service
   styleUrls: ['./bulk.component.less']
 })
 export class OrderManagementBulkComponent implements OnInit {
-  url = `/user?_allow_anonymous=true`;
   ui: SFUISchema = {};
   uiView: SFUISchema = {};
   schema: SFSchema = {};
@@ -110,7 +109,7 @@ export class OrderManagementBulkComponent implements OnInit {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         no: {
           type: 'string',
-          title: '运单号',
+          title: '订单号',
         },
         no2: {
           type: 'string',
@@ -118,7 +117,7 @@ export class OrderManagementBulkComponent implements OnInit {
         },
         no1: {
           type: 'string',
-          title: '托运公司'
+          title: '货主'
         },
         no3: {
           type: 'string',
@@ -158,7 +157,7 @@ export class OrderManagementBulkComponent implements OnInit {
         },
         no10: {
           type: 'string',
-          title: '收款人',
+          title: '车队长',
           ui: {
             visibleIf: {
               _$expand: (value: boolean) => value,
@@ -207,6 +206,58 @@ export class OrderManagementBulkComponent implements OnInit {
             asyncData: () => this.getCatalogueMember(),
           },
         },
+        appId2: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.getCatalogueMember(),
+          },
+        },
+        appId3: {
+          type: 'string',
+          title: '结算依据',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.getCatalogueMember(),
+          },
+        },
+        appId4: {
+          type: 'string',
+          title: '货物名称',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.getCatalogueMember(),
+          },
+        },
+        appId5: {
+          type: 'string',
+          title: '服务类型',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.getCatalogueMember(),
+          },
+        },
       },
       type: 'object',
     };
@@ -262,17 +313,20 @@ export class OrderManagementBulkComponent implements OnInit {
     this.columns = [
       { title: '', type: 'checkbox', width: '50px', className: 'text-center' },
       {
-        title: '运单号',
+        title: '订单号',
         width: '100px',
         className: 'text-center',
         render: 'goodsId'
       },
       {
-        title: '货源编号',
+        title: '运费明细',
         width: '100px',
         className: 'text-center',
       },
-      { title: '托运公司', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '关联运单号', index: 'externalSn', width: '120px', className: 'text-center' },
+      { title: '货源编号', index: 'externalSn', width: '120px', className: 'text-center' },
       { title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
       {
         title: '卸货地',
@@ -280,88 +334,53 @@ export class OrderManagementBulkComponent implements OnInit {
         width: '120px',
       },
       {
-        title: '货物名称',
+        title: '货物信息',
         className: 'text-center',
         width: '120px',
       }, 
-      {
-        title: '承运司机',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '车牌号',
-        className: 'text-center',
-        width: '120px',
-      },
       {
         title: '运费单价',
         className: 'text-center',
         width: '120px',
       },
+      {
+        title: '接单数量',
+        className: 'text-center',
+        width: '120px',
+      },
+      {
+        title: '结算重量',
+        className: 'text-center',
+        width: '120px',
+      },
       {
         title: '接单重量',
         className: 'text-center',
         width: '120px',
       },
       {
-        title: '运费变更记录',
+        title: '承运司机',
         className: 'text-center',
         width: '120px',
         render: 'feiong'
       },
       {
-        title: '结算重量',
+        title: '收款人',
         className: 'text-center',
         width: '120px',
       },
       {
-        title: '成交金额',
+        title: '装卸货时间',
         className: 'text-center',
         width: '120px',
         render: 'enStatusStr27878'
       },
       {
-        title: '收款人',
+        title: '创建时间',
         className: 'text-center',
         width: '120px',
    
       },
-      {
-        title: '支付状态',
-        className: 'text-center',
-        width: '120px',
-      },
-      {
-        title: '创建时间',
-        className: 'text-center',
-        index: 'enStatusStr3',
-        type: 'badge',
-        width: '100px',
-        badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
-        },
-      },
-      {
-        title: '异常原因',
-        className: 'text-center',
-        index: 'enStatusStr3',
-        width: '100px',
-      },
-      {
-        title: '运单状态',
-        className: 'text-center',
-        index: 'enStatusStr3',
-        type: 'badge',
-        width: '100px',
-        badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
-        },
-      },
       {
         title: '操作',
         fixed: 'right',
@@ -372,6 +391,10 @@ export class OrderManagementBulkComponent implements OnInit {
             text: '查看评价',
             click: (_record) => this.viewEvaluate(_record),
           },
+          {
+            text: '运费变更记录',
+            click: (_record) => this.viewEvaluate(_record),
+          },
         ],
       },
     ];

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-07 11:12:44
+ * @LastEditTime: 2021-12-14 10:21: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,13 +43,20 @@
     </nz-tab>
   </nz-tabset>
   <div style="margin-top: 15px;">
-    <!-- [req]="{ method: 'GET', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    <st
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    #st
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [bordered]="true"
-      [loadingDelay]="500" [loading]="service.http.loading" -->
+    [scroll]="{ x: '2000px' }"
-    <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
+    [data]="service.$api_get_bulkPage_list"
+    [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="goodsId" let-item let-index="index">
-        <a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.no}}</a>
+        <a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.id}}</a>
       </ng-template>
       <!-- <ng-template st-row="externalSn" let-item let-index="index">
         <span class="mr-xs">{{111111}}</span>
@@ -58,11 +65,11 @@
       <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">
+      <!-- <ng-template st-row="feiong" let-item let-index="index">
         <div style="color: aqua;" (click)="OpenPrice()">
           {{item.no}}
         </div>
-      </ng-template>
+      </ng-template> -->
       <ng-template #contentTemplate>
         <div>
           <p>预付：¥200.00</p>

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

@@ -276,6 +276,7 @@ export class OrderManagementVehicleComponent implements OnInit {
         title: '运费明细',
         width: '100px',
         className: 'text-center',
+        index: 'externalSn',
       },
       { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' },
       { title: '货主', index: 'externalSn', width: '120px', className: 'text-center' },
@@ -327,12 +328,15 @@ export class OrderManagementVehicleComponent implements OnInit {
         title: '操作',
         fixed: 'right',
         width: '200px',
-        className: 'text-left',
         buttons: [
           {
             text: '查看评价',
             click: (_record) => this.viewEvaluate(_record),
           },
+          {
+            text: '运费变更记录',
+            click: (_record) => this.OpenPrice(),
+          },
         ],
       },
     ];

src/app/routes/order-management/services/order-management.service.ts

@@ -1,3 +1,11 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-03 15:31:52
+ * @LastEditTime: 2021-12-14 10:14:22
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts
+ */
 import { Injectable, Injector } from '@angular/core';
 import { BaseService } from 'src/app/shared/services';
 
@@ -7,6 +15,7 @@ import { BaseService } from 'src/app/shared/services';
 export class SupplyManagementService extends BaseService {
 
   $api_get_catalogue_member = `/user?_allow_anonymous=true`;
+  $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
   $api_del_driver = ``;
   constructor(public injector: Injector) {
     super(injector)