修改物流， 需求发布显示的问题

src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx

@@ -304,7 +304,7 @@ const Deatail: React.FC<{}> = () => {
     if (query.orderId) {
       PublicApi.getOrderPurchaseOrderDetails({id: query.orderId}).then(res => {
         if(res.code === 1000) {
-          console.log(res.data, '查询销售订单详情')
+          actions.setFieldValue('receiverName', res.data.receiverName)
         }
       })
       //发货单号
@@ -595,7 +595,7 @@ const Deatail: React.FC<{}> = () => {
    */
   const handleOnOK = (type, values, params) => {
     console.log(type, values, '参数：', params)
-    let { id, orderNo, deliveryAddresId, fullAddress, memberName } = values[0]
+    let { id, orderNo, deliveryAddresId, fullAddress, memberName, invoicesNo, receiverName } = values[0]
     switch (type) {
       case 1://订单
         setrelevanceType(params.orderType)//订单类型
@@ -620,8 +620,8 @@ const Deatail: React.FC<{}> = () => {
       case 2://发货单
         // memberName 收货方
         setShipmentOrderID(id)
-        actions.setFieldValue('shipmentOrderCode', orderNo)
-        actions.setFieldValue("receiverName", memberName)
+        actions.setFieldValue('shipmentOrderCode', invoicesNo)
+        actions.setFieldValue("receiverName", receiverName)
         actions.setFieldValue('shipmentOrderId', id)// 发货单id
         actions.setFieldValue("invoicesTypeId", 1)//发货单
         actions.setFieldValue("receiverAddressId", deliveryAddresId)
@@ -924,10 +924,10 @@ const Deatail: React.FC<{}> = () => {
                   </TabPane>
                   <TabPane key='tab-3' tab='运费'>
                     <FormItem labelAlign="left" labelCol={{ span: 2 }} editable={false} name="fregint" label="运费">
-                      <>未报价</>
+                      <>{initialValues.freightPrice || '未报价'}</>
                     </FormItem>
                     <FormItem labelAlign="left" labelCol={{ span: 2 }} editable={false} name="fregint2" label="结算方式">
-                      <></>
+                      <>{initialValues.freightPrice || '-'}</>
                     </FormItem>
                   </TabPane>
                   <TabPane key='tab-4' tab='流转记录'>

src/pages/transaction/enquiryOffer/components/productModal.tsx

@@ -273,14 +273,14 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
           <Tabs defaultActiveKey='tab1'
             tabPosition="left"
           >
-            <Tabs.TabPane tab='基本信息' key="tab-1">
+            <Tabs.TabPane tab='基本信息' key="tab-1" forceRender>
               <Form.Item
                 label='对应需求单规格型号'
                 name='model'
                 initialValue={props.initialValues.model}
                 rules={[
                   {
-
+                    message: '请选择规格型号',
                     required: true
                   }
                 ]}
@@ -349,7 +349,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
 
             {
               commodityAttributedataSource.length > 0 && commodityAttributedataSource.map((item: any) => <>
-                <TabPane tab={item.customerAttribute.name} key={item.customerAttribute.name}>
+                <TabPane tab={item.customerAttribute.name} key={item.customerAttribute.name} forceRender>
                   <Space key={item.customerAttribute.id} direction="vertical" size={16}>
                     {item.customerAttributeValueList.map((child, childIndex) => {
                       return <Badge text={child.value} key={childIndex} status="default" />
@@ -361,13 +361,14 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
 
             }
 
-            <Tabs.TabPane tab='报价明细' key="tab-7">
+            <Tabs.TabPane tab='报价明细' key="tab-7" forceRender>
               <Form.Item
                 label='单位'
                 name='purchaseNuit'
                 initialValue={props.initialValues.purchaseNuit}
                 rules={[
                   {
+                    message: '请选择单位',
                     required: true
                   }
                 ]}
@@ -381,6 +382,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
                 initialValue={props.initialValues.purchaseQuantity}
                 rules={[
                   {
+                    message: '请选择采购数量',
                     required: true
                   }
                 ]}
@@ -393,6 +395,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
                 name='price'
                 rules={[
                   {
+                    message: '请输入报价单价',
                     required: true
                   }
                 ]}

src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx

@@ -1008,6 +1008,7 @@ const Detail: React.FC<{}> = () => {
                         initialValue={initialValues.quotationSummary}
                         rules={[
                           {
+                            message: '请输入报价单摘要',
                             required: true
                           }
                         ]}
@@ -1021,6 +1022,7 @@ const Detail: React.FC<{}> = () => {
                         name='requisitionFormNo'
                         rules={[
                           {
+                            message: '请选择对应需求单号',
                             required: true
                           }
                         ]}
@@ -1098,6 +1100,7 @@ const Detail: React.FC<{}> = () => {
                         label="最小起订"
                         rules={[
                           {
+                            message: '请输入最小起订',
                             required: true
                           }
                         ]}

src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx

@@ -47,7 +47,10 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
         category: v.customerCategoryName,
         brand: v.brandName,
         unit: v.unitName,
-        purchaseCount: 1
+        purchaseCount: 1,
+        logistics: v.logistics,
+        memberId: v.memberId,
+        memberRoleId: v.memberRoleId
 
       })
       setinquiryGoods(inquiry);
@@ -274,7 +277,8 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
         confirm={handleOkAddMember}
         cancel={handleCancelAddMember}
         visible={visibleChannelMember}
-        resetModal={{ destroyOnClose: true, forceRender: true }}
+        forceRender={visibleChannelMember}
+        resetModal={{ destroyOnClose: true}}
         columns={columnsSetMember}
         rowSelection={memberRowSelection}
         fetchTableData={params => fetchGoodsList(params)}