fix: 修复合同翻译问题BUG

src/locales/en-US/contract.ts

@@ -258,9 +258,9 @@ export default {
   'contract.hetongfukuanxiangqing':'Contract payment details',
   'contract.shoukuanzhanghu':'Receiving account',
   'contract.fapiaobianhaokaipiaori':'Invoice number (invoicing date)',
-  'contract.zhangqi':'Account period',
-  'contract.yuejie':'Monthly End',
-  'contract.xianjie':'Currently closed',
+  'contract.zhangqi':'account',
+  'contract.yuejie':'monthly',
+  'contract.xianjie':'now',
   'contract.wuliaobianhaomingcheng':'material number/name',
   'contract.danwei':'Unit',
   'contract.caigoushuliang':'Purchase Quantity',

src/pages/contract/components/detailCard/PaymentCard/index.tsx

@@ -60,7 +60,7 @@ const PaymentCard: React.FC<Iprops> = ({
                     <div className={style.title}>{intl.formatMessage({id: 'contract.fukuanbili'})}</div>
                     <div className={style.proportion}>{item.payRatio ? item.payRatio : item.paidRatio}%</div>
                     <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
-                      <div className={style.Price}>¥{item.payAmount}</div>
+                      <div className={style.Price}>{intl.formatMessage({id: 'common.money'})}{item.payAmount}</div>
                       {
                         children ?
                           <div onClick={() => key(item)}> {children} </div>

src/pages/contract/contractexecution/details/index.tsx

@@ -120,7 +120,7 @@ const Details = (props: any) => {
           ],
           col3: [
             { label: intl.formatMessage({id: 'contract.hetongjine'}), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
-            { label: intl.formatMessage({id: 'contract.hetongyouxiaoqi'}), extra: `${basics.startTime}至${basics.endTime}` },
+            { label: intl.formatMessage({id: 'contract.hetongyouxiaoqi'}), extra: `${basics.startTime}${intl.formatMessage({id: 'common.text.to'})}${basics.endTime}` },
           ],
         }
         if (basics.sourceId) {

src/pages/contract/coordination/details/components/Popup.tsx

@@ -164,7 +164,7 @@ const PopupDrawer: React.FC<Iprops> = ({
         <div className={style.memuItem}>
           <div className={style.menuCard}>
             <div className={style.menulabel}>{intl.formatMessage({ id: 'contract.fukuanjine' })}：</div>
-            <div className={style.card}>¥ {basicData.payAmount}</div>
+            <div className={style.card}>{intl.formatMessage({id: 'common.money'})} {basicData.payAmount}</div>
           </div>
           <div className={style.menuCard}>
             <div className={style.menulabel}>{intl.formatMessage({ id: 'contract.fukuanshijian' })}：</div>

src/pages/contract/coordination/details/index.tsx

@@ -83,7 +83,7 @@ const Details = (props: any) => {
 
           ],
           col3: [
-            { label: intl.formatMessage({ id: 'contract.hetongyouxiaoqi' }), extra: `${basics.startTime}至${basics.endTime}` },
+            { label: intl.formatMessage({ id: 'contract.hetongyouxiaoqi' }), extra: `${basics.startTime}${intl.formatMessage({id: 'common.text.to'})}${basics.endTime}` },
           ],
         }
         if (type) {

src/pages/contract/funds/addbill/components/table.tsx

@@ -126,7 +126,7 @@ const table = (props: any) => {
 
       render: (_, item, index) =>
         <Input
-          addonBefore="¥"
+          addonBefore={intl.formatMessage({id: 'common.money'})}
           style={{
             width: 130,
           }}

src/pages/contract/manage/add/components/FormList.tsx

@@ -255,7 +255,7 @@ const FormList = (props: any) => {
                 width: 120,
               }}
               onChange={(e) => setInput(e, 'price', index)}
-              addonBefore="¥"
+              addonBefore={intl.formatMessage({ id: 'common.money' })}
               defaultValue={text != '' ? Number(text).toFixed(2) : ''}
               disabled={Object.keys(Row).length != 0 ? true : false}
             />

src/pages/contract/manage/add/components/Fromtable.tsx

@@ -113,8 +113,8 @@ const FormList = (props: any) => {
             defaultValue={item.payWay}
           >
             <Option value="3" key={3}>{intl.formatMessage({ id: 'contract.xianjie' })}</Option>
-            <Option value="1" key={1}>{intl.formatMessage({ id: 'contract.zhangqi' })}：</Option>
-            <Option value="2" key={2}>{intl.formatMessage({ id: 'contract.yuejie' })}：</Option>
+            <Option value="1" key={1}>{intl.formatMessage({ id: 'contract.zhangqi' })}</Option>
+            <Option value="2" key={2}>{intl.formatMessage({ id: 'contract.yuejie' })}</Option>
           </Select>
           {
             item.payWay != 3 &&

src/pages/contract/manage/details/index.tsx

@@ -61,14 +61,14 @@ const Details = (props: any) => {
   /* 总金额 */
   const [tobidCount, settobidCount] = useState<number>(0);
   const [bidAmount, setbidAmount] = useState<number>(0);
-  const [btnText, setBtnText] = useState(intl.formatMessage({id: 'contract.shenhe'}));
+  const [btnText, setBtnText] = useState(intl.formatMessage({ id: 'contract.shenhe' }));
   const [tabPane] = useState([
-    { id: 'progress', title: intl.formatMessage({id: 'contract.liuzhuanjindu'}) },
-    { id: 'process', title: intl.formatMessage({id: 'contract.jibenliucheng'}) },
-    { id: 'materials', title: intl.formatMessage({id: 'contract.caigoucailiao'}) },
-    { id: 'conditions', title: intl.formatMessage({id: 'contract.fukuanjihua'}) },
-    { id: 'docking', title: intl.formatMessage({id: 'contract.dianzihetong'}) },
-    { id: 'record', title: intl.formatMessage({id: 'contract.liuzhuanjilu'}) },
+    { id: 'progress', title: intl.formatMessage({ id: 'contract.liuzhuanjindu' }) },
+    { id: 'process', title: intl.formatMessage({ id: 'contract.jibenliucheng' }) },
+    { id: 'materials', title: intl.formatMessage({ id: 'contract.caigoucailiao' }) },
+    { id: 'conditions', title: intl.formatMessage({ id: 'contract.fukuanjihua' }) },
+    { id: 'docking', title: intl.formatMessage({ id: 'contract.dianzihetong' }) },
+    { id: 'record', title: intl.formatMessage({ id: 'contract.liuzhuanjilu' }) },
   ])
 
   /* 获取详情的数据 */
@@ -80,19 +80,19 @@ const Details = (props: any) => {
         setsignatureLogId(basics.signatureLogId ? basics.signatureLogId : '')
         const basicInfo: any = {
           col1: [
-            { label: intl.formatMessage({id: 'contract.hetongbianhao'}), extra: basics.contractNo ? basics.contractNo : '' },
-            { label: intl.formatMessage({id: 'contract.hetongzhaiyao'}), extra: basics.contractAbstract ? basics.contractAbstract : '' },
-            { label: intl.formatMessage({id: 'contract.waibuzhuangtai'}), extra: basics.outerStatusName ? basics.outerStatusName : '', type: "StatusTag" },
-            { label: intl.formatMessage({id: 'contract.neibuzhuangtai'}), extra: basics.innerStatusName ? basics.innerStatusName : '' },
+            { label: intl.formatMessage({ id: 'contract.hetongbianhao' }), extra: basics.contractNo ? basics.contractNo : '' },
+            { label: intl.formatMessage({ id: 'contract.hetongzhaiyao' }), extra: basics.contractAbstract ? basics.contractAbstract : '' },
+            { label: intl.formatMessage({ id: 'contract.waibuzhuangtai' }), extra: basics.outerStatusName ? basics.outerStatusName : '', type: "StatusTag" },
+            { label: intl.formatMessage({ id: 'contract.neibuzhuangtai' }), extra: basics.innerStatusName ? basics.innerStatusName : '' },
           ],
           col2: [
-            { label: intl.formatMessage({id: 'contract.xunyuanleixing'}), extra: basics.sourceTypeName ? basics.sourceTypeName : '' },
-            { label: intl.formatMessage({id: 'contract.duiyingdanju'}), extra: basics.sourceNo ? basics.sourceNo : '', },
-            { label: intl.formatMessage({id: 'contract.shoubiaohuiyuan'}), extra: basics.partyBName ? basics.partyBName : '' },
-            { label: intl.formatMessage({id: 'contract.shoubiaojine'}), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.xunyuanleixing' }), extra: basics.sourceTypeName ? basics.sourceTypeName : '' },
+            { label: intl.formatMessage({ id: 'contract.duiyingdanju' }), extra: basics.sourceNo ? basics.sourceNo : '', },
+            { label: intl.formatMessage({ id: 'contract.shoubiaohuiyuan' }), extra: basics.partyBName ? basics.partyBName : '' },
+            { label: intl.formatMessage({ id: 'contract.shoubiaojine' }), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
           ],
           col3: [
-            { label: intl.formatMessage({id: 'contract.hetongyouxiaoqi'}), extra: `${basics.startTime}至${basics.endTime}` },
+            { label: intl.formatMessage({ id: 'contract.hetongyouxiaoqi' }), extra: `${basics.startTime}${intl.formatMessage({ id: 'common.text.to' })}${basics.endTime}` },
           ],
         }
 
@@ -148,7 +148,7 @@ const Details = (props: any) => {
   /*查询合同详情-分页查询合同采购物料*/
   const columns: any = [
     {
-      title: intl.formatMessage({id: 'contract.wuliaobianhaomingcheng'}), dataIndex: 'materielNo', align: 'center', render: (text, item) => {
+      title: intl.formatMessage({ id: 'contract.wuliaobianhaomingcheng' }), dataIndex: 'materielNo', align: 'center', render: (text, item) => {
         return (
           <div>
             <p> {text}</p>
@@ -158,14 +158,14 @@ const Details = (props: any) => {
 
       }
     },
-    { title: intl.formatMessage({id: 'contract.guigexinghao'}), dataIndex: 'type', align: 'center', },
-    { title: intl.formatMessage({id: 'contract.pinlei'}), dataIndex: 'category', align: 'center', },
-    { title: intl.formatMessage({id: 'contract.pinpai'}), dataIndex: 'brand', align: 'center', },
-    { title: intl.formatMessage({id: 'contract.danwei'}), dataIndex: 'unit', align: 'center', },
-    { title: intl.formatMessage({id: 'contract.caigoushuliang'}), dataIndex: 'purchaseCount', align: 'center', },
-    { title: intl.formatMessage({id: 'contract.hanshui'}), dataIndex: 'isHasTaxName', align: 'center', },
+    { title: intl.formatMessage({ id: 'contract.guigexinghao' }), dataIndex: 'type', align: 'center', },
+    { title: intl.formatMessage({ id: 'contract.pinlei' }), dataIndex: 'category', align: 'center', },
+    { title: intl.formatMessage({ id: 'contract.pinpai' }), dataIndex: 'brand', align: 'center', },
+    { title: intl.formatMessage({ id: 'contract.danwei' }), dataIndex: 'unit', align: 'center', },
+    { title: intl.formatMessage({ id: 'contract.caigoushuliang' }), dataIndex: 'purchaseCount', align: 'center', },
+    { title: intl.formatMessage({ id: 'contract.hanshui' }), dataIndex: 'isHasTaxName', align: 'center', },
     {
-      title: intl.formatMessage({id: 'contract.shuil'}), dataIndex: 'taxRate', align: 'center',
+      title: intl.formatMessage({ id: 'contract.shuil' }), dataIndex: 'taxRate', align: 'center',
       render: (text) => {
         return (
           <div>
@@ -175,7 +175,7 @@ const Details = (props: any) => {
       }
     },
     {
-      title: intl.formatMessage({id: 'contract.danjiahanshui'}), dataIndex: 'price', align: 'center',
+      title: intl.formatMessage({ id: 'contract.danjiahanshui' }), dataIndex: 'price', align: 'center',
       render: (text) => {
         return (
           <div>
@@ -189,8 +189,8 @@ const Details = (props: any) => {
       title: (item) => {
         return (
           <Space direction='vertical'>
-             <Text>{intl.formatMessage({id: 'contract.shoubiaoshuliang'})}</Text>
-            <Text>合计: {tobidCount}</Text>
+            <Text>{intl.formatMessage({ id: 'contract.shoubiaoshuliang' })}</Text>
+            <Text>{intl.formatMessage({ id: 'contract.heji' })}: {tobidCount}</Text>
           </Space>
         )
       },
@@ -207,8 +207,8 @@ const Details = (props: any) => {
       dataIndex: 'bidAmount', align: 'center',
       title: (
         <Space direction='vertical'>
-          <Text>{intl.formatMessage({id: 'contract.jinebuhanshui'})}</Text>
-          <Text>合计:{intl.formatMessage({ id: 'common.money' })}{bidAmount}</Text>
+          <Text>{intl.formatMessage({ id: 'contract.jinebuhanshui' })}</Text>
+          <Text>{intl.formatMessage({ id: 'contract.heji' })}:{intl.formatMessage({ id: 'common.money' })}{bidAmount}</Text>
         </Space>
       ),
       render: (text) => {
@@ -243,7 +243,7 @@ const Details = (props: any) => {
   const onExpand = expandedKeys => {
   };
   useEffect(() => {
-    let text = type == 'Signacontract' ? intl.formatMessage({id: 'contract.qiandinghetong'}) : intl.formatMessage({id: 'contract.shenhe'});
+    let text = type == 'Signacontract' ? intl.formatMessage({ id: 'contract.qiandinghetong' }) : intl.formatMessage({ id: 'contract.shenhe' });
     setBtnText(text);
     setTargetOffset(window.innerHeight / 6);
     getDetail()
@@ -268,19 +268,19 @@ const Details = (props: any) => {
   const listItem = (record) => (
     <div className={style.listItem}>
       <div className={style.label}>
-        <p>{intl.formatMessage({id: 'contract.guanlian'})}</p>
-        <p>{intl.formatMessage({id: 'contract.baojiashangpin'})}</p>
+        <p>{intl.formatMessage({ id: 'contract.guanlian' })}</p>
+        <p>{intl.formatMessage({ id: 'contract.baojiashangpin' })}</p>
       </div>
       <div className={style.text}>
-        <p>{intl.formatMessage({id: 'contract.shangpinID'})}：{record.associatedDataId}</p>
-        <p className={style.nowrap}>{intl.formatMessage({id: 'contract.shangpinmingcheng'})}：{record.associatedGoods}</p>
+        <p>{intl.formatMessage({ id: 'contract.shangpinID' })}：{record.associatedDataId}</p>
+        <p className={style.nowrap}>{intl.formatMessage({ id: 'contract.shangpinmingcheng' })}：{record.associatedGoods}</p>
       </div>
       <div className={style.text}>
-        <p>{intl.formatMessage({id: 'contract.guigexinghao'})}：{record.associatedType}</p>
-        <p>{intl.formatMessage({id: 'contract.pinlei'})}：{record.associatedCategory}</p>
+        <p>{intl.formatMessage({ id: 'contract.guigexinghao' })}：{record.associatedType}</p>
+        <p>{intl.formatMessage({ id: 'contract.pinlei' })}：{record.associatedCategory}</p>
       </div>
       <div className={style.text}>
-        <p>{intl.formatMessage({id: 'contract.pinpai'})}：{record.associatedBrand}</p>
+        <p>{intl.formatMessage({ id: 'contract.pinpai' })}：{record.associatedBrand}</p>
       </div>
     </div>
 
@@ -373,12 +373,12 @@ const Details = (props: any) => {
           <div className='ant-card-head'>
             <div className='ant-card-head-wrapper'>
               <div className='ant-card-head-wrapper'>
-                {intl.formatMessage({id: 'contract.liuzhuanjindu'})}
+                {intl.formatMessage({ id: 'contract.liuzhuanjindu' })}
               </div>
               <div className='ant-card-extra'>
                 <Radio.Group defaultValue={currentBatch} onChange={(e) => handleBatchChange(e, 'Steps')}>
-                  <Radio.Button value="1">{intl.formatMessage({id: 'contract.waibuliuzhuan'})}</Radio.Button>
-                  <Radio.Button value="2">{intl.formatMessage({id: 'contract.neibuliuzhuan'})}</Radio.Button>
+                  <Radio.Button value="1">{intl.formatMessage({ id: 'contract.waibuliuzhuan' })}</Radio.Button>
+                  <Radio.Button value="2">{intl.formatMessage({ id: 'contract.neibuliuzhuan' })}</Radio.Button>
                 </Radio.Group>
               </div>
             </div>
@@ -404,7 +404,7 @@ const Details = (props: any) => {
           <div className='ant-card-head'>
             <div className='ant-card-head-wrapper'>
               <div className='ant-card-head-wrapper'>
-                {intl.formatMessage({id: 'contract.hetongcaigoucailiao'})}
+                {intl.formatMessage({ id: 'contract.hetongcaigoucailiao' })}
               </div>
             </div>
           </div>
@@ -432,14 +432,14 @@ const Details = (props: any) => {
           <div className='ant-card-head'>
             <div className='ant-card-head-wrapper'>
               <div className='ant-card-head-wrapper'>
-                {intl.formatMessage({id: 'contract.dianzihetong'})}
+                {intl.formatMessage({ id: 'contract.dianzihetong' })}
               </div>
             </div>
           </div>
           <div className='ant-card-body'>
             <div className={style.upload_item} style={{ width: 680 }}>
               <div className='ant-card-head-wrapper'>
-                {intl.formatMessage({id: 'contract.dianzihetong'})}
+                {intl.formatMessage({ id: 'contract.dianzihetong' })}
               </div>
               <div className={style.upload_left} onClick={() => onDownload(contractText)} style={{ width: 600, cursor: 'pointer' }}>
                 <FileWordFilled />
@@ -453,12 +453,12 @@ const Details = (props: any) => {
           <div className='ant-card-head'>
             <div className='ant-card-head-wrapper'>
               <div className='ant-card-head-wrapper'>
-                {intl.formatMessage({id: 'contract.liuzhuanjilu'})}
+                {intl.formatMessage({ id: 'contract.liuzhuanjilu' })}
               </div>
               <div className='ant-card-extra'>
                 <Radio.Group defaultValue={listIndex} onChange={(e) => handleBatchChange(e, 'list')}>
-                  <Radio.Button value="1">{intl.formatMessage({id: 'contract.waibuliuzhuan'})}</Radio.Button>
-                  <Radio.Button value="2">{intl.formatMessage({id: 'contract.neibuliuzhuan'})}</Radio.Button>
+                  <Radio.Button value="1">{intl.formatMessage({ id: 'contract.waibuliuzhuan' })}</Radio.Button>
+                  <Radio.Button value="2">{intl.formatMessage({ id: 'contract.neibuliuzhuan' })}</Radio.Button>
                 </Radio.Group>
               </div>
             </div>
@@ -473,8 +473,8 @@ const Details = (props: any) => {
         getfetchData={getfetchData}
         applyId={contractId}
         type={type}
-        agreeText={type == 'Signacontract' ? intl.formatMessage({id: 'contract.tongyiqianding'}) : intl.formatMessage({id: 'contract.tongguo'})}
-        disagree={type == 'Signacontract' ? intl.formatMessage({id: 'contract.butongyiqianding'}) : intl.formatMessage({id: 'contract.butongguo'})}
+        agreeText={type == 'Signacontract' ? intl.formatMessage({ id: 'contract.tongyiqianding' }) : intl.formatMessage({ id: 'contract.tongguo' })}
+        disagree={type == 'Signacontract' ? intl.formatMessage({ id: 'contract.butongyiqianding' }) : intl.formatMessage({ id: 'contract.butongguo' })}
       />
     </div>
   )

src/pages/contract/manage/editing/components/FormList.tsx

@@ -106,7 +106,7 @@ const FormList = (props: any) => {
               width: 120,
             }}
             onChange={(e) => setInput(e, 'price', index)}
-            addonBefore="¥"
+            addonBefore={intl.formatMessage({id: 'common.money'})}
             defaultValue={text}
             disabled
           />

src/pages/contract/manage/levelexamine/index.tsx

@@ -123,7 +123,7 @@ const Levelexamine = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/levelexamine/details?contractId=${record.id}&type=ManageExamineStepOne`)}>审核</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/levelexamine/details?contractId=${record.id}&type=ManageExamineStepOne`)}>{intl.formatMessage({id: 'contract.shenhe'})}</span>
         </div>
       )
     }

src/pages/contract/manage/secondaryexamine/index.tsx

@@ -139,7 +139,7 @@ const Secondaryexamine = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/secondaryexamine/details?contractId=${record.id}&type=PageToBeExamineStepTwo`)}>审核</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/secondaryexamine/details?contractId=${record.id}&type=PageToBeExamineStepTwo`)}>{intl.formatMessage({id: 'contract.shenhe'})}</span>
         </div>
       )
     }

src/pages/contract/manage/signacontract/index.tsx

@@ -138,7 +138,7 @@ const Signacontract = () => {
     render: (text, record) => {
       return (
         <div>
-          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/signacontract/details?contractId=${record.id}&type=Signacontract`)}>签订合同</span>
+          <span style={{ color: '#00B37A', cursor: 'pointer', marginRight: 10 }} onClick={() => history.push(`/memberCenter/contract/manage/signacontract/details?contractId=${record.id}&type=Signacontract`)}>{intl.formatMessage({id: 'contract.qiandinghetong'})}</span>
         </div>
       )
     }