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

src/components/AnchorDrawer/index.less

@@ -51,6 +51,9 @@
         height: 48px;
         line-height: 48px;
         background: #FFFFFF;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         a {
           height: 24px;
           font-size: 12px;

src/components/AnchorDrawer/index.tsx

@@ -135,10 +135,10 @@ const AnchorDrawer: React.FC<AnchorProps> = ({
                   isForm
                   ?
                   dataIdList.map((item, index) => (
-                    <li key={index} onClick={() => handleClick(index)}><a className={current === index ? style.current : null}>{item['title']}</a></li>
+                    <li key={index} onClick={() => handleClick(index)} title={item['title']}><a className={current === index ? style.current : null}>{item['title']}</a></li>
                   )) :
                   dataRenderList.map((item, index) => (
-                    <li key={index} onClick={() => handleClick(index)}><a className={current === index ? style.current : null}>{item['title']}</a></li>
+                    <li key={index} onClick={() => handleClick(index)} title={item['title']}><a className={current === index ? style.current : null}>{item['title']}</a></li>
                   ))
                 }
               </ul>

src/constants/procurement.ts

+import { getIntl } from 'umi';
+
+const intl = getIntl();
+
 /**
  * ****采购能力 相关常量****
  */
@@ -11,14 +15,10 @@
 
 /**————招投标————*/
 
-import { getIntl, getLocale } from 'umi';
-
-const intl = getIntl(getLocale());
-
 /** 采购类型 */
 export const PURCHASE_TYPE = {
-  1: '有固定采购金额',
-  2: '无固定采购金额',
+  1: intl.formatMessage({ id: 'constants.purchase.type1' }, { default: '有固定采购金额' }),
+  2: intl.formatMessage({ id: 'constants.purchase.type2' }, { default: '无固定采购金额' }),
 }
 
 /** 招标方式 */
@@ -26,31 +26,31 @@ export const PUBLIC_BID = 1;
 export const SYSTEM_BID = 2;
 export const INVITE_BID = 3;
 export const CALLFORBID_TYPE_ENUM = {
-  [PUBLIC_BID]: '公开招标',
-  [SYSTEM_BID]: '系统匹配',
-  [INVITE_BID]: '邀请招标',
+  [PUBLIC_BID]: intl.formatMessage({ id: 'constants.purchase.callforbid.type1' }, { default: '公开招标' }),
+  [SYSTEM_BID]: intl.formatMessage({ id: 'constants.purchase.callforbid.type2' }, { default: '系统匹配' }),
+  [INVITE_BID]: intl.formatMessage({ id: 'constants.purchase.callforbid.type3' }, { default: '邀请招标' }),
 }
 export const CALLFORBID_TYPE = [
   '',
-  '公开招标',
-  '系统匹配',
-  '邀请招标',
+  intl.formatMessage({ id: 'constants.purchase.callforbid.type1' }, { default: '公开招标' }),
+  intl.formatMessage({ id: 'constants.purchase.callforbid.type2' }, { default: '系统匹配' }),
+  intl.formatMessage({ id: 'constants.purchase.callforbid.type3' }, { default: '邀请招标' }),
 ]
 
 /** 专业类别 */
 export const SpecialityTypeMap = {
-  1: '工程类',
-  2: '货物类',
-  3: '服务类',
-  4: '其他类',
+  1: intl.formatMessage({ id: 'constants.purchase.speciality.type1' }, { default: '工程类' }),
+  2: intl.formatMessage({ id: 'constants.purchase.speciality.type2' }, { default: '货物类' }),
+  3: intl.formatMessage({ id: 'constants.purchase.speciality.type3' }, { default: '服务类' }),
+  4: intl.formatMessage({ id: 'constants.purchase.speciality.type4' }, { default: '其他类' }),
 }
 
 /**  专家类型 */
 export const ExpertTypeMap = {
-  1: '招标人代表',
-  2: '技术类专家',
-  3: '特邀类专家',
-  4: '其他类专家',
+  1: intl.formatMessage({ id: 'constants.purchase.speciality.type1' }, { default: '招标人代表' }),
+  2: intl.formatMessage({ id: 'constants.purchase.speciality.type1' }, { default: '技术类专家' }),
+  3: intl.formatMessage({ id: 'constants.purchase.speciality.type1' }, { default: '特邀类专家' }),
+  4: intl.formatMessage({ id: 'constants.purchase.speciality.type1' }, { default: '其他类专家' }),
 }
 
 /** 招标 内部状态工作流状态 */

src/locales/en-US/purchase.ts

@@ -998,4 +998,18 @@ export default {
   'purchase.yaoqingzhaobiao': 'Invite bidding',
   'purchase.xuanzeyudangqianhuiyuanxia': 'Select members who are affiliated with the current member and whose role type is service provision members (suppliers), the bidding will only be sent to designated members',
   'purchase.zaixianpingbiaodafen': 'Online bid evaluation and scoring',
+
+  'constants.purchase.type1': 'There is a fixed purchase amount',
+  'constants.purchase.type2': 'No fixed purchase amount',
+  'constants.purchase.callforbid.type1': 'open tendering',
+  'constants.purchase.callforbid.type2': 'system matching',
+  'constants.purchase.callforbid.type3': 'invited tendering',
+  'constants.purchase.speciality.type1': 'engineering type',
+  'constants.purchase.speciality.type2': 'class of goods',
+  'constants.purchase.speciality.type3': 'service class',
+  'constants.purchase.speciality.type4': 'other categories',
+  'constants.purchase.expert.type1': 'Representative of the tenderee',
+  'constants.purchase.expert.type2': 'Technical expert',
+  'constants.purchase.expert.type3': 'Invited expert',
+  'constants.purchase.expert.type4': 'Other specialists',
 }

src/locales/en-US/system/processRuleSetting.ts

@@ -21,7 +21,7 @@ export default {
   'processRuleSetting.caozuo':'Operation',
   'processRuleSetting.shanchu':'Delete',
   'processRuleSetting.xiaoshi':'Hour',
-  'processRuleSetting.zhifupici:':'Payment batch:',
+  'processRuleSetting.zhifupici：':'Payment batch:',
   'processRuleSetting.xuanzeshangpin':'Select product',
   'processRuleSetting.chaxun':'Query',
   'processRuleSetting.qingxuanzepinpai':'Please select a brand',
@@ -86,4 +86,4 @@ export default {
   'processRuleSetting.bianjicaigouliu':'Edit procurement process rules',
   'processRuleSetting.xinzengcaigouliu':'New procurement process rules',
   'processRuleSetting.liuchengguizeID':'Process Rule ID',
-}
\ No newline at end of file
+}

src/locales/ko-KR/purchase.ts

@@ -998,4 +998,18 @@ export default {
   'purchase.yaoqingzhaobiao': '입찰 초대',
   'purchase.xuanzeyudangqianhuiyuanxia': '현재 회원과 제휴하고 역할 유형이 서비스 제공 회원(공급자)인 회원을 선택하면 지정된 회원에게만 입찰이 발송됩니다.',
   'purchase.zaixianpingbiaodafen': '온라인 입찰 평가 및 채점',
+
+  'constants.purchase.type1': '고정 구매 금액이 있다',
+  'constants.purchase.type2': '고정 구매 금액 없음',
+  'constants.purchase.callforbid.type1': '공개입찰',
+  'constants.purchase.callforbid.type2': '시스템 매칭',
+  'constants.purchase.callforbid.type3': '초청 입찰',
+  'constants.purchase.speciality.type1': '공학류',
+  'constants.purchase.speciality.type2': '화물류',
+  'constants.purchase.speciality.type3': '서비스류',
+  'constants.purchase.speciality.type4': '기타 종류',
+  'constants.purchase.expert.type1': '입찰자 대표',
+  'constants.purchase.expert.type2': '기술 분야의 전문가',
+  'constants.purchase.expert.type3': '특별히 초청된 전문가',
+  'constants.purchase.expert.type4': '기타 분야의 전문가',
 }

src/locales/zh-CN/purchase.ts

@@ -999,4 +999,18 @@ export default {
   'purchase.yaoqingzhaobiao': '邀请招标',
   'purchase.xuanzeyudangqianhuiyuanxia': '选择与当前会员下属关系的会员且角色类型为服务提供的会员（供应商），招标只发送给指定会员',
   'purchase.zaixianpingbiaodafen': '在线进行评标打分',
+
+  'constants.purchase.type1': '有固定采购金额',
+  'constants.purchase.type2': '无固定采购金额',
+  'constants.purchase.callforbid.type1': '公开招标',
+  'constants.purchase.callforbid.type2': '系统匹配',
+  'constants.purchase.callforbid.type3': '邀请招标',
+  'constants.purchase.speciality.type1': '工程类',
+  'constants.purchase.speciality.type2': '货物类',
+  'constants.purchase.speciality.type3': '服务类',
+  'constants.purchase.speciality.type4': '其他类',
+  'constants.purchase.expert.type1': '招标人代表',
+  'constants.purchase.expert.type2': '技术类专家',
+  'constants.purchase.expert.type3': '特邀类专家',
+  'constants.purchase.expert.type4': '其他类专家',
 }

src/pages/payandSettle/capitalAccounts/accountLists/applyWithdraw.tsx

@@ -136,7 +136,7 @@ const AccountDetail: React.FC<{}> = () => {
           <Row gutter={100} style={{ marginRight: 0 }}>
             <Col
               // span={8}
-              xxl={8}
+              xxl={9}
               xl={12}
               lg={12}
             >
@@ -178,7 +178,7 @@ const AccountDetail: React.FC<{}> = () => {
             </Col>
             <Col
               // span={16}
-              xxl={16}
+              xxl={15}
               xl={12}
               lg={12}
             >
@@ -247,7 +247,7 @@ const AccountDetail: React.FC<{}> = () => {
           <Row gutter={100} style={{ marginRight: 0 }}>
             <Col
               // span={8}
-              xxl={8}
+              xxl={9}
               xl={12}
               lg={12}
             >
@@ -269,7 +269,7 @@ const AccountDetail: React.FC<{}> = () => {
             </Col>
             <Col
               // span={16}
-              xxl={16}
+              xxl={15}
               xl={12}
               lg={12}
             >

src/pages/procurement/callForBids/readySendBidNotice/detail/index.tsx

@@ -154,9 +154,9 @@ const ReadySendBidNoticeDetail: React.FC = () => {
                             <h4>{item.memberName}</h4>
                             <Row>
                               <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.message25' })}:</p></Col>
-                              <Col><p className={style.amount}>¥{(item.amount).toFixed(2)}</p></Col>
+                              <Col><p className={style.amount}>{intl.formatMessage({ id: 'common.money' })}{(item.amount).toFixed(2)}</p></Col>
                             </Row>
-                            <img src={winBid} alt={intl.formatMessage({ id: 'table.purchase.yizhongbiao' })} />
+                            {/* <img src={winBid} alt={intl.formatMessage({ id: 'table.purchase.yizhongbiao' })} /> */}
                           </div>
                         </Col>) : null
                       }

src/pages/transaction/purchaserEvaluation/unevaluated/index.tsx

@@ -23,7 +23,7 @@ const Unevaluated: React.FC = () => {
 
   const defaultColumns: ColumnType<any>[] = [
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.dingdanhao'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanhao' }),
       dataIndex: 'orderNo',
       align: 'center',
       render: (text, record) => (
@@ -35,49 +35,49 @@ const Unevaluated: React.FC = () => {
       ),
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.dingdanzhaiyao'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanzhaiyao' }),
       dataIndex: 'digest',
       align: 'center',
       ellipsis: true,
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.gongyinghuiyuan'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.gongyinghuiyuan' }),
       dataIndex: 'memberName',
       align: 'center',
       render: (text, record) => <>{text}</>,
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.xiadanshijian'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.xiadanshijian' }),
       dataIndex: 'createTime',
       align: 'center',
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.dingdanzonge'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanzonge' }),
       dataIndex: 'totalAmount',
       align: 'center',
-      render: (text) => `¥${text}`,
+      render: (text) => `${intl.formatMessage({ id: 'common.money' })}${text}`,
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.dingdanleixing'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.dingdanleixing' }),
       dataIndex: 'orderTypeName',
       align: 'center',
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.waibuzhuangtai'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.waibuzhuangtai' }),
       dataIndex: 'outerStatusName',
       align: 'center',
       render: (text, record) => (
-        <StatusTag type="success" title={intl.formatMessage({id: 'purchaserEvaluation.yiwancheng'})} />
+        <StatusTag type="success" title={intl.formatMessage({ id: 'purchaserEvaluation.yiwancheng' })} />
       ),
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.neibuzhuangtai'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.neibuzhuangtai' }),
       dataIndex: 'innerStatusName',
       align: 'center',
-      render: (text, record) => <Badge color="#41CC9E" text={intl.formatMessage({id: 'purchaserEvaluation.yiwancheng'})} />,
+      render: (text, record) => <Badge color="#41CC9E" text={intl.formatMessage({ id: 'purchaserEvaluation.yiwancheng' })} />,
     },
     {
-      title: intl.formatMessage({id: 'purchaserEvaluation.caozuo'}),
+      title: intl.formatMessage({ id: 'purchaserEvaluation.caozuo' }),
       dataIndex: 'option',
       align: 'center',
       render: (text, record) => (
@@ -87,7 +87,7 @@ const Unevaluated: React.FC = () => {
               <Button
                 type="link"
               >
-                {intl.formatMessage({id: 'purchaserEvaluation.pingjia'})}
+                {intl.formatMessage({ id: 'purchaserEvaluation.pingjia' })}
               </Button>
             )}
           </Link>
@@ -99,7 +99,7 @@ const Unevaluated: React.FC = () => {
   const [columns, setColumns] = useState<any[]>(defaultColumns);
 
   const fetchListData = (params: any) => {
-    let { createTimeStart, createTimeEnd , ...rest } = params;
+    let { createTimeStart, createTimeEnd, ...rest } = params;
     createTimeStart = createTimeStart ? moment(+createTimeStart).format('YYYY-MM-DD HH:mm:ss') : undefined;
     createTimeEnd = createTimeEnd ? moment(+createTimeEnd).format('YYYY-MM-DD HH:mm:ss') : undefined;