🐞 fix: 修复物流单BUG

src/pages/logistics/components/confirmModal.tsx

 import React, { Component, useState, useEffect } from 'react';
-import { Modal, Button, Form } from 'antd'
+import { Modal, Button, Form, message } from 'antd'
 import {
   SchemaForm, SchemaMarkupField as Field,
   createFormActions,
@@ -28,6 +28,10 @@ const comfirmDialog: React.FC<Params> = (props) => {
     if(props.freightPrice) {
       value.freightPrice = props.freightPrice
     }
+    if (value.status === 4 && !props.freightPrice) {
+      message.warning('请关闭弹框,输入运费')
+      return
+    }
     PublicApi.postLogisticsOrderWaitConfirmConfirm(value).then(res => {
       if (res.code === 1000) {
         props.onOK()

src/pages/logistics/components/orderSearchDetail.tsx

@@ -258,10 +258,8 @@ const detailInfo: React.FC<{}> = () => {
     try {
       const value = await form.validateFields();
       setfreightPrice(value.freight);
+    } catch { }
     setvisible(true);
-    } catch {
-      message.error('请下拉到运费模块输入运费！')
-    }
   }
 
   return (
@@ -320,6 +318,7 @@ const detailInfo: React.FC<{}> = () => {
       }
 
     >
+      <Form {...layout} form={form}>
         <Row>
           <Col className={style['mainCol']} span={24}>
             <div className={style['mainCol-title']}>
@@ -430,7 +429,7 @@ const detailInfo: React.FC<{}> = () => {
                 {infoTem['freight'].leftElem.map(
                   (item: any, index: number) => {
                     return (
-                    <Form {...layout} form={form}>
+                      <>
                         {item.key === 'freight' &&
                           <>
                             {type === 'option' ? (
@@ -466,7 +465,7 @@ const detailInfo: React.FC<{}> = () => {
                           <Form.Item label={item.title} name={item.key}>
                             <span>{item.value}</span>
                           </Form.Item>}
-                    </Form>
+                      </>
                     );
                   },
                 )}
@@ -486,6 +485,7 @@ const detailInfo: React.FC<{}> = () => {
             {/* <OrderLog id={id} pathName={history.location.pathname} /> 2020-12-11 已经在详情接口返回 不需要这个了 */}
           </Col>
         </Row>
+      </Form>
       <ConfirmModal
         id={id}
         dialogVisible={visible}

src/pages/transaction/inquiryQuote/addInquiryOrder/components/basicInfo.tsx

@@ -33,7 +33,6 @@ const BasicInfo: React.FC<queryProps> = (props) => {
   const handleOkAddMember = () => {
     if (inquiryRowCtl.selectRow.length > 0) {
       setVisibleChannelMember(false)
-      console.log(inquiryRowCtl.selectRow[0])
       setinquiryNo(inquiryRowCtl.selectRow[0]);
       getMemberList(inquiryRowCtl.selectRow[0]); // 回传给父级
     }
@@ -145,8 +144,8 @@ const BasicInfo: React.FC<queryProps> = (props) => {
         <Form.Item label='报价单号' name='quotationNo'>
           <span>{Object.keys(editData).length > 0 ? editData.quotationNo : '-'}</span>
         </Form.Item>
-        <Form.Item label='询价会员' name='memberName'>
-          <span>{Object.keys(editData).length > 0 ? editData.memberName : '-'}</span>
+        <Form.Item label='询价会员' name='inquiryListMemberName'>
+          <span>{Object.keys(editData).length > 0 ? (editData.inquiryListMemberName || editData.memberName ) : '-'}</span>
         </Form.Item>
         <Form.Item label='报价截止时间' name='quotationAsTime'>
           <span>{Object.keys(editData).length > 0 ? format(editData.quotationAsTime) : '-'}</span>

src/pages/transaction/inquiryQuote/enquiryOrder/index.tsx

@@ -34,7 +34,7 @@ const EnquiryOrder: React.FC<{}> = (props) => {
     key: 'details',
     dataIndex: 'details',
   }, {
-    title: '被询价会员',
+    title: '询价会员',
     key: 'memberName',
     dataIndex: 'memberName',
   }, {