Merge branch 'dev-srm' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev-srm

src/pages/transaction/purchaseAbility/components/detail/components/bidLayout/index.less

+.thankModal {
+  :global {
+    .ant-modal-header {
+      display: none;
+    }
+
+    .ant-modal-content {
+      height: 440px;
+      background: url("../../../../../../../assets/imgs/thankLetterBg.png") center center no-repeat;
+      // background: url('../../../../assets/imgs/thankLetterBg.png') center center no-repeat;
+    }
+
+    .ant-modal-footer {
+      display: none;
+    }
+  }
+
+  .thankLetter {
+
+    // width: 660px;
+    // height: 440px;
+    h2 {
+      text-align: center;
+      font-size: 24px;
+      font-weight: 500;
+      color: #303133;
+      // height: 36px;
+      // line-height: 36px;
+      padding-top: 20px;
+    }
+
+    h4 {
+      text-align: center;
+      font-size: 16px;
+      font-weight: 500;
+      color: #C0C4CC;
+      line-height: 16px;
+      padding: 0 24px;
+    }
+
+    p {
+      font-size: 14px;
+      font-weight: 400;
+      color: #303133;
+      line-height: 24px;
+      padding: 0 24px;
+    }
+
+    .name {
+      font-weight: 500;
+      text-align: left;
+      padding: 0 24px;
+    }
+
+    .company {
+      text-align: right;
+      padding: 0 24px;
+      margin-top: 100px;
+    }
+
+    .time {
+      text-align: right;
+      padding: 0 24px;
+    }
+  }
+
+}

src/pages/transaction/purchaseAbility/components/detail/components/bidLayout/index.tsx

-import React, { useContext } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 import { Context } from '../context';
 import Card from '../../../card';
-import { Button, Row, Col, Collapse } from 'antd';
+import { Button, Row, Col, Modal } from 'antd';
 import { ExclamationCircleFilled } from '@ant-design/icons';
+import style from './index.less';
+import moment from 'moment';
+import { getAuth } from '@/utils/auth';
 
 const BidLayout = () => {
   const context = useContext(Context);
-  const title = context.isPrize === 1 ? '中标通知' : '授标结果'
+  const title = context.isPrize === 1 ? '中标通知' : '授标结果';
+  const [visible, setVisible] = useState<boolean>(false);
+  const userInfo = useMemo(() => getAuth(), [context]);
   return (
     <Card
       id='bidLayout'
       title={title}
       backgroundColor={context.isPrize === 1 && '#00B37A'}
-      extra={!context.isPrize && <Button type='link'>查看感谢函</Button>}
+      extra={context.content && <Button type='link' onClick={() => setVisible(true)}>查看感谢函</Button>}
     >
-      { context.isPrize === 1 ? (
+      {context.isPrize === 1 ? (
         <div style={{ whiteSpace: 'pre' }}>{context.awardResults}</div>
       ) : (
         <Row>
@@ -27,6 +32,26 @@ const BidLayout = () => {
           </Col>
         </Row>
       )}
+
+      {/* 感谢函 */}
+      <Modal
+        title="感谢函"
+        visible={visible}
+        onOk={()=> setVisible(false)}
+        onCancel={()=> setVisible(false)}
+        width={660}
+        className={style.thankModal}
+      >
+        <div className={style.thankLetter}>
+          <h2>感谢函</h2>
+          <h4>THANKS LETTER</h4>
+          <p className={style.name}>尊敬的{userInfo.name}</p>
+          <p>{context.content}</p>
+          <p className={style.company}>{context.createMemberName}</p>
+          <p className={style.time}>{moment().format('YYYY-MM-DD')}</p>
+        </div>
+      </Modal>
+
     </Card>
   )
 }

src/pages/transaction/purchaseAbility/onlineBid/detail/index.tsx

@@ -48,8 +48,7 @@ const SearchDetail = () => {
     const {
         query: {
             id,
-            number,
-            isPrize
+            number
         },
     } = history.location;
     // 竞价过程
@@ -208,7 +207,7 @@ const SearchDetail = () => {
             handleSignUpEffect(data);
             handleConditionEffect(data);
             handleResultEffect(data);
-            if (data.externalState === 99 && isPrize != 1 && isPrize) {
+            if (data.externalState === 99 && data.isPrize != 1 && data.isPrize) {
                 seTthankVisAble(true)
             }
         })

src/pages/transaction/purchaseAbility/onlineBid/search/index.tsx

@@ -32,7 +32,7 @@ const Search = () => {
         render: (text: any, record: any) => (
             <Space direction='vertical'>
                 <EyePreview
-                    url={`/memberCenter/procurementAbility/onlineBid/search/detail?id=${record.id}&number=${record.biddingNo}&isPrize=${record.isPrize}`}>{text}</EyePreview>
+                    url={`/memberCenter/procurementAbility/onlineBid/search/detail?id=${record.id}&number=${record.biddingNo}`}>{text}</EyePreview>
                 <Text type="secondary">{record.details}</Text>
             </Space>
         )

src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/demand.tsx

@@ -263,7 +263,7 @@ const Demand: React.FC<Iprops> = (props: any) => {
         >
           <Radio.Group onChange={changeRadio}>
             <Radio value={1}><Tooltip placement="topLeft" title={<>需求发布至采购门户</>}>发布至平台<QuestionCircleOutlined style={{ marginLeft: '5px' }} /></Tooltip></Radio>
-            <Radio value={2}><Tooltip placement="topLeft" title={<>系统通过需求单品类、商品属性、适用地市与平台会员发布的商品品类、商品属性、归属地区进行匹配，推荐满足条件的平台会员</>}>系统匹配<QuestionCircleOutlined style={{ marginLeft: '5px' }} /></Tooltip></Radio>
+            {/* <Radio value={2}><Tooltip placement="topLeft" title={<>系统通过需求单品类、商品属性、适用地市与平台会员发布的商品品类、商品属性、归属地区进行匹配，推荐满足条件的平台会员</>}>系统匹配<QuestionCircleOutlined style={{ marginLeft: '5px' }} /></Tooltip></Radio> */}
             <Radio value={3}><Tooltip placement="topLeft" title={<>选择与当前会员有归属关系的会员且角色类型为服务提供的会员（供应商），需求只发送给指定会员</>}>邀请会员<QuestionCircleOutlined style={{ marginLeft: '5px' }} /></Tooltip></Radio>
           </Radio.Group>
         </Form.Item>