Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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

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: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,16 +40,15 @@ export class NoTeManagementComponent implements OnInit {
   columns: STColumn[] = [
     { title: '手机号', className: 'text-center', index: 'cellphone' },
     {
-      title: '创建时间',
+      title: '发送时间',
       index: 'createTime',
       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
+    // }
   },
   ];