Merge branch 'v2-0418-xxx' into 'v2-220418'

src/pages/procurement/components/bidMethod/index.tsx

@@ -8,8 +8,8 @@ import BASE_CONFIG from '../../../../../config/base.config.json'
 import { CALLFORBID_TYPE, INVITE_BID } from '@/constants/procurement';
 import { ENTERPRISE_CENTER_URL } from '@/constants'
 import { getIntl } from 'umi';
- const shopInfo = BASE_CONFIG.web.shopInfo
- const intl = getIntl();
+const shopInfo = BASE_CONFIG.web.shopInfo
+const intl = getIntl();
 
 /**
  * 招标方式
@@ -19,7 +19,7 @@ export interface BidMethodProps {
   cardTitle?: string;
 }
 
-const BidMethod: React.FC<BidMethodProps> = ({cardTitle}) => {
+const BidMethod: React.FC<BidMethodProps> = ({ cardTitle }) => {
   const bidDetailContext = useContext(BidDetailContext)
   const { data: _data, ctl, apiType } = bidDetailContext
 
@@ -75,7 +75,7 @@ const BidMethod: React.FC<BidMethodProps> = ({cardTitle}) => {
   return (
     <MellowCard
       title={cardTitle}
-      style={{marginTop: 24}}
+      style={{ marginTop: 24 }}
       bordered={false}
       fullHeight
     >
@@ -87,22 +87,22 @@ const BidMethod: React.FC<BidMethodProps> = ({cardTitle}) => {
       </div>
       {
         data.inviteTenderType === INVITE_BID ?
-        <Table dataSource={data.memberList} columns={columns} pagination={{size: "small"}} />
-        :
-        <div className={style['card-list']}>
-          <Row>
-            <Col span={2}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'table.purchase.fabushangcheng' })}</p></Col>
-            <Col>
-              <p>
-              {
-                data.inviteTenderShopList.map(item => {
-                  return shopInfo.find(_item => _item.type === item.type && _item.environment === item.environment)['name']
-                }).join(' / ')
-              }
-              </p>
-            </Col>
-          </Row>
-        </div>
+          <Table dataSource={data.memberList} columns={columns} pagination={{ size: "small" }} />
+          :
+          <div className={style['card-list']}>
+            <Row>
+              <Col span={2}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'table.purchase.fabushangcheng' })}</p></Col>
+              <Col>
+                <p>
+                  {
+                    data.inviteTenderShopList.map(item => {
+                      return shopInfo.find(_item => _item.type === item.type && _item.id === item.shopId)['name']
+                    }).join(' / ')
+                  }
+                </p>
+              </Col>
+            </Row>
+          </div>
       }
     </MellowCard>)
 }