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

src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts

@@ -105,6 +105,7 @@ export class CarSettleAddDriverComponent implements OnInit {
             listType: 'picture-card',
             change: (args: any) => {
               if (args.type === 'success') {
+                console.log(args.file.response.data.fullFilePath)
                 this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
                 this.checkIdCard(args.file.response.data.fullFilePath, 'front', 0);
               }
@@ -121,7 +122,8 @@ export class CarSettleAddDriverComponent implements OnInit {
                 observer.complete();
               });
             },
-           previewFile: (file: NzUploadFile) => of(file.url),}
+          //  previewFile: (file: NzUploadFile) => of(file.url),
+          }
         },
         tipsB: {
           title: '',
@@ -168,7 +170,8 @@ export class CarSettleAddDriverComponent implements OnInit {
                 observer.complete();
               });
             },
-           previewFile: (file: NzUploadFile) => of(file.url),}
+          //  previewFile: (file: NzUploadFile) => of(file.url),
+          }
         },
         name: {
           title: '姓名',
@@ -272,7 +275,8 @@ export class CarSettleAddDriverComponent implements OnInit {
                 observer.complete();
               });
             },
-           previewFile: (file: NzUploadFile) => of(file.url),}
+          //  previewFile: (file: NzUploadFile) => of(file.url),
+          }
         },
         licenseNo: {
           title: '驾驶证号',
@@ -394,7 +398,8 @@ export class CarSettleAddDriverComponent implements OnInit {
                 observer.complete();
               });
             },
-           previewFile: (file: NzUploadFile) => of(file.url),}
+          //  previewFile: (file: NzUploadFile) => of(file.url),
+          }
         },
         licenseNo: {
           title: '从业资格证号',
@@ -565,22 +570,29 @@ export class CarSettleAddDriverComponent implements OnInit {
     this.showJopFlag = !this.showJopFlag
   }
   submitForm(){
+    const items: any = this.sf.value
+    items.certificatePhotoFrontWatermark = this.sf.value?.certificatePhotoFrontWatermark.data.fullFilePath
+    items.certificatePhotoBackWatermark = this.sf.value?.certificatePhotoBackWatermark.data.fullFilePath
+    const items2: any = this.sf1.value
+    items2.certificatePhotoWatermark = this.sf1.value?.certificatePhotoWatermark.data.fullFilePath
+    const items3: any = this.sf2.value
+    items3.certificatePhotoWatermark = this.sf2.value?.certificatePhotoWatermark.data.fullFilePath
     const params:any = {
       source: 2,
       mobile: this.sf.value.mobile,
       bankCardNo: this.sf.value.bankCardNo,
       bankName: this.sf.value.bankName,
       identityInfoDTO:{
-        ...this.sf.value,
+        ...items,
         certificatePhotoFront: this.detailData.certificatePhotoFront,
         certificatePhotoBack: this.detailData.certificatePhotoBack,
       },
       userDriverLicenseDTO: {
-        ...this.sf1.value,
+        ...items2,
         certificatePhoto: this.detailData.userDriverLicenseDTO.certificatePhoto,
       },
       userPracticeSeniorityDTO: {
-        ...this.sf2.value,
+        ...items3,
         certificatePhoto: this.detailData.userPracticeSeniorityDTO.certificatePhoto,
       },
     };

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -249,8 +249,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
   }
   add() {
     this.modalHelper.create(CarSettleAddDriverComponent, { size: 900 }).subscribe((res) => {
-      // this.initData()
+      this.st.load();
-      console.log(res)
     });
   }
   private initST(): STColumn[] {

src/app/shared/shared-zorro.module.ts

@@ -83,5 +83,6 @@ export const SHARED_ZORRO_MODULES = [
   NzCascaderModule,
   NzAnchorModule,
   NzAffixModule,
-  NzTypographyModule 
+  NzTypographyModule,
+
 ];

src/style-icons-auto.ts

@@ -61,7 +61,7 @@ import {
   SolutionOutline,
   MinusCircleOutline,
   FileTwoTone,
-  CloudDownloadOutline
+  CloudDownloadOutline,
 } from '@ant-design/icons-angular/icons';
 
 export const ICONS_AUTO = [
@@ -122,5 +122,5 @@ export const ICONS_AUTO = [
   SolutionOutline,
   MinusCircleOutline,
   FileTwoTone,
-  CloudDownloadOutline
+  CloudDownloadOutline,
 ];

src/style-icons.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-11-29 20:03:55
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:14:19
+ * @LastEditTime : 2022-02-15 16:33:08
  * @FilePath     : \\tms-obc-web\\src\\style-icons.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -27,7 +27,9 @@ import {
   MenuOutline,
   SwapOutline,
   EnvironmentOutline,
-  ExclamationCircleOutline
+  ExclamationCircleOutline,
+  FileTwoTone,
+  PictureTwoTone
 } from '@ant-design/icons-angular/icons';
 
 export const ICONS = [
@@ -50,4 +52,6 @@ export const ICONS = [
   SwapOutline,
   EnvironmentOutline,
   ExclamationCircleOutline,
+  FileTwoTone,
+  PictureTwoTone
 ];