Merge branch 'dev' into test

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

@@ -114,7 +114,7 @@ const List: React.FC<listParams> = (props) => {
       dataIndex: 'quotationNo',
       align: 'center',
       render: (text: any, records: any) => <EyePreview type="button" handleClick={() => {
-        handleToDetail(2, records.id)
+        handleToDetail(1, records.id)
       }}>{text}</EyePreview>
     },
     {
@@ -123,7 +123,7 @@ const List: React.FC<listParams> = (props) => {
       dataIndex: 'requisitionFormNo',
       align: 'center',
       render: (text: any, records: any) => <EyePreview type="button" handleClick={() => {
-        handleToDetail(1, records.requisitionId)//需求单id
+        handleToDetail(2, records.requisitionId)//需求单id
       }}>{text}</EyePreview>
     },
     {

src/pages/transaction/enquiryOffer/enquiryOfferSearch/index.tsx

@@ -90,7 +90,7 @@ const List:React.FC<{listParams}> = (props) => {
       dataIndex:'quotationNo',
       align:'center',
       render: (text: any,records: any) => <EyePreview type="button" handleClick={() => {
-        handleToDetail(2,records.id)
+        handleToDetail(1,records.id)
       }}>{text}</EyePreview>
     },
     {
@@ -99,7 +99,7 @@ const List:React.FC<{listParams}> = (props) => {
       dataIndex:'requisitionFormNo',
       align:'center',
       render: (text: any,records: any) => <EyePreview type="button" handleClick={() => {
-        handleToDetail(1,records.requisitionId)//需求单id
+        handleToDetail(2,records.requisitionId)//需求单id
       }}>{text}</EyePreview>
     },
     {

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

@@ -71,7 +71,7 @@ const List:React.FC<{}> = () => {
       key:'requisitionFormNo',
       dataIndex:'requisitionFormNo',
       align:'center',
-      render:(text:any, record:any) => <EyePreview type="button" url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/demand/preview?id=${record.id}`}>{text}</EyePreview>
+      render:(text:any, record:any) => <EyePreview type="button" url={`/memberCenter/tranactionAbility/enquiryOffer/toAddSubmitList/demand/preview?id=${record.requisitionId}`}>{text}</EyePreview>
     },
     {
       title:'报价单摘要',