Merge branch 'v2-220418-order' into 'v2-220418'

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitB2B/create.tsx

@@ -179,8 +179,8 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
   // 获取计划送货
   const getPlannedDelivery = () => {
     getOrderDeliveryPlanOrderProductPage({
-      startDate: selectedDate[0],
-      endDate: selectedDate[1],
+      // startDate: selectedDate[0],
+      // endDate: selectedDate[1],
       memberId: selectedMember.memberId,
       roleId: selectedMember.roleId,
       roleType: ROLE_TYPE,
@@ -205,13 +205,11 @@ const DeliveryPlanAwaitB2BCreate: React.FC = () => {
   // 监听 选择日期 and 选择会员 
   useEffect(() => {
     // 双条件满足 请求
-    if (!_.isEmpty(selectedDate) && !_.isEmpty(selectedMember)) {
-      console.log('订单能力 - 送货计划管理 - 待提交送货计划 B2B -----------:>> ', '双条件满足 请求 获取计划送货')
+    if (!_.isEmpty(selectedMember)) {
       getPlannedDelivery()
+    } else if (!_.isEmpty(selectedDate) && !_.isEmpty(selectedMember)) {
       const planSummaryText = `${selectedDate[0]}~${selectedDate[1]} ${selectedMember.name} ${DeliveryPlanText}`
       form.setFieldsValue({ planSummaryText })
-    } else {
-      console.log('订单能力 - 送货计划管理 - 待提交送货计划 B2B -----------:>> ', '条件暂未满足不调取接口获取')
     }
   }, [selectedDate, selectedMember])
 

src/pages/order/deliveryPlanManagement/deliveryPlanAwaitSRM/create.tsx

@@ -181,8 +181,8 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
   // 获取计划送货 物料
   const getPlannedDelivery = () => {
     getOrderDeliveryPlanOrderProductPage({
-      startDate: selectedDate[0],
-      endDate: selectedDate[1],
+      // startDate: selectedDate[0],
+      // endDate: selectedDate[1],
       memberId: selectedMember.memberId,
       roleId: selectedMember.roleId,
       roleType: ROLE_TYPE,
@@ -207,13 +207,11 @@ const DeliveryPlanAwaitSRMCreate: React.FC = () => {
   // 监听 选择日期 and 选择会员 
   useEffect(() => {
     // 双条件满足 请求
-    if (!_.isEmpty(selectedDate) && !_.isEmpty(selectedMember)) {
-      console.log('订单能力 - 送货计划管理 - 待提交送货计划 SRM -----------:>> ', '双条件满足 请求 获取计划送货')
+    if (!_.isEmpty(selectedMember)) {
       getPlannedDelivery()
+    } else if (!_.isEmpty(selectedDate) && !_.isEmpty(selectedMember)) {
       const planSummaryText = `${selectedDate[0]}~${selectedDate[1]} ${selectedMember.name} ${DeliveryPlanText}`
       form.setFieldsValue({ planSummaryText })
-    } else {
-      console.log('订单能力 - 送货计划管理 - 待提交送货计划 SRM -----------:>> ', '条件暂未满足不调取接口获取')
     }
   }, [selectedDate, selectedMember])