From 7d48edd72b79df07f5b7ded2f68c6c0da784a5eb Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 15:17:37 +0800
Subject: [PATCH 1/4] fix bug

---
 .../note-management/note-management.component.ts      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.ts b/src/app/routes/sys-setting/components/note-management/note-management.component.ts
index e03e00fa..2013a610 100644
--- a/src/app/routes/sys-setting/components/note-management/note-management.component.ts
+++ b/src/app/routes/sys-setting/components/note-management/note-management.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-09 14:05:33
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 14:29:50
+ * @LastEditTime : 2022-03-09 15:17:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -45,11 +45,10 @@ export class NoTeManagementComponent implements OnInit {
       type: 'date',
       className: 'text-center'
     },
-    { title: '验证码', className: 'text-center', index: 'templateParam',
-    format: (value) => {
-      return JSON.parse(value?.templateParam)?.code
-    }
-  
+    { title: '短信内容', className: 'text-center', index: 'content',
+    // format: (value) => {
+    //   return JSON.parse(value?.templateParam)?.code
+    // }
   },
   ];
 

From 4a8fe7df04a8bc39c2e2c5528152cea2c772a8e9 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 15:18:42 +0800
Subject: [PATCH 2/4] fix bug

---
 .../components/note-management/note-management.component.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.ts b/src/app/routes/sys-setting/components/note-management/note-management.component.ts
index 2013a610..f93705dc 100644
--- a/src/app/routes/sys-setting/components/note-management/note-management.component.ts
+++ b/src/app/routes/sys-setting/components/note-management/note-management.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-09 14:05:33
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 15:17:12
+ * @LastEditTime : 2022-03-09 15:18:38
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\note-management\\note-management.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -40,7 +40,7 @@ export class NoTeManagementComponent implements OnInit {
   columns: STColumn[] = [
     { title: '手机号', className: 'text-center', index: 'cellphone' },
     {
-      title: '创建时间',
+      title: '发送时间',
       index: 'createTime',
       type: 'date',
       className: 'text-center'

From 236a69cdd082fec92a2a4166fcc3be1deffbc8f2 Mon Sep 17 00:00:00 2001
From: Lingzi <yinyan.quan@eascs.com>
Date: Wed, 9 Mar 2022 15:20:23 +0800
Subject: [PATCH 3/4] fix style

---
 src/styles/compact.less | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/styles/compact.less b/src/styles/compact.less
index 96a7f86a..da8f32a7 100644
--- a/src/styles/compact.less
+++ b/src/styles/compact.less
@@ -2,14 +2,14 @@
     font-size: 15px;
 }
 .page-header__title{
-    font-size: 14px;
     display: none;
+    font-size: 14px;
 }
 .alain-pro__body{
-    margin: 0  !important;
+    margin: 12px 12px 0px !important;
 }
 .alain-pro__page-header-content{
-    margin: 8px 8px 0px !important;
+    margin: 8px 8px 0 !important;
 }
 
 .ant-card {
@@ -22,8 +22,8 @@
     margin: 0 !important
 }
 .alain-pro__menu-icon{
-    font-size: 14px !important;
     margin: 3px 5px 0 0 ;
+    font-size: 14px !important;
 }
 .sf__compact .ant-form-item {
     margin-top: 4px !important;
@@ -44,8 +44,8 @@
 }
 .login-box-content{
     max-width: 300px !important;
-    padding: 58px 0 38px !important;
     height: 100% !important;
+    padding: 58px 0 38px !important;
 }
 .total-footer {
     bottom: 10px !important;

From ed84583bacaab50ed420d926a693909991e9b6b7 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 9 Mar 2022 15:25:26 +0800
Subject: [PATCH 4/4] fix bug

---
 .../vehicle/confir-receipt/confir-receipt.component.html    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
index d4e298cb..0ee649ed 100644
--- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
+++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 13:50:12
+ * @LastEditTime : 2022-03-09 15:24:55
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -33,10 +33,10 @@
     </st>
   </sv>
   <sv label="司机车辆">
-    <div>{{ dataInfo?.driverName }} / {{ dataInfo?.driverPhone }}/ {{ dataInfo?.carNo }}</div>
+    <div>{{ dataInfo?.driverName|| '-' }} / {{dataInfo?.driverTelephone || '-' }}/ {{ dataInfo?.carNo || '-' }}</div>
   </sv>
   <sv label="收款人">
-    <div>{{ dataInfo?.payeeName }} / {{ dataInfo?.payeePhone }}</div>
+    <div>{{ i?.payeeName || '-'}} / {{ i?.payeePhone || '-'}}</div>
   </sv>
   <sv label="回单凭证">
     <nz-upload