Merge branch 'dev' into test

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

@@ -12,7 +12,6 @@ import ModalTable from '@/components/ModalTable'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { PageStatus, usePageStatus } from '@/hooks/usePageStatus'
 import { ColumnType } from 'antd/lib/table/interface'
-import { ISchema } from '@formily/antd'
 import { LinkOutlined } from '@ant-design/icons'
 const { TabPane } = Tabs
 const { Option } = Select
@@ -233,26 +232,6 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
     </Button>
   )
 
-  const formSearch: ISchema = {
-    type: 'object',
-    properties: {
-      name: {
-        type: 'string',
-        "x-component": "Search",
-        "x-component-props": {
-          placeholder: '输入关键字搜索'
-        }
-      },
-      roleId: {
-        type: 'string',
-        "x-component-props": {
-          placeholder: '选择会员角色'
-        },
-        enum: []
-      }
-    }
-  }
-
   const placeholderText = '请先选择对应需求单号'
   let ButtonList = [
     <Button onClick={() => props.onCancel()} >
@@ -432,11 +411,7 @@ const comfirmDialog: React.FC<Params> = (props, { onRef }) => {
         columns={columns}
         rowSelection={productRowSelection}
         fetchTableData={params => fetchData(params)}
-        formilyProps={{
-          ctx: {
-            schema: formSearch
-          }
-        }}
+        modalType='productByMember'
         tableProps={{
           rowKey: 'id'
         }}

src/pages/transaction/enquirySubmit/components/detail.tsx

@@ -584,6 +584,7 @@ const detailInfo: React.FC<parmas> = (props) => {
           </div>
           <Row className={style['mainCol-rows']}>
             {
+              dataInfo.requisitionFormAddress &&
               dataInfo.requisitionFormAddress.length > 0 ?
 
                 dataInfo.requisitionFormAddress