Merge branch 'v2-220418' into 'v2-220418'

src/locales/zh-CN/purchase.ts

@@ -97,7 +97,7 @@ export default {
   'table.purchase.popconfirm2': '确定要删除吗？',
   'table.purchase.popconfirm3': '确定要提交报价单吗？',
   'table.purchase.popconfirm4': '确定要审核吗？',
-  'table.purchase.submitBatch': '批量提交审核',
+  'table.purchase.submitBatch': '批量审核通过',
   'table.purchase.submitBatch1': '批量提交',
   'table.purchase.deleteBatch': '批量删除',
   'table.purchase.offerSubmit': '提交报价单',

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

@@ -18,7 +18,7 @@ const OtherLayout: React.FC<OtherInfoProps> = (props: any) => {
   return (
     <Card
       id='otherLayout'
-      title={intl.formatMessage({ id: 'detail.purchase.otherRequire' })}
+      title={intl.formatMessage({ id: 'detail.purchase.offerExplain' })} 
     >
       <Row gutter={[8, 8]}>
         {effect.length > count && effect.map((item, index) => (

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

+.stepCss{
+    :global{
+        .ant-steps-item-content{
+            width: 200px;
+        }
+    }
+}
\ No newline at end of file

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

@@ -72,6 +72,7 @@ const ProgressLayout: React.FC<ProgressProps> = (props: any) => {
                 key={item.state}
                 title={item.operationalProcess}
                 description={item.roleName}
+                className={style.stepCss}
                 status={item.isExecute ? 'finish' : 'wait'}
               />
             )) :

src/pages/transaction/purchaseAbility/offter/detail/index.tsx

@@ -27,7 +27,7 @@ const TABLINK1 = [
   { id: 'progressLayout', title: intl.formatMessage({ id: 'detail.purchase.progressLayout' }) },
   { id: 'basicLayout', title: intl.formatMessage({ id: 'detail.purchase.basicLayout' }) },
   { id: 'contrastLyout', title: intl.formatMessage({ id: 'detail.purchase.offerLayout' }) },
-  { id: 'otherLyout', title: intl.formatMessage({ id: 'detail.purchase.otherRequire' }) },
+  { id: 'otherLyout', title: intl.formatMessage({ id: 'detail.purchase.offerExplain' }) },
   { id: 'recordLyout', title: intl.formatMessage({ id: 'detail.purchase.recordLyout' }) },
 ]
 
@@ -37,7 +37,7 @@ const TABLINK2 = {
     { id: 'basicLayout', title: intl.formatMessage({ id: 'detail.purchase.basicLayout' }) },
     { id: 'bidLayout', title: intl.formatMessage({ id: 'detail.purchase.bidLayout' }) },
     { id: 'bidInfoLayout', title: intl.formatMessage({ id: 'detail.purchase.offerLayout' }) },
-    { id: 'otherLyout', title: intl.formatMessage({ id: 'detail.purchase.otherRequire' }) },
+    { id: 'otherLyout', title: intl.formatMessage({ id: 'detail.purchase.offerExplain' }) },
     { id: 'recordLyout', title: intl.formatMessage({ id: 'detail.purchase.recordLyout' }) },
   ],
   1: [
@@ -46,7 +46,7 @@ const TABLINK2 = {
     { id: 'bidLayout', title: intl.formatMessage({ id: 'detail.purchase.bidLayout1' }) },
     { id: 'bidResultLayout', title: intl.formatMessage({ id: 'detail.purchase.bidLayout' }) },
     { id: 'bidInfoLayout', title: intl.formatMessage({ id: 'detail.purchase.offerLayout' }) },
-    { id: 'otherLyout', title: intl.formatMessage({ id: 'detail.purchase.otherRequire' }) },
+    { id: 'otherLyout', title: intl.formatMessage({ id: 'detail.purchase.offerExplain' }) },
     { id: 'recordLyout', title: intl.formatMessage({ id: 'detail.purchase.recordLyout' }) },
   ]
 }
@@ -114,7 +114,7 @@ const QuoteDetails = () => {
         col: [
           { label: intl.formatMessage({ id: 'detail.purchase.logistics' }), extra: data.logistics },
           { label: intl.formatMessage({ id: 'detail.purchase.packRequire' }), extra: data.packRequire },
-          { label: intl.formatMessage({ id: 'detail.purchase.otherRequire' }), extra: data.otherRequire },
+          { label: intl.formatMessage({ id: 'detail.purchase.offerExplain' }), extra: data.otherRequire },
         ]
       },
       {