解决冲突

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

@@ -927,20 +927,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   }
   // 提交前协议弹窗
   agreementConfirm(submitType?: string) {
-    const modalRef = this.modalService.create({
-      nzTitle: '运输协议',
-      nzContent: TranAgreementComponent,
-      nzWidth: 900,
-      nzFooter: null
-    });
-    modalRef.afterClose.subscribe(result => {
-      if (result) {
-        this.submit(submitType);
-      }
-    });
-  }
-  // 提交
-  submit(submitType?: string): void {
     //装卸货信息
     const LoadingList = this.startInfo.concat(this.endInfo);
 
@@ -995,6 +981,23 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       expenseDTOList: expenseList,
       paymentDays: this.sf7.value.paymentDays
     };
+
+    const modalRef = this.modalService.create({
+      nzTitle: '运输协议',
+      nzContent: TranAgreementComponent,
+      nzWidth: 900,
+      nzFooter: null,
+      nzComponentParams: {Object: params,}
+    });
+    modalRef.afterClose.subscribe(result => {
+      if (result) {
+        this.submit(submitType, params);
+      }
+    });
+  }
+  // 提交
+  submit(submitType?: string,params?: any): void {
+
     // const params: any = {
     //   ...this.sf1.value,
     //   ...this.sf5.value,

src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-06 15:01:40
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 19:58:01
+ * @LastEditTime : 2022-02-28 20:33:56
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -18,17 +18,27 @@ import { SupplyManagementService } from '../../services/supply-management.servic
   styleUrls: ['./tran-agreement.component.less']
 })
 export class TranAgreementComponent {
-  
+  Object: any;
   agreement:any;
   constructor(private modal: NzModalRef,public service: SupplyManagementService,) {
     
   }
 
   ngOnInit() {
+    console.log(Object)
     const params = {
       contractType:'1',
       enterpriseInfoId: '',
-      parametersDTO: {}
+      parametersDTO: {
+        // 回单付
+        back: '',
+        // 发货地址
+        consignorAddress: '',
+        // 发货时间
+        consignorDate: '',
+        // 发货时间
+        // consignorDate: '',
+      }
     }