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

src/locales/en-US/responseCode.ts

@@ -1137,6 +1137,7 @@ export default {
   "60026": "Quote deadline must be less than delivery date",
   "47016": "page type already exists",
   "49114": "Sorting cannot be repeated",
-  "49117": 'Sorting under the same recommendation label cannot be repeated'
+  "49117": 'Sorting under the same recommendation label cannot be repeated',
+  "21055": "The payment request amount of the document in the current payment request is greater than the remaining payment amount of the document",
 
 }

src/locales/ko-KR/responseCode.ts

@@ -1136,5 +1136,6 @@ export default {
   "60026": "견적 마감일은 배송 날짜보다 이전이어야 합니다.",
   "47016": "페이지 유형이 이미 존재합니다",
   "49114": "정렬은 중복될 수 없습니다.",
-  "49117": '같은 추천 탭 아래 정렬 중복 불가'
+  "49117": '같은 추천 탭 아래 정렬 중복 불가',
+  "21055": "현재 청구서에 증빙서류가 존재하는 청구금액은 증빙서류의 남은 지불금액보다 크다",
 }

src/locales/zh-CN/responseCode.ts

@@ -1138,4 +1138,5 @@ export default {
   "47016": "页面类型已存在",
   "49114": "排序不能重复",
   "49117": "同一推荐标签下排序不能重复",
+  "21055": "当前请款单中存在单据的请款金额大于单据剩余支付金额",
 }

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

@@ -64,7 +64,7 @@ const ReadyCheckedConfirmFirstDetail: React.FC = () => {
           anchorList={anchorTitleList}
           extraRight={
             <Button type='primary' onClick={onSubmit}>
-              审核定标
+              {intl.formatMessage({id: 'table.purchase.shenhedingbiao'})}
             </Button>
           }
         />

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

@@ -65,7 +65,7 @@ const ReadyCheckedConfirmSecondDetail: React.FC = () => {
           anchorList={anchorTitleList}
           extraRight={
             <Button type='primary' onClick={onSubmit}>
-              审核定标
+              {intl.formatMessage({id: 'table.purchase.shenhedingbiao'})}
             </Button>
           }
         />

src/pages/procurement/callForBids/readyConfirmBid/components/bidConfirm/index.tsx

@@ -209,7 +209,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                       <Row>
                         <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'detail.purchase.label34' })}:</p></Col>
                         <Col>
-                          <p>¥{ (tableDataSource.reduce((a, b) => a + b[item.dataIndex]['price'] * b.count, 0)).toFixed(2) }({intl.formatMessage({ id: 'detail.purchase.isTax' })})</p>
+                          <p>{intl.formatMessage({id:'common.money'})}{ (tableDataSource.reduce((a, b) => a + b[item.dataIndex]['price'] * b.count, 0)).toFixed(2) }({intl.formatMessage({ id: 'detail.purchase.isTax' })})</p>
                         </Col>
                       </Row>
                     </div>
@@ -243,7 +243,7 @@ const BidConfirm: React.FC<BidConfirmProps> = ({cardTitle}) => {
                     <div className={style['card-list']}>
                       <Row>
                         <Col span={8}><p className={style['card-list_title']}>{intl.formatMessage({ id: 'table.purchase.shoubiaozonge' })}:</p></Col>
-                        <Col><p>¥{(tableDataSource.reduce((a, b) => a + (b[item.dataIndex]['isAward'] ? (b[item.dataIndex]['price'] * b.count * b[item.dataIndex]['awardRate'] / 100) : 0), 0)).toFixed(2)}({intl.formatMessage({ id: 'detail.purchase.isTax' })})</p></Col>
+                        <Col><p>{intl.formatMessage({id:'common.money'})}{(tableDataSource.reduce((a, b) => a + (b[item.dataIndex]['isAward'] ? (b[item.dataIndex]['price'] * b.count * b[item.dataIndex]['awardRate'] / 100) : 0), 0)).toFixed(2)}({intl.formatMessage({ id: 'detail.purchase.isTax' })})</p></Col>
                       </Row>
                     </div>
                     </div>

src/pages/procurement/callForBids/secondCheckedBid/model/useSelfTable.tsx

@@ -23,7 +23,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'ctl',
       key: 'ctl',
-      render: (text, record) => <Button type='link' onClick={() => handleSubmit(record)}>审核</Button>
+      render: (text, record) => <Button type='link' onClick={() => handleSubmit(record)}>{intl.formatMessage({ id: 'table.purchase.shenhe', defaultMessage: '审核' })}</Button>
     }
   ])