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

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tms-obc-web",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-15 09:58:12
+ * @LastEditTime : 2022-04-21 15:33:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -282,8 +282,8 @@
 
 
 
-<nz-card>
+<nz-card #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title" ><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-15 09:58:13
+ * @LastEditTime : 2022-04-21 15:33:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -204,8 +204,8 @@
   </sv-container>
 </nz-card>
 
-<nz-card>
+<nz-card #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title" ><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -397,25 +397,25 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
           {
             text: '生成电子单据',
             click: _record => this.generate(_record, 2),
-            iif: item =>  !item?.loadingElectronicsLadingBillFilePath,
+            iif: item =>  !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
           },
           {
             text: '通过',
             click: _record => this.sign(_record),
-            iif: item =>  !item?.loadingElectronicsLadingBillFilePath,
+            iif: item =>  !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
           },
           {
             text: '修改',
             click: _record => this.modification(_record),
-            iif: item =>   !item?.loadingElectronicsLadingBillFilePath,
+            iif: item =>   !item?.loadingElectronicsLadingBillFilePath || !item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
           },
           {
             text: '查看凭证',
             click: _record => this.generate(_record, 3),
-            iif: item => item?.loadingElectronicsLadingBillFilePath,
+            iif: item => item?.loadingElectronicsLadingBillFilePath && item?.unloadingElectronicsLadingBillFilePath,
             acl: { ability: ['ORDER-RECEIPTS-view'] },
           },
         ]

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-15 10:07:20
+ * @LastEditTime : 2022-04-21 15:33:42
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -316,8 +316,8 @@
   </sv-container>
 </nz-card>
 
-<nz-card>
+<nz-card #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title" ><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList">

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-04-15 09:56:50
+ * @LastEditTime : 2022-04-21 15:32:43
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -205,8 +205,8 @@
   </sv-container>
 </nz-card>
 
-<nz-card>
+<nz-card  #distannce5>
-  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
+  <p class="detail_title"><span>|</span> 轨迹信息</p>
   <div nz-row>
     <div nz-col [nzSpan]="24">
       <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [mapList]="mapList" [pois]="pois">

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-21 13:29:36
+ * @LastEditTime : 2022-04-21 14:41:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -12,11 +12,13 @@
 <sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none">
   <ng-template sf-template="no0" let-me let-ui="ui" let-schema="schema">
     <div style="color: #1890FF" >
-      <div (click)="openlaod(1)">电子装货单</div>
+      <div (click)="openlaod(1)">电子装货单 <span style="color: red;">
+        {{datas?.loadingElectronicsLadingBillFilePath ? '已签署' :'未签署'}}
+      </span></div>
     </div>
   </ng-template>
   <ng-template sf-template="no6" let-me let-ui="ui" let-schema="schema">
-    <div style="color: #1890FF" (click)="openlaod(2)">电子卸货单</div>
+    <div style="color: #1890FF" (click)="openlaod(2)">电子卸货单<span style="color: red;"> {{datas?.unloadingElectronicsLadingBillFilePath ? '已签署' :'未签署'}}</span></div>
   </ng-template>
 </sf>
 </div>

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts

@@ -1,4 +1,3 @@
-
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import {
@@ -16,7 +15,7 @@ import {
 import { apiConf } from '@conf/api.conf';
 import { _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalRef } from 'ng-zorro-antd/modal';
+import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 import { Observable, Observer } from 'rxjs';
 import { EAEnvironmentService } from '@shared';
 import { OrderManagementService } from '../../../services/order-management.service';
@@ -41,20 +40,26 @@ export class orderManagementVoucherViewComponent implements OnInit {
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   schema: SFSchema = {};
   ui: SFUISchema = {};
-  constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, private envSrv: EAEnvironmentService,) { }
+  constructor(
+    private modal: NzModalRef,
+    private msgSrv: NzMessageService,
+    public http: _HttpClient,
+    public service: OrderManagementService,
+    private datePipe: DatePipe,
+    private envSrv: EAEnvironmentService,
+    private modalService: NzModalService
+  ) {}
 
   ngOnInit(): void {
-    console.log(this.i)
+    console.log(this.i);
-    this.initData()
+    this.initData();
     this.i.time = this.i.loadingTime;
     this.initSF();
   }
   initSF() {
-    console.log(this.Status)
+    console.log(this.Status);
     if (this.Status == 1) {
-
       this.schema = {
-
         properties: {
           loadingLadingBillFilePath: {
             type: 'string',
@@ -73,7 +78,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -98,8 +103,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           loadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -118,7 +123,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -143,16 +148,16 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           no4: {
             type: 'string',
             title: '',
             ui: {
-              widget: 'text',
+              widget: 'text'
             },
-            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式'
           },
           unloadingLadingBillFilePath: {
             type: 'string',
@@ -171,7 +176,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -196,8 +201,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           unloadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -216,7 +221,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -241,11 +246,16 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           }
         },
-        required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
+        required: [
+          'loadingLadingBillFilePath',
+          'loadingPeopleVehiclesGoodsFilePath',
+          'unloadingLadingBillFilePath',
+          'unloadingPeopleVehiclesGoodsFilePath'
+        ]
       };
     } else {
       this.schema = {
@@ -254,8 +264,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
             type: 'string',
             title: '',
             ui: {
-              widget: 'custom',
+              widget: 'custom'
-            },
+            }
           },
           loadingLadingBillFilePath: {
             type: 'string',
@@ -275,7 +285,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -300,8 +310,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           loadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -321,7 +331,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.loadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -346,24 +356,24 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
 
           no4: {
             type: 'string',
             title: '',
             ui: {
-              widget: 'text',
+              widget: 'text'
             },
-            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式',
+            default: '单张大小不超过5M，支持.jpg、.jpeg和 .png格式'
           },
           no6: {
             type: 'string',
             title: '',
             ui: {
-              widget: 'custom',
+              widget: 'custom'
-            },
+            }
           },
           unloadingLadingBillFilePath: {
             type: 'string',
@@ -383,7 +393,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -408,8 +418,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           },
           unloadingPeopleVehiclesGoodsFilePath: {
             type: 'string',
@@ -429,7 +439,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 content: [
                   `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
                   `上传位置:${this.i?.unloadingAddressArr[0]}`,
-                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
+                  `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`
                 ],
                 position: '2',
                 fontSize: '100'
@@ -454,11 +464,16 @@ export class orderManagementVoucherViewComponent implements OnInit {
                 });
               },
               multiple: false,
-              listType: 'picture-card',
+              listType: 'picture-card'
-            } as SFUploadWidgetSchema,
+            } as SFUploadWidgetSchema
           }
         },
-        required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath', 'unloadingLadingBillFilePath', 'unloadingPeopleVehiclesGoodsFilePath']
+        required: [
+          'loadingLadingBillFilePath',
+          'loadingPeopleVehiclesGoodsFilePath',
+          'unloadingLadingBillFilePath',
+          'unloadingPeopleVehiclesGoodsFilePath'
+        ]
       };
     }
     this.ui = {
@@ -469,42 +484,42 @@ export class orderManagementVoucherViewComponent implements OnInit {
       $unloadingLadingBillFilePath: { grid: { span: 12 } },
       $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
       $loadingLadingBillFilePath: { grid: { span: 12 } },
-      $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
+      $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } }
     };
   }
   save(value: any): void {
     if (!this.sf.valid) {
-      this.service.msgSrv.warning('必填项为空！')
+      this.service.msgSrv.warning('必填项为空！');
       return;
     }
-    console.log(value)
+    console.log(value);
     const params = {
       id: this.i?.id,
       loadingLadingBillFilePath: value?.loadingLadingBillFilePath?.data?.fullFilePath,
       loadingPeopleVehiclesGoodsFilePath: value?.loadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
       unloadingLadingBillFilePath: value?.unloadingLadingBillFilePath?.data?.fullFilePath,
-      unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath,
+      unloadingPeopleVehiclesGoodsFilePath: value?.unloadingPeopleVehiclesGoodsFilePath?.data?.fullFilePath
-    }
+    };
-    console.log(params)
+    console.log(params);
-    this.service.request(this.service.$api_get_updateBillExamine, params).subscribe((res) => {
+    this.service.request(this.service.$api_get_updateBillExamine, params).subscribe(res => {
       if (res) {
-        this.service.msgSrv.success('修改成功！')
+        this.service.msgSrv.success('修改成功！');
         this.modal.destroy(true);
       }
-    })
+    });
   }
   sure() {
     const params = [this.i?.id];
-    this.service.downloadFile(this.service.$api_createBillTakeGoods, params)
+    this.service.downloadFile(this.service.$api_createBillTakeGoods, params);
-    this.service.downloadFile(this.service.$api_createBillDischargeGoods, params)
+    this.service.downloadFile(this.service.$api_createBillDischargeGoods, params);
-    this.service.msgSrv.success('生成电子单据成功！')
+    this.service.msgSrv.success('生成电子单据成功！');
     this.modal.destroy(true);
   }
   //  确认到车界面信息(两个只能看的图片)
   initData() {
-    this.service.request(this.service.$api_get_getCredentials, { id: this.i?.id }).subscribe((res) => {
+    this.service.request(this.service.$api_get_getCredentials, { id: this.i?.id }).subscribe(res => {
-      console.log(res)
+      console.log(res);
-      this.datas = res
+      this.datas = res;
       if (res.unloadingLadingBillFilePath) {
         this.formData = {
           loadingLadingBillFilePath: [
@@ -514,9 +529,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.loadingLadingBillFilePath,
               response: {
-                url: res.loadingLadingBillFilePath,
+                url: res.loadingLadingBillFilePath
-              },
+              }
-            },
+            }
           ],
           loadingPeopleVehiclesGoodsFilePath: [
             {
@@ -525,9 +540,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.loadingPeopleVehiclesGoodsFilePath,
               response: {
-                url: res.loadingPeopleVehiclesGoodsFilePath,
+                url: res.loadingPeopleVehiclesGoodsFilePath
-              },
+              }
-            },
+            }
           ],
           unloadingLadingBillFilePath: [
             {
@@ -536,9 +551,9 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.unloadingLadingBillFilePath,
               response: {
-                url: res.unloadingLadingBillFilePath,
+                url: res.unloadingLadingBillFilePath
-              },
+              }
-            },
+            }
           ],
           unloadingPeopleVehiclesGoodsFilePath: [
             {
@@ -547,44 +562,112 @@ export class orderManagementVoucherViewComponent implements OnInit {
               status: 'done',
               url: res.unloadingPeopleVehiclesGoodsFilePath,
               response: {
-                url: res.unloadingPeopleVehiclesGoodsFilePath,
+                url: res.unloadingPeopleVehiclesGoodsFilePath
-              },
+              }
-            },
+            }
-          ],
+          ]
         };
       }
-    })
+    });
   }
   close(): void {
     this.modal.destroy(true);
   }
   openlaod(value: any) {
-   
     if (value === 1) {
-      if(this.datas?.esignFlowStatus == '1') {
+      // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览
-        this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => {
+      let time = 10;
-          console.log(res);
+      setInterval(function () {
-        })
+        time -= 1;
+      }, 1000); //反复执行函数本身
+      const modal = this.modalService.success({
+        nzTitle: '电子装货单签署中！',
+        nzContent: `
+        请等待${time}秒后自动关闭
+        `
+      });
+      if (!this.datas?.loadingElectronicsLadingBillFilePath) {
+        this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => {
+          if (res) {
+            switch (res[0]?.esignFlowStatus) {
+              case 1:
+              case '1':
+                setTimeout(() => {
+                  this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => {
+                    if (res[0]?.esignFlowStatus == '2') {
+                      this.service.msgSrv.success('电子装货单已生效！');
+                      this.modal.destroy(true);
+                    }
+                  });
+                  modal.destroy();
+                }, 10000);
+                return;
+              case 2:
+                modal.destroy();
+                return;
+              case '13':
+              case 13:
+                this.service.msgSrv.error('签署异常!');
+                modal.destroy();
+                return;
+            }
+          }
+        });
+      } else {
+        const a = document.createElement('a');
+        a.href = this.datas?.loadingElectronicsLadingBillFilePath;
+        document.body.appendChild(a);
+        a.click(); //点击下载
+        document.body.removeChild(a); //下载完成移除元素
       }
-      const a = document.createElement('a');
-      a.href = this.datas?.loadingElectronicsLadingBillFilePath;
-      document.body.appendChild(a);
-      console.log(document.body.contains(a))
-      a.click(); //点击下载
-      document.body.removeChild(a); //下载完成移除元素
     } else {
-      if(this.datas?.esignFlowStatus == '1') {
+      // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览
-        this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe((res) => {
+      let time = 10;
-          console.log(res);
+      setInterval(function () {
-        })
+        time -= 1;
-      }
+      }, 1000); //反复执行函数本身
-      const a = document.createElement('a');
+      const modal = this.modalService.success({
-      a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
+        nzTitle: '电子卸货单签署中！',
-      document.body.appendChild(a);
+        nzContent: `
-      console.log(document.body.contains(a))
+     请等待${time}秒后自动关闭
-      a.click(); //点击下载
+     `
-      document.body.removeChild(a); //下载完成移除元素
+      });
-    }
+      if (!this.datas?.unloadingElectronicsLadingBillFilePath) {
+        this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => {
+          if (res) {
+            switch (res[0]?.esignFlowStatus) {
+              case 1:
+              case '1':
+                setTimeout(() => {
+                  this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => {
+                    if (res[0]?.esignFlowStatus == '2') {
+                      this.service.msgSrv.success('电子卸货单已生效！');
+                      this.modal.destroy(true);
+                    }
+                  });
+                  modal.destroy();
+                }, 10000);
 
+                return;
+              case 2:
+                modal.destroy();
+
+                return;
+              case '13':
+              case 13:
+                this.service.msgSrv.error('签署异常!');
+                modal.destroy();
+                return;
+            }
+          }
+        });
+      } else {
+        const a = document.createElement('a');
+        a.href = this.datas?.unloadingElectronicsLadingBillFilePath;
+        document.body.appendChild(a);
+        a.click(); //点击下载
+        document.body.removeChild(a); //下载完成移除元素
+      }
+    }
   }
 }

src/app/routes/order-management/services/order-management.service.ts

@@ -214,6 +214,11 @@ export class OrderManagementService extends ShipperBaseService {
   public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`;
   // 获取电子卸货单签章附件
   public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`;
+
+  // // 生成卸货单
+  // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`;
+  // // 生成提货单
+  // public $api_createBillTakeGoods = `/api/sdc/billOperate/createBillTakeGoods`;
   /**
    * 根据企业ID，获取企业历史网络货运人
    * @returns

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -932,6 +932,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       this.service.msgSrv.warning('装货时间必须大于当前时间！');
       return;
     }
+    console.log(this.validateForm1.value.loadingTime);
+    console.log(new Date());
+    
     if (this.validateForm1.value.loadingTime > this.validateForm1.value.unloadingTime) {
       this.service.msgSrv.warning('装货时间不能大于卸货时间！');
       return;
@@ -956,25 +959,25 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       return;
     }
 
-    const getFreightParms = { carLengthKeys: this.sf4.value.carLength, km: this.totalDistance };
+    // const getFreightParms = { carLengthKeys: this.sf4.value.carLength, km: this.totalDistance };
-    this.service.request(this.service.$api_getFreight, getFreightParms).subscribe(res => {
+    // this.service.request(this.service.$api_getFreight, getFreightParms).subscribe(res => {
-      if (this.sf7.value.subtotal > res.maxPrice) {
+    //   if (this.sf7.value.subtotal > res.maxPrice) {
-        this.service.msgSrv.error(`运费过高，请调整录入`);
+    //     this.service.msgSrv.error(`运费过高，请调整录入`);
-        return;
+    //     return;
-      } else if (this.sf7.value.subtotal > res.ewPrice) {
+    //   } else if (this.sf7.value.subtotal > res.ewPrice) {
-        this.modalService.confirm({
+    //     this.modalService.confirm({
-          nzTitle: '',
+    //       nzTitle: '',
-          nzContent: `您的录入的运费过高，可能会影响支付，请仔细确认`,
+    //       nzContent: `您的录入的运费过高，可能会影响支付，请仔细确认`,
-          nzOkText: '继续',
+    //       nzOkText: '继续',
-          nzCancelText: '取消',
+    //       nzCancelText: '取消',
-          nzOnOk: () => {
+    //       nzOnOk: () => {
-            this.agreementConfirm(submitType);
+    //         this.agreementConfirm(submitType);
-          }
+    //       }
-        });
+    //     });
-      } else {
+    //   } else {
-        this.agreementConfirm(submitType);
+    //     this.agreementConfirm(submitType);
-      }
+    //   }
-    });
+    // });
   }
   // 提交前协议弹窗
   agreementConfirm(submitType?: string) {

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts

@@ -185,7 +185,7 @@ export class InvoiceDetailComponent implements OnInit {
   private initOrderST(): STColumn[] {
     return [
       { title: '订单号', index: 'billHCode', width: 180 },
-      { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '所属项目', index: 'projectIdName', width: 180 },
       { title: '订单类型', index: 'billTypeLabel', width: 120 },
       { title: '装货地', index: 'loadingfrom', width: 200 },

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -298,7 +298,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '订单号', render: 'billHCode', width: 170 },
-      { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '开票状态', index: 'vatappStsLabel', width: 100 },
       { title: '所属项目', index: 'projectIdName', width: 140 },
       { title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } },

src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-23 16:50:17
- * @LastEditTime : 2022-01-26 10:36:10
+ * @LastEditTime : 2022-04-21 13:57:43
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts
@@ -86,7 +86,7 @@ export class RequestedInvoiceModalComponent {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '订单号', index: 'billHCode', width: 150 },
-      { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '所属项目', index: 'projectIdName', width: 250 },
       { title: '订单类型', index: 'billTypeName', width: 90 },
       { title: '装货地', index: 'loadingfrom', width: 250 },

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-17 20:24:17
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 17:04:41
+ * @LastEditTime : 2022-04-21 15:28:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\freight-config\\freight-config.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -24,10 +24,10 @@
       <button nz-button nzType="primary" [disabled]="false" acl (click)="exportList()"
         [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
       <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
-      <button nz-button nzType="link" (click)="expandToggle()">
+      <!-- <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-      </button>
+      </button> -->
     </div>
   </div>
 </nz-card>

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -228,25 +228,6 @@ export class FreightConfigComponent implements OnInit {
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
-        goodsSurchargeRatio: {
-          title: '货源单费率',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false
-          }
-        },
-        contractSurchargeRatio: {
-          title: '合同单费率',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
-        },
         createTime: {
           title: '注册时间',
           type: 'string',
@@ -255,9 +236,6 @@ export class FreightConfigComponent implements OnInit {
             format: 'yyyy-MM-dd',
             placeholder: '请选择',
             nzShowTime: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         }
       }