fix bug

2022-03-23 14:49:28 +08:00
parent f5f64038c2
commit 5875c8416f
12 changed files with 100 additions and 52 deletions
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@ -282,9 +282,8 @@
 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
-      <a href="javascript:;" (click)="agreement('1')">查看附件</a>&nbsp;&nbsp;&nbsp;&nbsp;
-      <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
+      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -361,10 +360,10 @@
  </div>
 </nz-card>

-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <div *ngIf="!imges">暂无附件信息</div>
-    <app-imagelist [imgList]="imges"></app-imagelist>
+    <div *ngIf="!modalcontent">暂无附件信息</div>
+    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-24 16:58:02
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-21 14:44:18
+ * @LastEditTime : 2022-03-23 14:44:37
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -55,6 +55,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
  dirverBankCard: any; // 货源单设置回显
  listImagUrls: any[] = []; // 货源单设置回显
  dirvingMessage = [];
+  modalcontent: any;
+  modalTitle:string = '';
  imges: any;
  totalObj: any;
  attObj: any;
@ -908,7 +910,14 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
    });
  };
  agreement(value: any) {
-    this.imges = this.i?.agreementFilePath;
+    if(value  ==='1'){
+      this.modalTitle = '附件信息';
+      this.modalcontent = this.i?.contractContent?.contractContent;
+      
+    }else if(value === '2'){
+      this.modalTitle = '补充协议';
+      this.modalcontent = this.i?.supplementContent?.contractContent;
+    }
    this.isVisible = true;
  }
  handleCancel() {
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/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-03-22 11:06:16
+ * @LastEditTime : 2022-03-23 14:43:34
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -163,9 +163,8 @@
 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
-      <a href="javascript:;" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
-      <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
+      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -249,10 +248,10 @@
  </nz-tabset>
 </nz-card>

-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <div *ngIf="!imges">暂无附件信息</div>
-    <app-imagelist [imgList]="imges"></app-imagelist>
+    <div *ngIf="!modalcontent">暂无附件信息</div>
+    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-06 20:20:26
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-22 10:56:18
+ * @LastEditTime : 2022-03-23 14:44:43
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -34,6 +34,8 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
  imges: any;
  totalObj: any;
  attObj: any;
+  modalcontent: any;
+  modalTitle:string = '';
  isVisible = false;
  logColumns2: STColumn[] = [
    { title: '时间', index: 'vinOutTime' },
@ -120,7 +122,14 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
    this.router.navigate(['order-management/bulk-detailChange', this.id]);
  }
  agreement(value: any) {
-    this.imges = this.i?.agreementFilePath;
+    if(value  ==='1'){
+      this.modalTitle = '附件信息';
+      this.modalcontent = this.i?.contractContent?.contractContent;
+      
+    }else if(value === '2'){
+      this.modalTitle = '补充协议';
+      this.modalcontent = this.i?.supplementContent?.contractContent;
+    }
    this.isVisible = true;
  }
  handleCancel() {
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/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-03-11 16:41:08
+ * @LastEditTime : 2022-03-23 14:46:17
 * @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.
 -->
@ -257,9 +257,8 @@
 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
-      <a href="javascript:;" (click)="agreement('1')">查看附件</a>&nbsp;&nbsp;&nbsp;&nbsp;
-      <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
+      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -334,13 +333,13 @@
    </ng-template>
  </div>
 </nz-card>
-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <div *ngIf="!imges">暂无附件信息</div>
-    <app-imagelist [imgList]="imges"></app-imagelist>
+    <div *ngIf="!modalcontent">暂无附件信息</div>
+    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
-    <button nz-button nzType="default" (click)="handleCancel()">确定 </button>
+    <button nz-button nzType="default" (click)="handleCancel()">确定  </button>
  </ng-template>
 </nz-modal>
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-23 13:39:58
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-21 14:44:31
+ * @LastEditTime : 2022-03-23 14:49:18
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -54,6 +54,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
  listImagUrls: any[] = []; // 货源单设置回显
  billExpenses: any[] = []; //运费信息表格信息
  dirvingMessage = [];
+  modalcontent: any;
+  modalTitle:string = '';
  attObj: any;
  totalObj: any;
  approvalLsit: any;
@ -855,7 +857,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
    });
  };
  agreement(value: any) {
-    this.imges = this.i?.agreementFilePath;
+    if(value  ==='1'){
+      this.modalTitle = '附件信息';
+      this.modalcontent = this.i?.contractContent?.contractContent;
+      
+    }else if(value === '2'){
+      this.modalTitle = '补充协议';
+      this.modalcontent = this.i?.supplementContent?.contractContent;
+    }
    this.isVisible = true;
  }
  handleCancel() {
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@ -169,9 +169,8 @@
 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
-      <a href="javascript:;" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
-      <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
+      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -231,13 +230,13 @@
  </div>
 </nz-card>

-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <div *ngIf="!imges">暂无附件信息</div>
-    <app-imagelist [imgList]="imges"></app-imagelist>
+    <div *ngIf="!modalcontent">暂无附件信息</div>
+    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
-    <button nz-button nzType="default" (click)="handleCancel()">确定 </button>
+    <button nz-button nzType="default" (click)="handleCancel()">确定  </button>
  </ng-template>
 </nz-modal>
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-28 14:42:03
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-08 14:56:43
+ * @LastEditTime : 2022-03-23 14:45:58
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -23,6 +23,8 @@ import { OrderManagementService } from '../../services/order-management.service'
 })
 export class OrderManagementVehicleDetailComponent implements OnInit {
  id = this.route.snapshot.params.id;
+  modalcontent: any;
+  modalTitle:string = '';
  trajectory = 'car';
  mapList: any[] = []; //地图点位数据组
  pois: any[] = [];
@ -124,7 +126,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
    this.router.navigate(['order-management/vehicle-detailChange', this.id]);
  }
  agreement(value: any) {
-    this.imges = this.i?.agreementFilePath;
+    if(value  ==='1'){
+      this.modalTitle = '附件信息';
+      this.modalcontent = this.i?.contractContent?.contractContent;
+      
+    }else if(value === '2'){
+      this.modalTitle = '补充协议';
+      this.modalcontent = this.i?.supplementContent?.contractContent;
+    }
    this.isVisible = true;
  }
  handleCancel() {
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@ -183,9 +183,8 @@
 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
-      <a href="javascript:;" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
-      <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
+      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -249,10 +248,10 @@
  </div>
 </nz-card>

-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <div *ngIf="!imges">暂无附件信息</div>
-    <app-imagelist [imgList]="imges"></app-imagelist>
+    <div *ngIf="!modalcontent">暂无附件信息</div>
+    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-21 14:56:00
+ * @LastEditTime : 2022-03-23 14:47:57
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.ts
@ -35,6 +35,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
  addressItems:any[] = [];  //打点地址数据组
  billExpenses: any[] = []; //运费信息表格信息
  imges: any;
+  modalcontent: any;
+  modalTitle:string = '';
  unLoadingPlaceVOList: any = [];
  logColumns2: STColumn[] = [
    { title: '时间', index: 'vinOutTime' },
@ -102,7 +104,14 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
    window.history.go(-1);
  }
  agreement(value: any) {
-    this.imges = this.i?.agreementFilePath
+    if(value  ==='1'){
+      this.modalTitle = '附件信息';
+      this.modalcontent = this.i?.contractContent?.contractContent;
+      
+    }else if(value === '2'){
+      this.modalTitle = '补充协议';
+      this.modalcontent = this.i?.supplementContent?.contractContent;
+    }
    this.isVisible = true;
  }
  handleCancel() {
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@ -165,9 +165,8 @@
 <nz-card nzTitle="附件信息" #distannce4>
  <sv-container>
    <sv label="协议附件">
-      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
-      <a href="javascript:;" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
-      <a target="_blank" [routerLink]="['/agreement']" [queryParams]="{ type: 8 }">补充协议</a>
+      <a *ngIf = "i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a *ngIf = "i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
@ -229,10 +228,10 @@
  </div>
 </nz-card>

-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="modalTitle"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
  <ng-container *nzModalContent>
-    <div *ngIf="!imges">暂无附件信息</div>
-    <app-imagelist [imgList]="imges"></app-imagelist>
+    <div *ngIf="!modalcontent">暂无附件信息</div>
+    <div [innerHTML]="modalcontent"></div>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-21 14:55:34
+ * @LastEditTime : 2022-03-23 14:49:13
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
@ -39,6 +39,8 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
    { title: '时间', index: 'vinOutTime' },
    { title: '地点', index: 'cityName' }
  ];
+  modalcontent: any;
+  modalTitle:string = '';
  billExpenses: any[] = []; //运费信息表格信息
  logColumns: STColumn[] = [
    { title: '款项', index: 'costCodeLabel' },
@ -94,7 +96,14 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
    window.history.go(-1);
  }
  agreement(value: any) {
-    this.imges = this.i?.agreementFilePath;
+    if(value  ==='1'){
+      this.modalTitle = '附件信息';
+      this.modalcontent = this.i?.contractContent?.contractContent;
+      
+    }else if(value === '2'){
+      this.modalTitle = '补充协议';
+      this.modalcontent = this.i?.supplementContent?.contractContent;
+    }
    this.isVisible = true;
  }
  handleCancel() {