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

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

@@ -11,6 +11,9 @@
 
 .bidConfirmWrapper {
   overflow-x: scroll;
+  border-left: 4px solid #F4F5F7;
+  border-right: 4px solid #F4F5F7;
+  background: #F4F5F7;
   .bidRowWrapper {
     min-width: 1300px;
   }
@@ -29,7 +32,6 @@
       }
     }
   }
-  background: #F4F5F7;
   .bidTableHead {
     height: 40px;
     line-height: 32px;

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

@@ -10,6 +10,7 @@ import { PublicApi } from '@/services/api';
 import ModalOperate from '../../../modalOperate';
 import BidTable from '../bidTable';
 import style from './rowLayout/index.less';
+import { isEmpty } from 'lodash';
 
 const chNum: { [key: number]: string } = {
   1: '一',
@@ -315,40 +316,42 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => {
               {soure[idx]
                 && (
                   <>
-                    <div className={style.divider}>
+                    <div className={style.divider} style={{ marginTop: '12px' }}>
                       <div>
                         <Divider type='vertical' className={style.vertical} />
                         比价信息
                       </div>
                     </div>
                     <BidTable preview={bool ? bool : preview} redux={reduxFetch} />
-                  </>
-                )}
-            </Tabs.TabPane>
-          ))}
-        </Tabs>
-        {preview &&
+                    {/* 授标了才显示 */}
+                    {(preview && context.externalState === 99 && Number(item) === Number(turn)) &&
                       <Row gutter={[0, 4]} style={{ marginTop: '1em' }}>
                         {context.awardComments &&
                           <Col span={24}>
                             <div className={style['card-list']}>
                               <Row>
-                    <Col span={2}><p className={style['card-list_title']}>授标意见:</p></Col>
+                                <Col span={3}><p className={style['card-list_title']}>授标意见:</p></Col>
                                 <Col><p>{context.awardComments}</p></Col>
                               </Row>
                             </div>
                           </Col>
                         }
-            {context.urls &&
+                        {!isEmpty(context.urls) &&
                           <Col span={24}>
                             <div className={style['card-list']}>
                               <Row>
-                    <Col span={2}><p className={style['card-list_title']}>附件:</p></Col>
+                                <Col span={3}><p className={style['card-list_title']}>附件:</p></Col>
                                 <Col>
                                   {context.urls && context.urls.map((item, index) => (
                                     <p key={`urls_${index + 1}`} className={style['card-list_file']}>
-                          <FilePdfOutlined className={style[`card-list_fileicon`]} />
-                          <Typography.Link href={item.url} target="_blank">{item.name}</Typography.Link>
+                                      <Typography.Link
+                                        target="_blank"
+                                        key={`link_${index + 1}`}
+                                        href={`/api/contract/contractTemplate/downloadContract?contractName=${item.name}&contractUrl=${item.url}`}
+                                      >
+                                        <FilePdfOutlined style={{ marginRight: '5px' }} />
+                                        {item.name}
+                                      </Typography.Link>
                                     </p>
                                   ))}
                                 </Col>
@@ -358,6 +361,44 @@ const ContrastLyout1: React.FC<IProps> = (props: any) => {
                         }
                       </Row>
                     }
+                  </>
+                )}
+            </Tabs.TabPane>
+          ))}
+        </Tabs>
+        {(isPath === "offerInquire" && context.externalState === 99) && (
+          <div>
+            <div className={style.divider} style={{ marginTop: '12px' }}>
+              <div>
+                <Divider type='vertical' className={style.vertical} />
+                确认授标结果
+              </div>
+            </div>
+            <Row gutter={[0, 4]} style={{ marginTop: '1em' }}>
+              {context.awardResults && (
+                <Col span={24}>
+                  <div className={style['card-list']}>
+                    <Row>
+                      <Col span={3}><p className={style['card-list_title']}>中标公告:</p></Col>
+                      <Col span={10}><p style={{ whiteSpace: 'break-spaces' }}>{context.awardResults}</p></Col>
+                    </Row>
+                  </div>
+                </Col>
+              )}
+              {context.content && (
+                <Col span={24}>
+                  <div className={style['card-list']}>
+                    <Row>
+                      <Col span={3}><p className={style['card-list_title']}>感谢函:</p></Col>
+                      <Col span={10}><p style={{ whiteSpace: 'break-spaces' }}>{context.content}</p></Col>
+                    </Row>
+                  </div>
+                </Col>
+              )}
+            </Row>
+          </div>
+        )}
+
         <ModalOperate
           id={id}
           title={type === 'next' ? '调整下轮报价时间' : '输入密匙'}

src/pages/transaction/purchaseAbility/components/detail/components/contrastLyout1/rowLayout/index.less

@@ -48,3 +48,7 @@
     font-size: 12px;
   }
 }
+.card-list_title {
+  font-size: 12px;
+  color: #909399;
+}