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

src/global/styles/reset.less

@@ -324,6 +324,10 @@
   display: none;
 }
 
+.ant-btn-link {
+  white-space: normal !important;
+}
+
 
 /* 处理某些电脑显示与缩放比推荐>100%的影响 */
 @media all

src/pages/afterService/components/ReturnDetailInfo/index.tsx

@@ -203,11 +203,11 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
           descriptions={[
             {
               title: `${intl.formatMessage({ id: 'afterService.common.productColumns.payAmount2' }, { default: '已支付金额' })}:`,
-              value: `¥${text}`,
+              value: `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })}${text}`,
             },
             {
               title: `${intl.formatMessage({ id: 'afterService.common.productColumns.purchaseAmount' }, { default: '采购金额' })}:`,
-              value: `¥${record.purchaseAmount}`,
+              value: `${intl.formatMessage({ id: 'common.money' }, { default: '¥' })}${record.purchaseAmount}`,
             },
           ]}
           percent={(text / record.purchaseAmount) * 100}

src/pages/afterService/components/ReturnInfoDrawer/schema/index.ts

@@ -131,8 +131,8 @@ const schema: ISchema = {
                   MEGA_LAYOUT_2: {
                     'x-component': 'Mega-Layout',
                     'x-component-props': {
-                      labelCol: 6,
-                      wrapperCol: 14, 
+                      // labelCol: 6,
+                      // wrapperCol: 14, 
                       grid: true, 
                       columns: 2, 
                       autoRow: true,
@@ -150,7 +150,7 @@ const schema: ISchema = {
                       }, 
                       payRatio: {
                         type: 'string',
-                        title: '支付比例', 
+                        title: intl.formatMessage({ id: 'afterService.components.ReturnDetailInfo.payRatio' }, { default: '支付比例' }),
                         editable: false, 
                         'x-component-props': {
                           addonAfter: '%'

src/pages/balance/accountsReceivable/invoice/index.tsx

@@ -151,7 +151,7 @@ const SettlementList: React.FC = () => {
       const { data, code, message: msg } = await postSettleAccountsMemberSettlementInvoiceByReturn(postDataList);
       setSubmitLoading(false);
       if (code !== 1000) {
-        message.error(msg);
+        // message.error(intl.formatMessage({ id: `responseCode.${code}` }));
         return
       }
       formActions.submit();
@@ -171,8 +171,6 @@ const SettlementList: React.FC = () => {
     if (code === 1000) {
       formActions.submit();
       setVisible(false)
-    } else {
-      message.error(msg);
     }
   }