From 3db73b9509a789067230bc829b12a79ef26de35e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 8 Mar 2022 13:48:02 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail-change.component.ts                 | 10 +++++++---
 .../vehicle-detail-change.component.html            | 12 ++++++------
 .../vehicle-detail-change.component.ts              | 13 +++++++++----
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git 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
index 2cf4b893..a722be4c 100644
--- 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-07 17:56:10
+ * @LastEditTime : 2022-03-08 13:47:15
  * @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.
  */
@@ -99,10 +99,9 @@ loadTime: any; // 货源单设置回显
   }
 
   ngOnInit(): void {
-    this.initSF();
+    this.initData()
     this.initSF3();
     this.initSF4();
-    this.initData()
   }
   initSF() {
     this.schema = {
@@ -110,6 +109,7 @@ loadTime: any; // 货源单设置回显
         loadingLadingBillFilePath: {
           type: 'string',
           title: '装货凭证',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -148,6 +148,7 @@ loadTime: any; // 货源单设置回显
         loadingPeopleVehiclesGoodsFilePath: {
           type: 'string',
           title: '',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -202,6 +203,7 @@ loadTime: any; // 货源单设置回显
         unloadingLadingBillFilePath: {
           type: 'string',
           title: '卸货凭证',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -240,6 +242,7 @@ loadTime: any; // 货源单设置回显
         unloadingPeopleVehiclesGoodsFilePath: {
           type: 'string',
           title: '',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -311,6 +314,7 @@ loadTime: any; // 货源单设置回显
       if (res) {
         this.i = res;
         this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
+        this.initSF();
         // 对装货凭证进行初始化
         let arr : any= []
         res?.receiptFilePath.forEach((element: any, index: any) => {
diff --git 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
index 4a7a7ae5..4c3579ce 100644
--- 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-07 17:29:44
+ * @LastEditTime : 2022-03-08 13:35:20
  * @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.
 -->
@@ -265,20 +265,20 @@
     <sv label="是否回单">
       {{ i?.supplementaryInformationVO?.stateReceipt  ? '是' : '否' }}
     </sv>
-    <sv label="回单类型">
+    <sv label="回单类型"  *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
     </sv>
-    <sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
-    <sv label="所在地区">
+    <sv label="联系人"  *ngIf="i?.supplementaryInformationVO?.stateReceipt"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
+    <sv label="所在地区"  *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.area }}
     </sv>
-    <sv label="详细地址">
+    <sv label="详细地址"  *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       {{ i?.supplementaryInformationVO?.address }}
     </sv>
 
   </sv-container>
   <sv-container col="1" class="mt-md">
-    <sv label="回单凭证">
+    <sv label="回单凭证"  *ngIf="i?.supplementaryInformationVO?.stateReceipt">
       <nz-upload
         class="avatar-uploader"
         [nzAction]="service.$api_upload_url"
diff --git 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
index 25cf1096..fd2eef06 100644
--- 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-07 17:56:51
+ * @LastEditTime : 2022-03-08 13:47:16
  * @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.
  */
@@ -109,18 +109,19 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    console.log(this.id);
-    this.initSF();
+    this.initData();
     this.initSF3();
     this.initSF4();
-    this.initData();
   }
   initSF() {
+    console.log(this.i);
+    console.log(this.i.billStatus == '4' || this.i.billStatus == '3');
     this.schema = {
       properties: {
         loadingLadingBillFilePath: {
           type: 'string',
           title: '装货凭证',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -159,6 +160,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         loadingPeopleVehiclesGoodsFilePath: {
           type: 'string',
           title: '',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -213,6 +215,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         unloadingLadingBillFilePath: {
           type: 'string',
           title: '卸货凭证',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -251,6 +254,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         unloadingPeopleVehiclesGoodsFilePath: {
           type: 'string',
           title: '',
+          readOnly: this.i.billStatus !== '4' || this.i.billStatus !== '3',
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
@@ -331,6 +335,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             delete this.approvalLsit[key];
           }
         });
+        this.initSF();
         // 对装货凭证进行初始化
         let arr: any = [];
         res?.receiptFilePath.forEach((element: any, index: any) => {