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

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-03-02 14:56:27
+ * @LastEditTime : 2022-03-07 11:12:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -72,8 +72,8 @@
         {{ item.freightPrice | currency }}
       </ng-template>
       <ng-template st-row="loadingTime" let-item let-index="index">
-        <div *ngIf="item?.loadPlanTime">装 | {{ item?.loadPlanTime }}</div>
+        <div *ngIf="item?.loadTime">装 | {{ item?.loadTime }}</div>
-        <div *ngIf="item?.unloadPlanTime">卸 | {{ item?.unloadPlanTime }}</div>
+        <div *ngIf="item?.unloadTime">卸 | {{ item?.unloadTime }}</div>
       </ng-template>
       <ng-template st-row="driverName" let-item let-index="index">
         <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>

src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 16:28:37
+ * @LastEditTime : 2022-03-04 17:48:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -46,6 +46,10 @@
         <sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
         <sv label="录单员">{{ i?.createUserName || i?.goodsResource?.createUserName }} /{{ i?.createUserPhone || i?.goodsResource?.createUserPhone }} </sv>
         <sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
+        <sv label="外部订单号">{{ i?.wayBillCode }}</sv>
+        <sv label="货源编号">{{ i?.resourceCode }} </sv>
+        <sv label="运单号">{{ i?.wayBillId }}</sv>
+        <sv label="承诺付款天数">{{ i?.goodsResource?.dispatchName }}</sv>
       </div>
 
       <nz-tabset style="margin-top: 15px">

src/app/routes/supply-management/components/bulk/bulk.component.html

@@ -110,7 +110,7 @@
       <!-- 用车需求 -->
       <ng-template st-row="useCarDemand" let-item let-index="index">
         <div>车型: {{ item?.carModelLabel }}</div>
-        <div class="error">车长: {{ item?.carLenghtLabel }} 米</div>
+        <div class="error">车长: {{ item?.carLengthLabel }} 米</div>
       </ng-template>
     </st>
   </div>

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 09:57:16
+ * @LastEditTime : 2022-03-07 11:13:39
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -90,7 +90,7 @@
       </ng-template>
       <ng-template st-row="useCarDemand" let-item let-index="index">
         <div>车型: {{ item?.carModelLabel }}</div>
-        <div class="error">车长: {{ item?.carLenghtLabel }} 米</div>
+        <div class="error">车长: {{ item?.carLengthLabel }} 米</div>
       </ng-template>
     </st>
   </div>

src/app/routes/supply-management/model/import-supply/import-supply.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 11:10:14
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 20:29:46
+ * @LastEditTime : 2022-03-07 11:03:11
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/supply-management/model/import-supply/import-supply.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-01 15:13:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 20:57:36
+ * @LastEditTime : 2022-03-07 11:09:33
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -27,11 +27,11 @@ import { apiConf } from '@conf/api.conf';
 export class SupplyManagementImportSupplyComponent implements OnInit {
   record: any = {};
   files: any;
+  fileName: any;
   status: boolean = true
   files2: any;
   schema: SFSchema = {};
   ui: SFUISchema = {};
-  fileName: any;
   uploadUrl = apiConf.file_upload_url;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   constructor(
@@ -113,14 +113,13 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
     };
     this.ui = {
       '*': {
-        spanLabelFixed: 130,
         grid: { span: 20 },
       },
       '$fileName': {
         spanLabelFixed: 130,
         grid: { span: 20 },
       },
-      '$resourceCode': {
+      '$file': {
         spanLabelFixed: 130,
         grid: { span: 20 },
       },
@@ -154,13 +153,21 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
       });
   }
   save(): void {
+    console.log(this.files)
     console.log(this.sf.value)
-    // this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => {
+    const formData = new FormData();
-    //   if (res) {
+    this.files.forEach((file: any) => {
-    //     this.msgSrv.success('保存成功');
+      formData.append('file', file);
-    //     this.modal.close(true);
+    });
-    //   }
+    console.log(formData)
-    // });
+    let params = { file: formData ,...this.sf.value}
+    console.log(params)
+    this.service.request(this.service.$api_goodsResourceOperateImport, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('导入成功');
+        this.modal.destroy({ ...res });
+      }
+    });
   }
 
   close(): void {
@@ -171,6 +178,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
       case 'uploading':
         break;
       case 'done':
+        console.log(info);
         let file = info?.file;
         let fileName = file?.response.name;
         this.sf?.setValue('/fileName', fileName);
@@ -182,30 +190,17 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
     }
   }
   beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
-    return new Observable((observer: Observer<boolean>) => {
+    let fileName = file?.name;
-      // const isJpgOrPng = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+    this.files = [];
-      // if (!isJpgOrPng) {
+    this.files.push(file);
-      //   this.service.msgSrv.error('仅支持XLX / XLSX文件格式');
+    this.sf?.setValue('/fileName', fileName);
-      //   observer.complete();
+    return false;
-      //   return;
-      // }
-      // tslint:disable-next-line: no-non-null-assertion
-      const isLt2M = file.size! / 1024 / 1024 < 3;
-      if (!isLt2M) {
-        this.service.msgSrv.warning('图片大小超过3兆!');
-        observer.complete();
-        return;
-      }
-      observer.next(isLt2M);
-      observer.complete();
-    });
   };
-  clearFile() {
-    this.fileName = null;
-    this.sf?.setValue('/fileName', null);
-    this.sf?.setValue('/file', null);
-  }
   downFile() {
    this.service.downloadFile(this.service.$api_exportGoodsResourceOperateTemplate);
   }
+  clearFile() {
+    this.fileName = null;
+    this.sf?.setValue('/fileName', null);
+  }
 }

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

@@ -4,8 +4,9 @@ import { SFComponent, SFSchema, SFUISchema, SFUploadWidgetSchema } from '@delon/
 import { _HttpClient } from '@delon/theme';
 import { EAEnvironmentService } from '@shared';
 import { NzModalRef } from 'ng-zorro-antd/modal';
-import { Observable, Observer } from 'rxjs';
+import { Observable, Observer, Subject } from 'rxjs';
 import { UsermanageService } from 'src/app/routes/usercenter/services/usercenter.service';
+import { debounceTime } from 'rxjs/operators';
 
 
 @Component({
@@ -21,6 +22,7 @@ export class CtcCaptatinAddComponent implements OnInit {
   schema!: SFSchema;
   ui!: SFUISchema;
   readFlag = false;
+  changeSub = new Subject<string>();
   detailData: any = {
     bankCardNo: '',
     bankName: '',
@@ -45,6 +47,7 @@ export class CtcCaptatinAddComponent implements OnInit {
   ngOnInit(): void {
     this.initData()
     this.initSF();
+    this.changeEndKmAction();
   }
   initData() {
     if (this.i && this.i.id) {
@@ -352,31 +355,37 @@ export class CtcCaptatinAddComponent implements OnInit {
   close(): void {
     this.modal.destroy();
   }
-  sure() {
+  changeEndKmAction() {
-    const params: any = {
+    this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => {
-      bankCardNo: this.sf.value.bankCardNo,
-      bankName: this.sf.value.bankName,
-      mobile: this.sf.value.mobile,
-      remark: this.sf.value.remark,
-      identityInfoDTO: {
-        certificatePhotoBackWatermark: this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark,
-        certificatePhotoFrontWatermark: this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf.value?.certificatePhotoFrontWatermark,
-        certificatePhotoFront: this.detailData.certificatePhotoFront,
-        certificatePhotoBack: this.detailData.certificatePhotoBack,
-        certificateNumber: this.sf.value.certificateNumber,
-        name: this.sf.value.name,
-      }
-    }
-    if (this.i.id) {
-      params.id = this.i.id
-    }
-    delete params.showName
-    this.service.request(this.service.$api_saveCaptainr_new, params).subscribe(res => {
       if (res) {
-        this.service.msgSrv.success('保存成功')
+        const params: any = {
-        this.modal.close(true)
+          bankCardNo: this.sf.value.bankCardNo,
+          bankName: this.sf.value.bankName,
+          mobile: this.sf.value.mobile,
+          remark: this.sf.value.remark,
+          identityInfoDTO: {
+            certificatePhotoBackWatermark: this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark,
+            certificatePhotoFrontWatermark: this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf.value?.certificatePhotoFrontWatermark,
+            certificatePhotoFront: this.detailData.certificatePhotoFront,
+            certificatePhotoBack: this.detailData.certificatePhotoBack,
+            certificateNumber: this.sf.value.certificateNumber,
+            name: this.sf.value.name,
+          }
+        }
+        if (this.i.id) {
+          params.id = this.i.id
+        }
+        delete params.showName
+        this.service.request(this.service.$api_saveCaptainr_new, params).subscribe(res => {
+          if (res) {
+            this.service.msgSrv.success('保存成功')
+            this.modal.close(true)
+          }
+        })
       }
-    })
+    });
-
+  }
+  sure() {
+    this.changeSub.next('500');
   }
 }