解决冲突

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,