Merge branch '220518' into 'v2-220518'

src/pages/balance/businessRequestFunds/one/index.tsx

@@ -10,6 +10,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { applyAbstract, applyAmount, applyNo, applyType, createTime, expectPayTime, interiorStateName, operation, payee } from '../columns';
 import { schema } from '../sechma';
 import { getSettleAccountsBusinessApplyAmountToAddApplyAmountExamine1List } from '@/services/SettleV2Api';
+import AuthButton from '@/components/AuthButton';
 const intl = getIntl();
 const One = () => {
 
@@ -20,7 +21,9 @@ const One = () => {
   const columns: ColumnType<any>[] = [
     {
       ...applyNo,
-      render: (_text, record) => <a href={`/memberCenter/balance/businessRequestFunds/one/preview?id=${record.id}&no=${record.applyNo}`}>{_text}</a>
+      render: (_text, record) => <>
+        {AuthUrl('one.detail') ? <a href={`/memberCenter/balance/businessRequestFunds/one/preview?id=${record.id}&no=${record.applyNo}`}>{_text}</a> : _text}
+      </>
     },
     {
       ...applyAbstract
@@ -33,7 +36,7 @@ const One = () => {
     },
     {
       ...applyAmount,
-      render: (_text) => `${intl.formatMessage({id: 'common.money', defaultMessage: '¥'})}${_text}`,
+      render: (_text) => `${intl.formatMessage({ id: 'common.money', defaultMessage: '¥' })}${_text}`,
     },
     {
       ...expectPayTime,
@@ -49,7 +52,7 @@ const One = () => {
     },
     {
       ...operation,
-      render: (_text, record) => <Button type='link' href={`/memberCenter/balance/businessRequestFunds/one/detail?id=${record.id}&no=${record.applyNo}`}>{intl.formatMessage({id: 'dealAbility.shenhe', defaultMessage: '审核'})}</Button>,
+      render: (_text, record) => <AuthButton btnCode='one.audit' ><Button type='link' href={`/memberCenter/balance/businessRequestFunds/one/detail?id=${record.id}&no=${record.applyNo}`}>{intl.formatMessage({ id: 'dealAbility.shenhe', defaultMessage: '审核' })}</Button></AuthButton>,
     },
   ]
 

src/pages/balance/businessRequestFunds/submit/index.tsx

@@ -10,6 +10,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { applyAbstract, applyAmount, applyNo, applyType, createTime, expectPayTime, interiorStateName, operation, payee } from '../columns';
 import { schema } from '../sechma';
 import { getSettleAccountsBusinessApplyAmountToAddApplyAmountExamine3List } from '@/services/SettleV2Api';
+import AuthButton from '@/components/AuthButton';
 const intl = getIntl();
 const Submit = () => {
 
@@ -20,7 +21,9 @@ const Submit = () => {
   const columns: ColumnType<any>[] = [
     {
       ...applyNo,
-      render: (_text, record) => <a href={`/memberCenter/balance/businessRequestFunds/submit/preview?id=${record.id}&no=${record.applyNo}`}>{_text}</a>
+      render: (_text, record) => <>
+        {AuthUrl('submit.detail') ? <a href={`/memberCenter/balance/businessRequestFunds/submit/preview?id=${record.id}&no=${record.applyNo}`}>{_text}</a> : _text}
+      </>
     },
     {
       ...applyAbstract
@@ -33,7 +36,7 @@ const Submit = () => {
     },
     {
       ...applyAmount,
-      render: (_text) => `${intl.formatMessage({id: 'common.money', defaultMessage: '¥'})}${_text}`,
+      render: (_text) => `${intl.formatMessage({ id: 'common.money', defaultMessage: '¥' })}${_text}`,
     },
     {
       ...expectPayTime,
@@ -49,7 +52,7 @@ const Submit = () => {
     },
     {
       ...operation,
-      render: (_text, record) => <Button type='link' href={`/memberCenter/balance/businessRequestFunds/submit/detail?id=${record.id}&no=${record.applyNo}`}>{intl.formatMessage({id: 'balance.tijiao', defaultMessage: '提交'})}</Button>,
+      render: (_text, record) => <AuthButton btnCode='submit.audit' ><Button type='link' href={`/memberCenter/balance/businessRequestFunds/submit/detail?id=${record.id}&no=${record.applyNo}`}>{intl.formatMessage({ id: 'balance.tijiao', defaultMessage: '提交' })}</Button></AuthButton>,
     },
   ]
 

src/pages/balance/businessRequestFunds/two/index.tsx

@@ -10,6 +10,7 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { applyAbstract, applyAmount, applyNo, applyType, createTime, expectPayTime, interiorStateName, operation, payee } from '../columns';
 import { schema } from '../sechma';
 import { getSettleAccountsBusinessApplyAmountToAddApplyAmountExamine2List } from '@/services/SettleV2Api';
+import AuthButton from '@/components/AuthButton';
 const intl = getIntl();
 const Two = () => {
 
@@ -20,7 +21,9 @@ const Two = () => {
   const columns: ColumnType<any>[] = [
     {
       ...applyNo,
-      render: (_text, record) => <a href={`/memberCenter/balance/businessRequestFunds/two/preview?id=${record.id}&no=${record.applyNo}`}>{_text}</a>
+      render: (_text, record) => <>
+        {AuthUrl('two.detail') ? <a href={`/memberCenter/balance/businessRequestFunds/two/preview?id=${record.id}&no=${record.applyNo}`}>{_text}</a> : _text}
+      </>
     },
     {
       ...applyAbstract
@@ -33,7 +36,7 @@ const Two = () => {
     },
     {
       ...applyAmount,
-      render: (_text) => `${intl.formatMessage({id: 'common.money', defaultMessage: '¥'})}${_text}`,
+      render: (_text) => `${intl.formatMessage({ id: 'common.money', defaultMessage: '¥' })}${_text}`,
     },
     {
       ...expectPayTime,
@@ -49,7 +52,7 @@ const Two = () => {
     },
     {
       ...operation,
-      render: (_text, record) => <Button type='link' href={`/memberCenter/balance/businessRequestFunds/two/detail?id=${record.id}&no=${record.applyNo}`}>{intl.formatMessage({id: 'dealAbility.shenhe', defaultMessage: '审核'})}</Button>,
+      render: (_text, record) => <AuthButton btnCode='two.audit' ><Button type='link' href={`/memberCenter/balance/businessRequestFunds/two/detail?id=${record.id}&no=${record.applyNo}`}>{intl.formatMessage({ id: 'dealAbility.shenhe', defaultMessage: '审核' })}</Button></AuthButton>,
     },
   ]
 

src/pages/systemSetting/processEng/invoiceProcessEng/index.tsx

@@ -8,6 +8,7 @@ import { ColumnType } from 'antd/lib/table/interface';
 import { getSettleAccountsApplyAmountProcessDelete, getSettleAccountsApplyAmountProcessPage, postSettleAccountsApplyAmountProcessStatusUpdate } from '@/services/SettleV2Api'
 import { createTime, id, name, operation, processName, status } from '../../columns';
 import AuthButton from '@/components/AuthButton';
+import { AuthUrl } from '@/components/AuthButton/AuthUrl';
 
 const InvoiceProcessEng: React.FC<{}> = () => {
   const intl = getIntl();
@@ -48,7 +49,9 @@ const InvoiceProcessEng: React.FC<{}> = () => {
     },
     {
       ...name,
-      render: (_text, record) => <Link to={`/memberCenter/systemSetting/processManagement/invoiceProcessEng/preview?processId=${record.processId}`}>{_text}</Link>
+      render: (_text, record) => <>
+        {AuthUrl('invoiceProcessEng.detail') ? <Link to={`/memberCenter/systemSetting/processManagement/invoiceProcessEng/preview?processId=${record.processId}`}>{_text}</Link> : _text}
+      </>
     },
     {
       ...processName,
@@ -59,12 +62,12 @@ const InvoiceProcessEng: React.FC<{}> = () => {
     },
     {
       ...status,
-      render: (_text, record) => <Switch checked={!!_text} onChange={() => handleChecked(record)} />
+      render: (_text, record) => <AuthButton btnCode='invoiceProcessEng.status' ><Switch checked={!!_text} onChange={() => handleChecked(record)} /></AuthButton>
     },
     {
       ...operation,
       render: (_text, record) => <>
-        { !!!record.status &&
+        {!!!record.status &&
           <>
             <AuthButton btnCode='invoiceProcessEng.edit' >
               <Button type='link' href={`/memberCenter/systemSetting/processManagement/invoiceProcessEng/edit?processId=${record.processId}`}>{intl.formatMessage({ id: 'balance.bianji', defaultMessage: '编辑' })}</Button>
@@ -114,7 +117,7 @@ const InvoiceProcessEng: React.FC<{}> = () => {
           }
         }
       }}
-      controllerBtns={<Button type='primary' icon={<PlusOutlined />} onClick={() => history.push('/memberCenter/systemSetting/processManagement/invoiceProcessEng/add')}>{intl.formatMessage({id: 'authConfig.add', defaultMessage: '新增'})}</Button>}
+      controllerBtns={<AuthButton btnCode='invoiceProcessEng.add' ><Button type='primary' icon={<PlusOutlined />} onClick={() => history.push('/memberCenter/systemSetting/processManagement/invoiceProcessEng/add')}>{intl.formatMessage({ id: 'authConfig.add', defaultMessage: '新增' })}</Button></AuthButton>}
     />
   )
 }