Merge branch 'v2-220418' of…

Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into fix-v2-220418

Merge branch 'v2-220418' of…
794b3a5e · XieZhiXiong · 5ad7d1c0 · 69e0eecf · 794b3a5e · 794b3a5e
Commit 794b3a5e authored Apr 25, 2022 by XieZhiXiong
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

DeliveryNoticeOrder.ts src/pages/order/assets/handles/DeliveryNoticeOrder.ts +1 -1

DeliveryGoodTableSelect.tsx ...nents/DeliveryGoodTableSelect/DeliveryGoodTableSelect.tsx +5 -1

No files found.
--- a/src/pages/order/assets/handles/DeliveryNoticeOrder.ts
+++ b/src/pages/order/assets/handles/DeliveryNoticeOrder.ts
@@ -13,7 +13,7 @@ class DeliveryNoticeOrder {

  getOrderDeliveryPlanOrderProductPage(form: FormInstance, current: number = 1, orderType = 1) {
    let fields = form.getFieldsValue();
-    
+
    let payload: any = {
      memberId: fields.member?.buyerMemberId,
      roleId: fields.member?.buyerRoleId,

--- a/src/pages/order/components/DeliveryGoodTableSelect/DeliveryGoodTableSelect.tsx
+++ b/src/pages/order/components/DeliveryGoodTableSelect/DeliveryGoodTableSelect.tsx
@@ -47,7 +47,11 @@ function DeliveryGoodTableModal(props: DeliveryGoodTableModalProps) {
  }, [visible])

  useEffect(() => {
-    service.getOrderDeliveryPlanOrderProductPage(form, 1, orderType).then(handleResponseHttp)
+    console.log(form.getFieldValue('member'));
+
+    if (form.getFieldValue('member')) {
+      service.getOrderDeliveryPlanOrderProductPage(form, 1, orderType).then(handleResponseHttp)
+    }
  }, [visible])

  const handleResponseHttp = res => {