From 34dc8c83c6b6a19283f11ca853a385199da3deca Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 20 Jan 2022 20:03:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.conf.js                                 |  4 ++--
 .../components/bulk/bulk.component.ts         |  7 +-----
 .../update-freight.component.ts               | 22 +++++++++----------
 .../components/vehicle/vehicle.component.ts   | 17 +++++---------
 4 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index 3e15b095..8813b88c 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 19:40:51
+ * @LastEditTime : 2022-01-20 19:45:54
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },
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 cd9b82ee..2ac2e305 100644
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@@ -259,13 +259,8 @@ export class SupplyManagementBulkComponent implements OnInit {
       {
         title: '货源状态',
         className: 'text-left',
-        index: 'resourceStatus',
-        type: 'badge',
+        index: 'resourceStatusLabel',
         width: '120px',
-        badge: {
-          '1': { text: '待接单', color: 'success' },
-          '2': { text: '已接单', color: 'warning' },
-        },
       },
       {
         title: '截止时间',
diff --git a/src/app/routes/supply-management/components/update-freight/update-freight.component.ts b/src/app/routes/supply-management/components/update-freight/update-freight.component.ts
index bb5558f0..8e3c4b1d 100644
--- a/src/app/routes/supply-management/components/update-freight/update-freight.component.ts
+++ b/src/app/routes/supply-management/components/update-freight/update-freight.component.ts
@@ -63,17 +63,17 @@ export class SupplyManagementUpdateFreightComponent implements OnInit {
             change: (val: any) => this.changeNumVal(val, 2)
           } as SFNumberWidgetSchema
         },
-        href1: {
-          type: 'number',
-          title: '油卡',
-          minimum: 0,
-          ui: {
-            prefix: '￥',
-            widgetWidth: 200,
-            precision: 2,
-            change: (val: any) => this.changeNumVal(val, 3)
-          } as SFNumberWidgetSchema
-        },
+        // href1: {
+        //   type: 'number',
+        //   title: '油卡',
+        //   minimum: 0,
+        //   ui: {
+        //     prefix: '￥',
+        //     widgetWidth: 200,
+        //     precision: 2,
+        //     change: (val: any) => this.changeNumVal(val, 3)
+        //   } as SFNumberWidgetSchema
+        // },
         description5: {
           type: 'number', title: '回单付',  minimum: 0, maxLength: 140, ui: {
             prefix: '￥',
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 99690312..e84d0a48 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -501,13 +501,8 @@ export class SupplyManagementVehicleComponent implements OnInit {
       {
         title: '货源状态',
         className: 'text-left',
-        index: 'resourceStatus',
-        type: 'badge',
+        index: 'resourceStatusLabel',
         width: '120px',
-        badge: {
-          '1': { text: '待接单', color: 'warning' },
-          '2': { text: '已接单', color: 'success' }
-        }
       },
       {
         title: '创建时间',
@@ -545,11 +540,11 @@ export class SupplyManagementVehicleComponent implements OnInit {
             click: _record => this.amend(_record),
             iif: item => item.resourceStatus === '1'
           },
-          {
-            text: '修改运费',
-            click: _record => this.updateFreight(_record),
-            iif: item => item.resourceStatus === '1' && item.serviceType === '2'
-          },
+          // {
+          //   text: '修改运费',
+          //   click: _record => this.updateFreight(_record),
+          //   iif: item => item.resourceStatus === '1' && item.serviceType === '2'
+          // },
           {
             text: '取消货源',
             click: _record => this.cancleGoodsSource(_record),