Merge branch 'v2-220518' into 'v2-220518'

src/locales/en-US/contract.ts

@@ -480,5 +480,6 @@ export default {
   'contract.guanliandanju':'Associated document',
 
   'contract.createAudit': 'Contract creation audit',
+  'contract.contract.info':'Contract information',
 
 }

src/locales/ko-KR/contract.ts

@@ -479,4 +479,5 @@ export default {
   'contract.guanliandanju': '관련 문서',
 
   'contract.createAudit': '계약 생성 감사',
+  'contract.contract.info': '계약 정보',
 }

src/locales/zh-CN/contract.ts

@@ -481,5 +481,7 @@ export default {
   'contract.guanliandanju':'关联单据',
 
   'contract.createAudit':'合同创建审核',
+
+  'contract.contract.info':'合同信息',
   
 }

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

@@ -54,13 +54,6 @@ const contractexecutionList = () => {
     dataIndex: 'totalAmount',
     align: 'left',
     sorter: (a, b) => a.totalAmount - b.totalAmount,
-    render: (text) => {
-      return (
-        <div>
-          <p>{intl.formatMessage({ id: 'common.money' })}{text}</p>
-        </div>
-      )
-    }
   },
   {
     title: intl.formatMessage({ id: 'contract.yizhixingjine' }),

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

@@ -60,7 +60,7 @@ const Details = (props: any) => {
   const [basics, setbasics] = useState({})
   const [contractAbstract, setcontractAbstract] = useState();
   const [tabPane] = useState([
-    { id: 'process', title: intl.formatMessage({ id: 'contract.jibenliucheng' }) },
+    { id: 'process', title: intl.formatMessage({ id: 'contract.rules.header.info' }) },
     { id: 'associated', title: intl.formatMessage({ id: 'contract.associateInformation' }) },
     { id: 'conditions', title: intl.formatMessage({ id: 'contract.fukuanjihua' }) },
     { id: 'docking', title: intl.formatMessage({ id: 'contract.zhixingqingkuang' }) },
@@ -182,7 +182,7 @@ const Details = (props: any) => {
           ],
           col2:[
             { label: intl.formatMessage({ id: 'contract.currency' }), extra: basics.currencyTypeName ? basics.currencyTypeName : '', },
-            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: basics.totalAmount ? `${basics.totalAmount}` : '' },
           ]
         }
 

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

@@ -61,10 +61,6 @@ const coordinationList = () => {
     title: intl.formatMessage({ id: 'contract.hetongzongjine' }),
     dataIndex: 'totalAmount',
     align: 'left',
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -73,7 +73,8 @@ const purchaseList: React.FC<Iprops> = ({
         render: (text) => {
           return (
             <div>
-              {intl.formatMessage({ id: 'common.money' })}{text}
+              {/* {intl.formatMessage({ id: 'common.money' })} */}
+              {text}
             </div>
           )
         }
@@ -92,13 +93,14 @@ const purchaseList: React.FC<Iprops> = ({
         title: (
           <Space direction='vertical'>
             <Text>{intl.formatMessage({id: 'contract.hetongjinehanshui'})}</Text>
-            <Text>{intl.formatMessage({id: 'contract.heji'})}: {intl.formatMessage({ id: 'common.money' })}{Numberamount}</Text>
+            <Text>{intl.formatMessage({id: 'contract.heji'})}: {Numberamount}</Text>
           </Space>
         ),
         render: (text) => {
           return (
             <div>
-              {intl.formatMessage({ id: 'common.money' })}{text}
+              {/* {intl.formatMessage({ id: 'common.money' })} */}
+              {text}
             </div>
           )
         }

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

@@ -108,7 +108,7 @@ const Details = (props: any) => {
           ],
           col2:[
             { label: intl.formatMessage({ id: 'contract.currency' }), extra: basics.currencyTypeName ? basics.currencyTypeName : '', },
-            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: basics.totalAmount ? `${basics.totalAmount}` : '' },
           ]
         }
 
@@ -168,7 +168,7 @@ const Details = (props: any) => {
     let tab = []
     if (type == 'implement') {
       tab.push(
-        { id: 'process', title: intl.formatMessage({ id: 'contract.jibenliucheng' }) },
+        { id: 'process', title: intl.formatMessage({ id: 'contract.rules.header.info' }) },
         { id: 'associated', title: intl.formatMessage({ id: 'contract.associateInformation' }) },
         { id: 'docking', title: intl.formatMessage({ id: 'contract.zhixingqingkuang' }) },
         { id: 'conditions', title: intl.formatMessage({ id: 'contract.fukuantongji' }) },
@@ -176,10 +176,10 @@ const Details = (props: any) => {
     } else {
       tab.push(
         { id: 'progress', title: intl.formatMessage({ id: 'contract.liuzhuanjindu' }) },
+        { id: 'process', title: intl.formatMessage({ id: 'contract.rules.header.info' }) },
         { id: 'associated', title: intl.formatMessage({ id: 'contract.associateInformation' }) },
-        { id: 'process', title: intl.formatMessage({ id: 'contract.jibenliucheng' }) },
         { id: 'materials', title: intl.formatMessage({ id: 'contract.caigoucailiao' }) },
-        { id: 'docking', title: intl.formatMessage({ id: 'contract.dianzihetong' }) },
+        { id: 'docking', title: intl.formatMessage({ id: 'contract.contract.info' }) },
         { id: 'record', title: intl.formatMessage({ id: 'contract.liuzhuanjilu' }) },
       )
     }
@@ -478,7 +478,7 @@ const Details = (props: any) => {
             <div className='ant-card-head'>
               <div className='ant-card-head-wrapper'>
                 <div className='ant-card-head-wrapper'>
-                  {contractText.isUseElectronicContract != 1 ? intl.formatMessage({ id: 'contract.zhizhihetong' }) : intl.formatMessage({ id: 'contract.dianzihetong' })}
+                  {intl.formatMessage({ id: 'contract.contract.info' })}
                 </div>
               </div>
             </div>

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

@@ -62,10 +62,6 @@ const Sign = () => {
     title: intl.formatMessage({ id: 'contract.hetongzongjine' }),
     dataIndex: 'totalAmount',
     align: 'left',
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.yizhixingjine' }),

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

@@ -65,10 +65,6 @@ const pageToBeExamineOne = () => {
     title: intl.formatMessage({ id: 'contract.hetongzongjine' }),
     dataIndex: 'totalAmount',
     align: 'left',
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -63,10 +63,6 @@ const pageToBeExamineTwo = () => {
     title: intl.formatMessage({ id: 'contract.hetongzongjine' }),
     dataIndex: 'totalAmount',
     align: 'left',
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -67,10 +67,6 @@ const pageToBeSubmitExamine = () => {
     title: intl.formatMessage({ id: 'contract.hetongzongjine' }),
     dataIndex: 'totalAmount',
     align: 'left',
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -70,10 +70,6 @@ const Sign = () => {
     title: intl.formatMessage({ id: 'contract.hetongzongjine' }),
     dataIndex: 'totalAmount',
     align: 'left',
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -69,10 +69,11 @@ const QueryList = () => {
       compare: (a, b) => a.totalAmount - b.totalAmount,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
+    render: (text) =>text
+      // <div>
+      //   <p>{intl.formatMessage({ id: 'common.money' })} 
+      //   {text}</p>
+      // </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

src/pages/contract/manage/add/Table.tsx

@@ -165,15 +165,11 @@ export const goodcolumns: any = [
   { title: intl.formatMessage({ id: 'contract.guigexinghao' }), dataIndex: 'type', align: 'left', },
   {
     title: intl.formatMessage({ id: 'contract.pinlei' }), dataIndex: 'type', align: 'left',
-    render: (text, item) => (
-      <p>{item.customerCategory.name}</p>
-    )
+    render: (text, item) => item.customerCategory?.name || ''
   },
   {
     title: intl.formatMessage({ id: 'contract.pinpai' }), dataIndex: 'type', key: 'name', align: 'left',
-    render: (text, item) => (
-      <p>{item.brand != null ? item.brand.name : ''}</p>
-    )
+    render: (text, item) =>  item.brand?.name || ''
   },
   { title: intl.formatMessage({ id: 'contract.danwei' }), dataIndex: 'unitName', align: 'left', },
 ]

src/pages/contract/manage/add/addList.tsx

@@ -70,10 +70,7 @@ const addList = () => {
       compare: (a, b) => a.totalAmount - b.totalAmount,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
+  
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -417,7 +417,7 @@ const FormList = (props: any) => {
         dataIndex: 'bidAmount',
         key: 'bidAmount',
         align: 'center',
-        render: (text: any, record: any) => <Text>{intl.formatMessage({ id: 'commodity.products.directChannel.columns.currency' })}{record.bidAmount ? Number(record.bidAmount).toFixed(2) : '0.00'}</Text>
+        render: (text: any, record: any) => <Text>{record.bidAmount ? Number(record.bidAmount).toFixed(2) : '0.00'}</Text>
       },
       
 
@@ -571,7 +571,6 @@ const FormList = (props: any) => {
     console.log(expandedKeys)
   };
 
-
   return (
     <div className={styles.box}>
       {
@@ -580,6 +579,7 @@ const FormList = (props: any) => {
         </div>
       }
       <Table
+        scroll={{ x: '100%' }}
         columns={columnsTab}
         rowKey="rowId"
         dataSource={dataList}

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

@@ -71,10 +71,7 @@ const Levelexamine = () => {
       compare: (a, b) => a.totalAmount - b.totalAmount,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
+
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -74,11 +74,11 @@ const Details = (props: any) => {
   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: 'process', title: intl.formatMessage({ id: 'contract.rules.header.info' }) },
     { id: 'associated', title: intl.formatMessage({ id: 'contract.associateInformation' }) },
     { 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: 'docking', title: intl.formatMessage({ id: 'contract.contract.info' }) },
     { id: 'record', title: intl.formatMessage({ id: 'contract.liuzhuanjilu' }) },
   ])
 
@@ -119,7 +119,7 @@ const Details = (props: any) => {
           ],
           col2:[
             { label: intl.formatMessage({ id: 'contract.currency' }), extra: basics.currencyTypeName ? basics.currencyTypeName : '', },
-            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: basics.totalAmount ? `${intl.formatMessage({ id: 'common.money' })}${basics.totalAmount}` : '' },
+            { label: intl.formatMessage({ id: 'contract.contractAmount' }), extra: basics.totalAmount ? `${basics.totalAmount}` : '' },
           ]
         }
         // console.log(basics, basics.sourceType, basics.sourceId, basics.turn)
@@ -213,7 +213,8 @@ const Details = (props: any) => {
       render: (text) => {
         return (
           <div>
-            {intl.formatMessage({ id: 'common.money' })}{text}
+            {/* {intl.formatMessage({ id: 'common.money' })} */}
+            {text}
           </div>
         )
       }
@@ -242,13 +243,14 @@ const Details = (props: any) => {
       title: (
         <Space direction='vertical'>
           <Text>{intl.formatMessage({ id: 'contract.hetongjinehanshui' })}</Text>
-          <Text>{intl.formatMessage({ id: 'contract.heji' })}:{intl.formatMessage({ id: 'common.money' })}{bidAmount}</Text>
+          <Text>{intl.formatMessage({ id: 'contract.heji' })}:{bidAmount}</Text>
         </Space>
       ),
       render: (text) => {
         return (
           <div>
-            {intl.formatMessage({ id: 'common.money' })}{text}
+            {/* {intl.formatMessage({ id: 'common.money' })} */}
+            {text}
           </div>
         )
       }
@@ -509,7 +511,7 @@ const Details = (props: any) => {
           <div className='ant-card-head'>
             <div className='ant-card-head-wrapper'>
               <div className='ant-card-head-wrapper'>
-                {contractText.isUseElectronicContract ? intl.formatMessage({ id: 'contract.dianzihetong' }) : intl.formatMessage({ id: 'contract.zhizhihetong' })}
+                {intl.formatMessage({ id: 'contract.contract.info' }) }
               </div>
             </div>
           </div>

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

@@ -134,7 +134,7 @@ const FormList = (props: any) => {
       dataIndex: 'bidAmount',
       key: 'bidAmount',
       align: 'center',
-      render: (text: any, record: any) => <Text>{intl.formatMessage({ id: 'common.money' })}{Number(record.bidAmount).toFixed(2)}</Text>
+      render: (text: any, record: any) => <Text>{Number(record.bidAmount).toFixed(2)}</Text>
     },
   ];
   useEffect(() => {

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

@@ -75,10 +75,7 @@ const Examine = () => {
       compare: (a, b) => a.totalAmount - b.totalAmount,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
+
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -69,10 +69,7 @@ const Levelexamine = () => {
       compare: (a, b) => a.totalAmount - b.totalAmount,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
+
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -67,10 +67,6 @@ const Secondaryexamine = () => {
       compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),

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

@@ -65,10 +65,6 @@ const Signacontract = () => {
       compare: (a, b) => a.demandPublishTime - b.demandPublishTime,
       multiple: 1,
     },
-    render: (text) =>
-      <div>
-        <p>{intl.formatMessage({ id: 'common.money' })} {text}</p>
-      </div>
   },
   {
     title: intl.formatMessage({ id: 'contract.duiyingdanjuxunyuanlei' }),