From a95fc633c50b55ecb29c128ee6e69fddd6cfda57 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 22 Feb 2022 15:06:41 +0800
Subject: [PATCH] fix bug

---
 .../components/vehicle/vehicle.component.ts            |  2 +-
 .../cancel-confirm/cancel-confirm.component.html       |  4 ++--
 .../vehicle/cancel-confirm/cancel-confirm.component.ts | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

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 52e60f2d..01c0b723 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -451,7 +451,7 @@ resourceStatus: any;
           {
             text: '申请退款　',
             click: (_record) => this.applyRefund(_record),
-            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
+            iif: item => item.isApplyForRefund,
             acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
           },
           {
diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
index e81d3a51..e2f03c4f 100644
--- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
+++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-22 13:53:29
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 14:25:40
+ * @LastEditTime : 2022-02-22 15:03:49
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -28,7 +28,7 @@
   </sv>
   <sv label=""> 已选择 {{ index }} 项，运费：{{ List }}，附加费：{{ ATTPrice }} </sv>
 </sv-container>
-<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
+<sf style="margin-top: 10px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">取消</button>
diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
index ca573fb1..eafe606d 100644
--- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-22 13:53:29
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 14:46:06
+ * @LastEditTime : 2022-02-22 15:04:58
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -62,11 +62,11 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
           } as SFTextareaWidgetSchema
         },
       },
-      require: ['reason']
+      required: ['reason']
     };
     this.ui = {
       '*': {
-        spanLabelFixed: 50,
+        spanLabelFixed: 60,
         grid: { span: 20 }
       }
     };
@@ -103,9 +103,7 @@ export class OneCarOrderCancelConfirmComponent implements OnInit {
       if (res) {
         this.service.msgSrv.success('操作成功！');
         this.modalRef.close(true);
-      } else {
-        this.service.msgSrv.error(res.msg);
-      }
+      } 
     });
   }