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

src/components/NiceForm/index.tsx

@@ -29,6 +29,7 @@ import SmilingFace from './components/SmilingFace';
 import AntUpload from './components/AntUpload';
 import './index.less'
 import { currentStateType, getCurrentState } from './utils/keepAlive';
+import { useRouteMatch } from 'umi';
 
 export interface NiceFormProps extends IAntdSchemaFormProps {}
 
@@ -102,15 +103,24 @@ export const componentExport = {
 }
 const NiceForm: React.FC<NiceFormProps> = props => {
   const { children, components, ...reset } = props;
+  const match = useRouteMatch();
 
   const defineComponents = Object.assign(componentExport, components);
 
   useEffect(() => {
     let paginationInfo: currentStateType = getCurrentState();
-    // @ts-ignore
-    reset.actions.setFormState(
-      state => (state.values = paginationInfo.queryParams),
-    );
+    // 一般 列表检索传入的 controlRender 的 NiceForm 是没有 value 或者 initialValues 的
+    // value 或者 initialValues 的，表单页有
+    if (
+      paginationInfo && match.path === paginationInfo.pathname
+      && !('value' in reset)
+      && !('initialValues' in reset)
+    ) {
+        // @ts-ignore
+       reset.actions.setFormState(
+         state => (state.values = paginationInfo.queryParams),
+       );
+     }
   }, [])
 
   return (

src/global/styles/reset.less

@@ -122,6 +122,10 @@
   .ant-pro-basicLayout-content .ant-pro-page-header-wrap {
     margin: 0;
   }
+  // 处理因为antd版本不同导致anchor的背景色不同
+  .ant-anchor-wrapper{
+    background-color: #fff;
+  }
 }
 
 .ant-descriptions-item-label {

src/pages/purchaseAbility/components/detail/components/bidCommonLayout/msgItem/index.less

@@ -30,6 +30,17 @@
       word-break: break-all;
     }
 
+    .titleTop {
+      font-size: 12px;
+      color: #303133;
+      display: inline-block;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-break: break-all;
+      max-width: calc(100% - 20px);
+    }
+
     .label{
       width: 40%;
     }

src/pages/purchaseAbility/components/detail/components/bidCommonLayout/msgItem/index.tsx

 import React from 'react';
-import { Tabs, Table, Row, Col, Space, Typography, Button, Tooltip } from 'antd';
+import { Typography, Tooltip } from 'antd';
 import { LinkOutlined } from '@ant-design/icons';
 
 import styles from './index.less';
@@ -15,16 +15,14 @@ const MsgItem: React.FC<MsgItemPrpos> = (props: any) => {
 
     return (
         <div className={styles.msgItem}>
-            <div className={styles.msgItemRow}>
+            <div className={styles.msgItemRow} style={{alignItems: 'center'}}>
                 <div className={styles.badge}>{rankNumber}</div>
-                <div className={styles.title}>{data.memberName}</div>
+                <Tooltip placement="top" title={data.memberName}><div className={styles.titleTop}>{data.memberName}</div></Tooltip>
             </div>
             <div className={styles.msgItemRow}><div className={styles.label}>联系人姓名：</div><div className={styles.title}>{data.contacts}</div></div>
             <div className={styles.msgItemRow}><div className={styles.label}>联系人手机：</div><div className={styles.title}>{data.tel.replace(/^(.{3})(.*)(.{4})$/, '$1 $2 $3')}</div></div>
-            <div className={styles.msgItemRow}><div className={styles.label}>电子邮箱：</div><div className={styles.title}>{data.mail}</div></div>
-            <div className={styles.msgItemRow}><div className={styles.label}>联系地址：</div>{<Tooltip placement="top" title={data.address}>
-                <div className={styles.title}>{data.address}</div>
-            </Tooltip>}</div>
+            <div className={styles.msgItemRow}><div className={styles.label}>电子邮箱：</div><Tooltip placement="top" title={data.mail}><div className={styles.title}>{data.mail}</div></Tooltip></div>
+            <div className={styles.msgItemRow}><div className={styles.label}>联系地址：</div><Tooltip placement="top" title={data.address}><div className={styles.title}>{data.address}</div></Tooltip></div>
             <div className={styles.msgItemRow}>
                 <div className={styles.label}>报名文件：</div>
                 <div className={styles.files}>

src/pages/purchaseAbility/components/detail/components/bidCommonLayout/resultItem/index.less

 .resultItem {
-  height: 131px;
+  min-height: 131px;
   background: #FAFBFC;
   padding: 12px 14px;
 
-  .resultItemWinBid{
+  .resultItemWinBid {
     position: absolute;
     width: 40px;
     right: 8px;
@@ -15,6 +15,7 @@
     margin-bottom: 6px;
     font-size: 12px;
     color: #909399;
+    word-break: break-all;
 
     .money {
       color: #303133;
@@ -36,27 +37,37 @@
       line-height: 24px;
       color: #909399;
       font-size: 12px;
-      margin-left: 4px;
+      margin-left: 8px;
       display: inline-block;
     }
 
     .title {
+      display: inline-block;
       font-size: 12px;
       color: #303133;
-      flex: 1;
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
       word-break: break-all;
+      max-width: calc(100% - 32px);
+    }
 
-      img {
-        margin-left: 4px;
-        width: 24px;
-      }
+    img {
+      margin-left: 8px;
+      width: 24px;
     }
 
     .label {
-      width: 40%;
+      // width: 40%;
+    }
+    .text {
+      flex: 1;
+      font-size: 12px;
+      color: #303133;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-break: break-all;
     }
   }
 

src/pages/purchaseAbility/components/detail/components/bidCommonLayout/resultItem/index.tsx

 import React from 'react';
-import { Divider, Button } from 'antd';
+import { Divider, Button, Tooltip } from 'antd';
+
+import { priceFormat } from '@/utils/numberFomat';
 
 import level1 from '@/asserts/icons/the_first.png';
 import level2 from '@/asserts/icons/the_second.png';
@@ -33,16 +35,17 @@ const ResultItem: React.FC<ResultItemPrpos> = (props: any) => {
     return (
         <div key={`msgItem_key_${itemIndex}`} className={styles.resultItem}>
             {detail.isAward != 0 ? <img src={winBig} alt="授标" className={styles.resultItemWinBid} /> : null}
-            <div className={styles.resultItemRow}>
-                <div className={styles.title}>{detail.memberName}{_returnBadge(detail?.purchaseRanking)}</div>
+            <div className={styles.resultItemRow} style={{alignItems: 'center'}}>
+                <Tooltip placement="top" title={detail.memberName}><div className={styles.title}>{detail.memberName}</div></Tooltip>
+                {_returnBadge(detail.purchaseRanking)}
             </div>
             <div className={styles.resultItemRow}>
-                <div className={styles.money}>¥{detail.price}<span>(含税)</span></div>
+                <div className={styles.money}>{detail.price ? `¥${priceFormat(detail.price)}` : '-'}<span>(含税)</span></div>
                 <Button type='link' onClick={() => { checkDetailFunc(detail.id) }}>查看报价明细</Button>
             </div>
             <Divider dashed style={{ color: '#EBECF0', margin: '6px 0' }} />
-            <div className={styles.resultItemRow}><div className={styles.label}>联系人姓名：</div><div className={styles.title}>{detail.contacts}</div></div>
-            <div className={styles.resultItemRow}><div className={styles.label}>联系人手机：</div><div className={styles.title}>{detail.tel.replace(/^(.{3})(.*)(.{4})$/, '$1 $2 $3')}</div></div>
+            <div className={styles.resultItemRow}><div className={styles.label}>联系人姓名：</div><div className={styles.text}>{detail.contacts}</div></div>
+            <div className={styles.resultItemRow}><div className={styles.label}>联系人手机：</div><div className={styles.text}>{detail.tel.replace(/^(.{3})(.*)(.{4})$/, '$1 $2 $3')}</div></div>
         </div>
     )
 }

src/pages/purchaseAbility/components/modalOperate/index.less

+.revise_style {
+    :global {
+      .ant-form-item-label {
+        label {
+          &::before {
+            margin-left: 1px;
+          }
+        }
+      }
+    }
+  }
+  
\ No newline at end of file

src/pages/purchaseAbility/components/modalOperate/index.tsx

@@ -7,6 +7,9 @@ import {
 } from '@formily/antd'
 import { Input, Radio, DatePicker, Checkbox  } from '@formily/antd-components'
 import moment from 'moment';
+
+import styles from './index.less';
+
 const actions = createFormActions()
 const { onFieldChange$ } = FormEffectHooks;
 
@@ -179,6 +182,7 @@ const ModalOperate: React.FC<IProps> = (props: any) => {
       afterClose={() => actions.reset()}
     >
       <SchemaForm
+        className={styles.revise_style}
         layout="vertical"
         labelCol={6}
         components={{