Merge branch 'v2-220518' of…

src/pages/balance/invoice/srm/inquire/index.tsx

@@ -64,6 +64,12 @@ const InvoiceInquire: React.FC = () => {
     });
   };
 
+  const _handleOrderNo = record => {
+    window.open(
+      `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
+    );
+  };
+
   const columns = [
     {
       title: intl.formatMessage({
@@ -74,7 +80,7 @@ const InvoiceInquire: React.FC = () => {
         <Button
           type="link"
           onClick={() => {
-            history.push(`/memberCenter/balance/invoice/detail?reconciliationId=${record.reconciliationId}&id=${record.id}`)
+            _handleOrderNo(record)
           }}
         >
           {text}
@@ -111,6 +117,16 @@ const InvoiceInquire: React.FC = () => {
         id: 'balance.accountsReceivable.invoice.columns.code',
       }),
       dataIndex: 'code',
+      render: (text, record) => (
+        <Button
+          type="link"
+          onClick={() => {
+            history.push(`/memberCenter/balance/invoice/detail?reconciliationId=${record.reconciliationId}&id=${record.id}`)
+          }}
+        >
+          {text}
+        </Button>
+      ),
     },
     {
       title: intl.formatMessage({
@@ -188,6 +204,9 @@ const InvoiceInquire: React.FC = () => {
         <StandardTable
           tableProps={{
             rowKey: 'id',
+            scroll: {
+              x: 1200
+            }
           }}
           columns={columns as any}
           currentRef={ref}

src/pages/balance/invoice/srm/joint/index.tsx

@@ -146,6 +146,12 @@ const InvoiceJoint: React.FC = () => {
     )
   }
 
+  const _handleOrderNo = record => {
+    window.open(
+      `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
+    );
+  };
+
   const columns = [
     {
       title: intl.formatMessage({
@@ -156,8 +162,7 @@ const InvoiceJoint: React.FC = () => {
         <Button
           type="link"
           onClick={() => {
-
-            history.push(`/memberCenter/balance/invoiceJoint/detail?reconciliationId=${record.reconciliationId}&id=${record.id}`)
+            _handleOrderNo(record)
           }}
         >
           {text}
@@ -188,6 +193,17 @@ const InvoiceJoint: React.FC = () => {
         id: 'balance.accountsReceivable.invoice.columns.code',
       }),
       dataIndex: 'code',
+      render: (text, record) => (
+        <Button
+          type="link"
+          onClick={() => {
+
+            history.push(`/memberCenter/balance/invoiceJoint/detail?reconciliationId=${record.reconciliationId}&id=${record.id}`)
+          }}
+        >
+          {text}
+        </Button>
+      ),
     },
     {
       title: intl.formatMessage({
@@ -261,6 +277,8 @@ const InvoiceJoint: React.FC = () => {
       title: intl.formatMessage({
         id: 'balance.accountsReceivable.invoice.columns.operation',
       }),
+      fixed: 'right',
+      width: 120,
       render: (_, record) => renderOptionButton(record)
     },
   ];
@@ -271,6 +289,9 @@ const InvoiceJoint: React.FC = () => {
         <StandardTable
           tableProps={{
             rowKey: 'id',
+            scroll: {
+              x: 1200
+            }
           }}
           columns={columns as any}
           currentRef={ref}

src/pages/balance/invoice/srm/manage/index.tsx

@@ -128,6 +128,12 @@ const InvoiceManage: React.FC = () => {
     )
   }
 
+  const _handleOrderNo = record => {
+    window.open(
+      `/memberCenter/balance/businessReconciliation/search/preview?id=${record.reconciliationId}&no=${record.reconciliationNo}`,
+    );
+  };
+
   const columns = [
     {
       title: intl.formatMessage({
@@ -138,7 +144,7 @@ const InvoiceManage: React.FC = () => {
         <Button
           type="link"
           onClick={() => {
-            history.push(`/memberCenter/balance/invoice/detail?reconciliationId=${record.reconciliationId}&id=${record.id}`)
+            _handleOrderNo(record)
           }}
         >
           {text}
@@ -175,6 +181,16 @@ const InvoiceManage: React.FC = () => {
         id: 'balance.accountsReceivable.invoice.columns.code',
       }),
       dataIndex: 'code',
+      render: (text, record) => (
+        <Button
+          type="link"
+          onClick={() => {
+            history.push(`/memberCenter/balance/invoice/detail?reconciliationId=${record.reconciliationId}&id=${record.id}`)
+          }}
+        >
+          {text}
+        </Button>
+      ),
     },
     {
       title: intl.formatMessage({
@@ -248,6 +264,7 @@ const InvoiceManage: React.FC = () => {
       title: intl.formatMessage({
         id: 'balance.accountsReceivable.invoice.columns.operation',
       }),
+      fixed: 'right',
       width: 120,
       render: (_, record) => renderOptionButton(record)
     },
@@ -276,6 +293,9 @@ const InvoiceManage: React.FC = () => {
         <StandardTable
           tableProps={{
             rowKey: 'id',
+            scroll: {
+              x: 1200
+            }
           }}
           loading={pageLoading}
           columns={columns as any}

src/pages/balance/invoice/srm/readyInvoice/index.tsx

@@ -164,6 +164,7 @@ const SettlementList: React.FC = () => {
       title: intl.formatMessage({
         id: 'balance.accountsReceivable.invoice.columns.operation',
       }),
+      fixed: 'right',
       render: (text, record) => {
         return (
           <Link
@@ -192,6 +193,9 @@ const SettlementList: React.FC = () => {
         <StandardTable
           tableProps={{
             rowKey: 'reconciliationId',
+            scroll: {
+              x: 1200
+            }
           }}
           columns={columns as any}
           currentRef={ref}

src/pages/shop/shopInfo/index.tsx

@@ -307,7 +307,7 @@ const ShopInfo: React.FC<ShopInfoPropsType> = (props) => {
 
   return (
     <PageHeaderWrapper>
-      <Prompt when={formIsHalfFilledOut} message={intl.formatMessage({ id: 'tip.save.confirm' })} />
+      <Prompt when={formIsHalfFilledOut} message={intl.formatMessage({ id: 'common.tip.save.confirm' })} />
       <div className={styles.shop_info}>
         <Form
           form={form}