From 0c180afadde7a0ceeb0e8fd62120c04ed6837f1c Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 8 Apr 2022 11:34:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 proxy.conf.js                                   |  4 ++--
 .../components/bulk/bulk.component.html         |  5 +++--
 .../components/vehicle/vehicle.component.html   | 17 ++++++-----------
 .../components/vehicle/vehicle.component.less   | 13 +++++++++++++
 .../components/vehicle/vehicle.component.ts     |  2 +-
 5 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 src/app/routes/order-management/components/vehicle/vehicle.component.less

diff --git a/proxy.conf.js b/proxy.conf.js
index 37b438b4..7b7644d1 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-04-06 16:45:43
+ * @LastEditTime : 2022-04-08 11:16:53
  * @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-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
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 7cb3156d..482bb68c 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 10:52:51
+ * @LastEditTime : 2022-04-08 11:30:05
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -104,7 +104,8 @@
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
         <div *ngIf="item.mybidDetailInfo.length > 0">
           <p *ngFor="let data of item.mybidDetailInfo">
-            {{ data.expenseName }}：{{ data.price | currency }}
+            <span *ngIf="data.expenseCode !== 'FL'">{{ data.expenseName }}：{{ data.price | currency }}</span>
+            <span *ngIf="data.expenseCode === 'FL'" >{{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' }}</span>
             <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
           </p>
         </div>
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 560ff7c0..35c07449 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-01 11:03:39
+ * @LastEditTime : 2022-04-08 11:32:46
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -81,16 +81,11 @@
       </ng-template> -->
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
         <div *ngIf="item.mybidDetailInfo.length > 0">
-          <div *ngFor="let data of item.mybidDetailInfo">
-            {{ data.expenseName }}：{{ data?.expenseCode === 'FL' ? (data.price * 100 + '%' ) : (data.price | currency) }}
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '1' && data.price>0"
-              style="color: #f59a63">待申请</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已支付</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已拒绝</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '5'" style="color: #f59a63">退款中</span>
-            <span *ngIf="data.paymentStatus && data.paymentStatus === '6'" style="color: #f59a63">退款成功</span>
-          </div>
+          <p *ngFor="let data of item.mybidDetailInfo">
+            <span *ngIf="data.expenseCode !== 'FL'">{{ data.expenseName }}：{{ data.price | currency }}</span>
+            <span *ngIf="data.expenseCode === 'FL'" >{{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' }}</span>
+            <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
+          </p>
         </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.less b/src/app/routes/order-management/components/vehicle/vehicle.component.less
new file mode 100644
index 00000000..149a0bc9
--- /dev/null
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.less
@@ -0,0 +1,13 @@
+
+    :host {
+     p{
+         margin-bottom: 0
+     }
+     .left_btn {
+          width: 50px;
+         height: 32px; 
+          padding-left: 8px;
+          line-height:32px; 
+          background-color: #d7d7d7;
+     }
+ }
\ No newline at end of file
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 386a0fc6..58b2f93d 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -19,7 +19,7 @@ import { OrderManagementService } from '../../services/order-management.service'
 @Component({
   selector: 'app-supply-management-vehicle',
   templateUrl: './vehicle.component.html',
-  styleUrls: ['../../../commom/less/commom-table.less']
+  styleUrls: ['../../../commom/less/commom-table.less','./vehicle.component.less']
 })
 export class OrderManagementVehicleComponent extends BasicTableComponent implements OnInit {
   ui: SFUISchema = {};