From a9ad891224f3fe35b8cf1a031e10e06aaa0bed3b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 27 Apr 2022 20:44:42 +0800
Subject: [PATCH] fix bug

---
 .../components/onecar-publish/onecar-publish.component.ts | 6 +++---
 .../release-publish/release-publish.component.ts          | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 3a292bf1..b99d9d75 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -175,7 +175,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
               if (str) {
                 this.getRegionCode(str);
                 this.shipperName = qs?.label;
-                this.payChange();
+                this.payChange(1);
               }
             }
           } as SFSelectWidgetSchema
@@ -728,7 +728,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         }
       });
   }
-  payChange() {
+  payChange(value?:number) {
     const prePay = this.sf7.value.prePay || 0;
     const toPay = this.sf7.value.toPay || 0;
     const receiptPay = this.sf7.value.receiptPay || 0;
@@ -741,7 +741,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       fuelCardAmount: oilCardPay,
       resourcetype: '1'
     };
-    if(!this?.sf1.value?.shipperAppUserId || !this?.sf1.value?.enterpriseInfoName) {
+    if((!this?.sf1.value?.shipperAppUserId || !this?.sf1.value?.enterpriseInfoName) && value) {
       this.service.msgSrv.warning('请先选择货主和网络货运人！');
       this.sf7.setValue('/prePay', 0);
       this.sf7.setValue('/toPay', 0);
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index 0b0e5046..57b97963 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -162,7 +162,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
               if (str) {
                 this.getRegionCode(str);
                 this.shipperName = qs?.label;
-                this.payChange();
+                this.payChange(1);
               }
             }
           } as SFSelectWidgetSchema
@@ -192,7 +192,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             change: (q: any, qs: any) => {
               console.log(qs.label);
               this.sf1.setValue('/enterpriseInfoNamer', qs.label);
-              this.payChange()
+              this.payChange(1)
             }
           }
         },
@@ -748,7 +748,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res);
       });
   }
-  payChange() {
+  payChange(value?:number) {
     const prePay = this.sf7.value.prePay || 0;
     const toPay = this.sf7.value.toPay || 0;
     const receiptPay = this.sf7.value.receiptPay || 0;
@@ -761,7 +761,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       fuelCardAmount: oilCardPay,
       resourcetype: '1'
     };
-    if(!this?.sf1.value?.shipperAppUserId || !this?.sf1.value?.enterpriseInfoName) {
+    if((!this?.sf1.value?.shipperAppUserId || !this?.sf1.value?.enterpriseInfoName) && value) {
       this.service.msgSrv.warning('请先选择货主和网络货运人！');
       this.sf7.setValue('/prePay', 0);
       this.sf7.setValue('/toPay', 0);