From 2246e31d68f75640fe81beef3c8ad45dd3864327 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 17 Jan 2022 19:05:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.html       |  7 ++++-
 .../components/bulk/bulk.component.ts         |  8 ++---
 .../components/vehicle/vehicle.component.html |  3 +-
 .../components/vehicle/vehicle.component.ts   |  2 +-
 .../components/bulk/bulk.component.ts         |  7 ++++-
 .../components/freight/list/list.component.ts | 30 +++++++++++++++----
 6 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index 399a2165..4d697063 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/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: 2022-01-13 13:30:01
+ * @LastEditTime: 2022-01-17 17:11:26
  * @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
@@ -60,6 +60,9 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading"
     >
+    <ng-template st-row="freightPrice" let-item let-index="index">
+      {{ item.freightPrice | currency}}
+    </ng-template>
     <ng-template st-row="billCode" let-item let-index="index">
       <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
       <div>
@@ -116,6 +119,7 @@
     [res]="{ reName: { list: 'data', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
   >
+  
   <ng-template st-row="order" let-item let-index="index">
     {{ index + 1 }}
   </ng-template>
@@ -156,6 +160,7 @@
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
     [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
   >
+ 
   <ng-template st-row="amountBeforeChange" let-item let-index="index">
     {{ item.amountBeforeChange | currency}}
   </ng-template>
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index c3b782bc..6c2eca4c 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -283,7 +283,7 @@ tabs = {
           type: 'string',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'payment:status' },
+            params: { dictKey: 'overall:payment:status' },
             containAllLable:true,
             visibleIf: {
               _$expand: (value: boolean) => value,
@@ -456,13 +456,13 @@ tabs = {
         render: 'goodsName'
       }, {
         title: '运费单价',
-        className: 'text-left',
+        className: 'text-right',
         width: '180px',
-        index: 'freightPrice'
+        render: 'freightPrice'
       },
       {
         title: '接单数量',
-        className: 'text-left',
+        className: 'text-right',
         index: 'goodsNumber',
         width: '180px',
       },
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html
index 28a707d4..dfddefb6 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/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: 2022-01-17 14:57:44
+ * @LastEditTime: 2022-01-17 17:50:57
  * @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
@@ -151,7 +151,6 @@
   <ng-container *nzModalContent>
     <st
     #stFloatView
-    multiSort
     size="small"
     [bordered]="true"
     [data]="service.$api_getChangeRecordWholeDetail"
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 371e442c..c09e0002 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -293,7 +293,7 @@ resourceStatus: any;
           type: 'string',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'bill:payexpense:status' },
+            params: { dictKey: 'overall:payment:status' },
             containAllLable:true,
             visibleIf: {
               _$expand: (value: boolean) => value,
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts
index 183be6a0..4475bde8 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -37,7 +37,12 @@ export class SupplyManagementBulkComponent implements OnInit {
     receivedQuantity: 0,
     stayQuantity: 0
   };
-  constructor(public service: SupplyManagementService, private modal: NzModalService, private router: Router,public shipperservice: ShipperBaseService) { }
+  constructor(
+    public service: SupplyManagementService,
+    private modal: NzModalService,
+    private router: Router,
+    public shipperservice: ShipperBaseService
+    ) { }
 
   ngOnInit(): void {
     this.initSF();
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index b179f663..066eced9 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
-import { DynamicSettingModalComponent } from '@shared';
+import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
 import { UsermanageService } from '../../../services/usercenter.service';
@@ -22,7 +22,12 @@ export class FreightComponentsListComponent implements OnInit {
   @ViewChild('promoterModal', { static: false })
   promoterModal!: any;
   promotersTelephone = '';
-  constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(
+    public service: UsermanageService,
+    private modal: NzModalService,
+    private router: Router, 
+    private ar: ActivatedRoute, 
+    public shipperservice: ShipperBaseService) {}
 
   /**
    * 查询参数
@@ -108,13 +113,26 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
+        // networkTransporter: {
+        //   title: '网络货运人',
+        //   type: 'string',
+        //   ui: {
+        //     placeholder: '请输入',
+        //     showRequired: false
+        //   }
+        // },
         networkTransporter: {
-          title: '网络货运人',
           type: 'string',
+          title: '网络货运人',
           ui: {
-            placeholder: '请输入',
-            showRequired: false
-          }
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+          },
         },
         source: {
           type: 'string',