From fe7010f227c075d99ce5a0b6a5be3428f0ce756f Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 15 Apr 2022 15:19:20 +0800
Subject: [PATCH] fix bug

---
 .../bulk-release-publish.component.ts          | 18 +++++++++---------
 .../tran-agreement.component.html              | 10 ++++++++++
 .../tran-agreement/tran-agreement.component.ts |  4 ++--
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
index d7383ec2..789f2339 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
@@ -160,14 +160,11 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
             allowClear: true,
           } as SFSelectWidgetSchema
         },
-        // enterpriseInfoName: {
-        //   type: 'string',
-        //   title: '网络货运人',
-        //   ui: {
-        //     widget: 'custom'
-        //   },
-        //   default: '天津市怡亚通XXXX有限公司'
-        // },
+        enterpriseInfoNamer: {
+          type: 'string',
+          title: '',
+          ui: { hidden: true }
+        },
         enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
@@ -175,7 +172,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.shipperSrv.getNetworkFreightForwarder()
+            asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
+            change: (q: any, qs: any) => {
+              this.sf1.setValue('/enterpriseInfoNamer', qs.label);
+            }
           }
         },
         deadlineTime: {
diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
index bbe21f8f..25ed7a44 100644
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html
@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-23 14:24:05
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-15 15:18:33
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <nz-card class="card-height" >
   <div [innerHTML]="agreement | safehtml"></div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
index 8cfa9ca5..d49c407e 100644
--- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
+++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:19:51
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-15 15:15:13
+ * @LastEditTime : 2022-04-15 15:18:29
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -98,7 +98,7 @@ export class TranAgreementComponent {
         parametersDTO: {
           contractCode: '',
           shipperName: this?.shipperName || '', //托运人
-          carrierName: this.object?.enterpriseInfoName || '', //承运人
+          carrierName: this.object?.enterpriseInfoNamer ||  this.object?.enterpriseInfoName || '', //承运人
           shipperLegalPersonName: this.enterpriseInfo.legalPersonName || '', //托运法定代表人
           carrierLegalPersonName: this.enterpriseInfo.netLegalPersonName || '', //承运法定代表人
           consignorInfo: `${this.object.unLoadingPlaceDTOList[0]?.appUserName || ''}  ${