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

src/pages/authConfig/portalSystem/components/address.tsx

@@ -208,6 +208,7 @@ const AddressLayout: React.FC<addressProps> = (props: addressProps) => {
       if (type === ADDED_DELIVERY) {
         onChange(context.receiveAddress, ADDED_DELIVERY)
         setAddressList(context.receiveAddress)
+        console.log(context.receiveAddress, 10086)
       } else if (type === ADDED_DISPATCH) {
         onChange(context.deliverAddress, ADDED_DISPATCH)
         setAddressList(context.deliverAddress)

src/pages/authConfig/portalSystem/detail.tsx

 import React, { Fragment, useEffect, useState } from 'react';
-import { Col, Form, message, Radio, Row, Skeleton } from 'antd';
+import { Col, Empty, Form, message, Radio, Row, Skeleton } from 'antd';
 import { history, getIntl } from 'umi';
 import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import { getMemberOrgTree, getMemberStoreDetail } from '@/services/MemberV220318Api';
@@ -133,6 +133,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
                 title={intl.formatMessage({ id: 'portalSystem.shouhuodizhi', defaultMessage: '收货地址' })}
               >
                 <div className={style.addressList}>
+                  {dataSource?.receiveAddress ?
                     <Radio.Group style={{ display: 'block' }}>
                       <Row gutter={[48, 24]}>
                         <Col span={12}>
@@ -149,7 +150,9 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
                           </div>
                         </Col>
                       </Row>
-                  </Radio.Group>
+                    </Radio.Group> :
+                    <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+                  }
                 </div>
               </CardLayout>
               <CardLayout
@@ -157,6 +160,7 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
                 title={intl.formatMessage({ id: 'portalSystem.fahuozitidizhi', defaultMessage: '发货(自提)地址' })}
               >
                 <div className={style.addressList}>
+                  {dataSource?.deliverAddress ?
                     <Radio.Group style={{ display: 'block' }}>
                       <Row gutter={[48, 24]}>
                         <Col span={12}>
@@ -173,7 +177,10 @@ const ProtalSystemDetail: React.FC<{}> = (props: any) => {
                           </div>
                         </Col>
                       </Row>
-                  </Radio.Group>
+                    </Radio.Group> :
+                    <Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
+                  }
+
                 </div>
               </CardLayout>
             </Form>

src/pages/systemSetting/salesmanManage/salesmanBind/components/basicLayout.tsx

-import React from 'react';
-import { Form, Row, Col, Input, Button } from 'antd';
-import CardLayout from '@/pages/transaction/components/card';
-import { LinkOutlined } from '@ant-design/icons';
-import { ColumnType } from 'antd/lib/table/interface';
-import TableModal from '@/pages/transaction/components/tableModal';
-import { FORM_FILTER_PATH } from '@/formSchema/const';
-
-const BasicLayout = () => {
-  const [visible, setVisible] = React.useState<boolean>(false);
-  const columns: ColumnType<any>[] = [
-    {
-      title: '序号',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '姓名',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '手机号',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '所属机构',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '职位',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-  ]
-  const fetchData = () => {
-    return new Promise(resolve => {
-      resolve({
-        code: 1000,
-        data: []
-      })
-    })
-  }
-  return (
-    <React.Fragment>
-      <CardLayout
-        id='basicLayout'
-        title='基本信息'
-      >
-        <Row gutter={[48, 24]}>
-          <Col span={12}>
-            <Form.Item
-              label='业务员'
-              name=''
-              rules={[
-                { required: true, message: '请选择业务员' }
-              ]}
-            >
-              <Input.Search placeholder='请选择业务员' readOnly enterButton={<Button style={{ backgroundColor: '#00a98f' }} type='primary' icon={<LinkOutlined />} />} />
-            </Form.Item>
-          </Col>
-        </Row>
-      </CardLayout>
-      <TableModal
-        width={800}
-        modalType='Drawer'
-        visible={visible}
-        title='选择业务员'
-        mode='checkbox'
-        schema={{
-          type: "object",
-          properties: {
-            megalayout: {
-              type: "object",
-              "x-component": "mega-layout",
-              properties: {
-                inquiryListNo: {
-                  type: "string",
-                  "x-component": "Search",
-                  "x-mega-props": {},
-                  "x-component-props": {
-                    placeholder: '姓名',
-                    align: "flex-left",
-                  }
-                }
-              }
-            },
-            [FORM_FILTER_PATH]: {
-              type: "object",
-              "x-component": "flex-layout",
-              "x-component-props": {
-                rowStyle: {
-                  justifyContent: "flex-start",
-                  flexWrap: "nowrap"
-                },
-                colStyle: {//改变间隔
-                  marginRight: 20
-                }
-              },
-              properties: {
-                PRO_LAYOUT: {
-                  type: "object",
-                  "x-component": "mega-layout",
-                  "x-mega-props": {
-                    span: 5
-                  },
-                  "x-component-props": {
-                    inline: true
-                  },
-                  properties: {
-                    details: {
-                      type: "string",
-                      "x-component-props": {
-                        placeholder: '所属机构'
-                      }
-                    },
-                    memberName: {
-                      type: "string",
-                      "x-component-props": {
-                        placeholder: '职位'
-                      }
-                    },
-                  }
-                },
-                sumbit: {
-                  "x-component": "Submit",
-                  "x-mega-props": {
-                    span: 1
-                  },
-                  "x-component-props": {
-                    children: '查询'
-                  }
-                }
-              }
-            }
-          }
-        }}
-        columns={columns}
-        fetchData={fetchData}
-        onClose={() => setVisible(false)}
-        onOk={() => setVisible(false)}
-      />
-    </React.Fragment>
-  )
-}
-export default BasicLayout

src/pages/systemSetting/salesmanManage/salesmanBind/components/manageLayout.tsx

-import React, { CSSProperties } from 'react';
-import { Form, Button, Table, Space, Input } from 'antd';
-import { ColumnType } from 'antd/lib/table/interface';
-import CardLayout from '@/pages/transaction/components/card';
-import { PlusOutlined } from '@ant-design/icons';
-import TableModal from '@/pages/transaction/components/tableModal';
-
-const styles: CSSProperties = {
-  display: 'flex',
-  justifyContent: 'space-between',
-  alignItems: 'center',
-  marginBottom: '16px'
-}
-
-
-
-const ManageLayout = () => {
-  const [visible, setVisible] = React.useState<boolean>(false);
-  const columns: ColumnType<any>[] = [
-    {
-      title: '会员ID',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员名称',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员类型',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员角色',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '申请时间',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员等级',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员状态',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '操作',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-  ]
-  const tableModalColumns: ColumnType<any>[] = [
-    {
-      title: '会员ID',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员名称',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员类型',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员角色',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-    {
-      title: '会员等级',
-      ellipsis: true,
-      key: '',
-      dataIndex: '',
-    },
-  ]
-
-  const fetchData = () => {
-    return new Promise(resolve => {
-      resolve({
-        code: 1000,
-        data: []
-      })
-    })
-  }
-
-  return (
-    <React.Fragment>
-      <CardLayout
-        id='manageLayout'
-        title='管理下级会员'
-      >
-        <div style={styles}>
-          <Button>批量解除绑定关系</Button>
-          <Space size={16}>
-            <Input.Search placeholder='会员姓名' />
-            <Button>重置</Button>
-          </Space>
-        </div>
-        <Button block type="dashed" style={{ marginBottom: "16px" }} icon={<PlusOutlined />}>选择待绑定下级会员</Button>
-        <Form.Item
-          name=''
-          rules={[
-            { required: true, message: '请绑定下级会员' }
-          ]}
-        >
-          <Table
-            rowSelection={{}}
-            columns={columns}
-            dataSource={[]}
-          />
-        </Form.Item>
-      </CardLayout>
-      <TableModal
-        modalType='Drawer'
-        visible={visible}
-        title='选择会员'
-        mode='checkbox'
-        schema={{
-          type: "object",
-          properties: {
-            megalayout: {
-              type: "object",
-              "x-component": "mega-layout",
-              properties: {
-                inquiryListNo: {
-                  type: "string",
-                  "x-component": "Search",
-                  "x-mega-props": {},
-                  "x-component-props": {
-                    placeholder: '会员名称',
-                    align: "flex-left",
-                    advanced: false,
-                  }
-                }
-              }
-            }
-          }
-        }}
-        columns={tableModalColumns}
-        fetchData={fetchData}
-        onClose={() => setVisible(false)}
-        onOk={() => setVisible(false)}
-      />
-    </React.Fragment>
-  )
-}
-export default ManageLayout

src/pages/systemSetting/salesmanManage/salesmanBind/detail.tsx

-import React from 'react';
-import { Form, Button, Row, Col, Typography } from 'antd';
+import React, { useEffect, useMemo, useState } from 'react';
+import { Form, Button, Row, Col, Typography, Input } from 'antd';
 import PeripheralLayout from '@/pages/transaction/components/detailLayout';
 import CardLayout from '@/pages/transaction/components/card';
 import StandardTable from '@/components/StandardTable';
@@ -8,10 +8,19 @@ import NiceForm from '@/components/NiceForm';
 import { createFormActions, FormEffectHooks } from '@formily/antd';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { searchSelectGetSelectCategoryOptionEffect } from '@/pages/transaction/effect';
-import { layout } from './add';
+import { useIntl } from 'umi';
+import { getMemberAbilitySalesChannel } from '@/services/MemberV2Api';
+import { usePageStatus } from '@/hooks/usePageStatus';
 
 const formActions = createFormActions()
 
+export const layout: any = {
+  colon: false,
+  labelCol: { style: { width: "144px" } },
+  labelAlign: "left"
+};
+
+
 export const Tablink = [
   { id: 'basicLayout', title: '基本信息' },
   { id: 'manageLayout', title: '管理下级会员' },
@@ -19,50 +28,59 @@ export const Tablink = [
 
 const SalesmanBindDetail = (props) => {
   const ref = React.useRef<any>(null);
+  const intl = useIntl();
+
+  const { pageStatus, id } = usePageStatus()
+
+  const [tableData, setTableData] = useState<any[]>([])
+  const [data, setData] = useState<any>({})
+  const [keywordName, setKeywordName] = useState<string>('')
+
   const columns: ColumnType<any>[] = [
     {
-      title: '会员ID',
+      key: 'memberId',
+      dataIndex: 'memberId',
+      title: intl.formatMessage({ id: 'channel.member.table.memberId' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
     {
-      title: '会员名称',
+      key: 'name',
+      dataIndex: 'name',
+      title: intl.formatMessage({ id: 'channel.member.table.memberName' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
     {
-      title: '会员类型',
+      key: 'memberTypeName',
+      dataIndex: 'memberTypeName',
+      title: intl.formatMessage({ id: 'channel.member.table.memberTypeName' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
     {
-      title: '会员角色',
+      key: 'roleName',
+      dataIndex: 'roleName',
+      title: intl.formatMessage({ id: 'channel.member.table.roleName' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
     {
-      title: '申请时间',
+      key: 'createTime',
+      dataIndex: 'createTime',
+      title: intl.formatMessage({ id: 'channel.member.table.createTime' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
     {
-      title: '会员等级',
+      key: 'levelTag',
+      dataIndex: 'levelTag',
+      title: intl.formatMessage({ id: 'channel.member.table.levelTag' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
     {
-      title: '会员状态',
+      key: 'statusName',
+      dataIndex: 'statusName',
+      title: intl.formatMessage({ id: 'channel.member.table.statusName' }),
       ellipsis: true,
-      key: '',
-      dataIndex: '',
     },
   ]
+
   const fetchData = (params?: any) => {
     return new Promise((resolve, reject) => {
       resolve({
@@ -77,6 +95,35 @@ const SalesmanBindDetail = (props) => {
     ref.current.reload(values)
   }
 
+  const fliterTableData = useMemo(() => {
+    if (!keywordName) {
+      return tableData
+    }
+    return tableData.filter(v => v.name.toString().includes(keywordName))
+  }, [tableData, keywordName])
+
+  const fetchSaleChannel = async () => {
+    getMemberAbilitySalesChannel({
+      userId: id,
+      current: '1',
+      pageSize: '20',
+      name: keywordName,
+    }).then((res) => {
+      if (res.code === 1000) {
+        setData(res.data)
+        setTableData(res.data.data);
+
+      }
+    })
+  }
+
+  useEffect(() => {
+    fetchSaleChannel()
+  }, [])
+
+  const handleSearchChannel = () => {
+  }
+
   return (
     <PeripheralLayout
       hideBreak
@@ -92,19 +139,19 @@ const SalesmanBindDetail = (props) => {
               <Col span={12}>
                 <Form {...layout}>
                   <Form.Item label='业务员'>
-                    <Typography.Text>张三</Typography.Text>
+                    <Typography.Text>{data?.name}</Typography.Text>
                   </Form.Item>
                   <Form.Item label='所属机构'>
-                    <Typography.Text>广州总部-业务部-华南区-广东省</Typography.Text>
+                    <Typography.Text>{data?.orgName}</Typography.Text>
                   </Form.Item>
                   <Form.Item label='职位'>
-                    <Typography.Text>业务员</Typography.Text>
+                    <Typography.Text>{data?.jobTitle	}</Typography.Text>
                   </Form.Item>
                   <Form.Item label='所属角色'>
-                    <Typography.Text>业务员-广东省</Typography.Text>
+                    <Typography.Text>{data?.memberRoleName}</Typography.Text>
                   </Form.Item>
                   <Form.Item label='绑定后手机号'>
-                    <Typography.Text>+86 18677665544</Typography.Text>
+                    <Typography.Text>{data?.phone}</Typography.Text>
                   </Form.Item>
                 </Form>
               </Col>
@@ -114,43 +161,18 @@ const SalesmanBindDetail = (props) => {
             id='manageLayout'
             title='管理下级会员'
           >
+            <Row justify='space-between' style={{ marginBottom: 20 }}>
+              <Col style={{ display: 'flex' }}>
+                <Input.Search placeholder={intl.formatMessage({ id: 'channel.form.memberName.placeholder' })} value={keywordName} onChange={e => setKeywordName(e.target.value)} onPressEnter={handleSearchChannel} />
+                <Button type='default' style={{ marginLeft: 20 }} onClick={() => setKeywordName('')}>{intl.formatMessage({ id: 'common.button.reset' })}</Button>
+              </Col>
+            </Row>
             <StandardTable
-              tableProps='id'
               columns={columns}
-              fetchTableData={(params: any) => fetchData(params)}
-              controlRender={
-                <NiceForm
-                  actions={formActions}
-                  onSubmit={values => search(values)}
-                  effects={($, actions) => {
-                    useStateFilterSearchLinkageEffect($, actions, 'name', 'FORM_FILTER_PATH')
-                    FormEffectHooks.onFieldChange$('category').subscribe(state => {
-                      searchSelectGetSelectCategoryOptionEffect(actions, 'category')
-                    })
+              rowKey='relationId'
+              tableProps={{
+                dataSource: fliterTableData
               }}
-                  schema={{
-                    type: "object",
-                    properties: {
-                      megalayout: {
-                        type: "object",
-                        "x-component": "mega-layout",
-                        properties: {
-                          name: {
-                            type: "string",
-                            "x-component": "Search",
-                            "x-mega-props": {},
-                            "x-component-props": {
-                              placeholder: '会员名称',
-                              align: "flex-left",
-                              advanced: false,
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }}
-                />
-              }
             />
           </CardLayout>
         </React.Fragment>

src/pages/systemSetting/salesmanManage/salesmanBind/index.tsx

@@ -6,47 +6,77 @@ import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { ColumnType } from 'antd/lib/table/interface';
 import EyePreview from '@/components/EyePreview';
 import { PlusOutlined } from '@ant-design/icons';
+import { getMemberAbilitySalesPage } from '@/services/MemberV220318Api';
+import { postMemberAbilitySalesDelete } from '@/services/MemberV2Api';
 
 const intl = getIntl()
 
 const PortalSystem = () => {
   const tableRef = useRef<any>({});
 
+  const updateItem = (record) => {
+    history.push(`/memberCenter/systemSetting/salesmanManage/salesmanBind/edit?id=${record.userId}`)
+  }
+
+  const deleteItem = async (record) => {
+    // 删除该项
+    await postMemberAbilitySalesDelete({
+      userId: record.userId
+    })
+    tableRef.current.reload()
+  }
+
   const columns: ColumnType<any>[] = [
     {
-      title: '登录帐号',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'channel.member.table.account' }),
+      key: 'account',
+      dataIndex: 'account'
     },
     {
-      title: '姓名',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'channel.member.table.name' }),
+      key: 'name',
+      dataIndex: 'name',
+      render: (text, record) => <EyePreview url={`/memberCenter/systemSetting/salesmanManage/salesmanBind/detail?id=${record.userId}`}>{text}</EyePreview>
     },
     {
-      title: '所属机构',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'channel.member.table.orgName' }),
+      key: 'orgName',
+      dataIndex: 'orgName'
     },
     {
-      title: '绑定手机号',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'channel.member.table.bindphone' }),
+      key: 'phone',
+      dataIndex: 'phone'
     },
     {
-      title: '职位',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'channel.member.table.jobTitle' }),
+      key: 'jobTitle',
+      dataIndex: 'jobTitle'
     },
     {
-      title: '所属角色',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'channel.member.table.memberRoleName' }),
+      key: 'memberRoleName',
+      dataIndex: 'memberRoleName'
     },
     {
-      title: '操作',
-      key: '',
-      dataIndex: ''
+      title: intl.formatMessage({ id: 'common.table.action' }),
+      key: 'options',
+      dataIndex: 'options',
+      render: (text:any, record:any) => {
+        return <>
+          <Button type='link' onClick={()=>updateItem(record)}>{intl.formatMessage({ id: 'common.button.modify' })}</Button>
+          {
+            <Popconfirm
+              title={intl.formatMessage({ id: 'common.tip.option.confirm' })}
+              onConfirm={() => deleteItem(record)}
+              okText={intl.formatMessage({ id: 'common.button.yes' })}
+              cancelText={intl.formatMessage({ id: 'common.button.no' })}
+            >
+              <Button type='link'>{intl.formatMessage({ id: 'common.button.delete' })}</Button>
+            </Popconfirm>
+          }
+        </>
+      }
     },
   ]
 
@@ -54,8 +84,9 @@ const PortalSystem = () => {
     <TableLayout
       reload={tableRef}
       columns={columns}
-      effects="name"
-      fetch={[]}
+      effects="account"
+      rowKey='userId'
+      fetch={getMemberAbilitySalesPage}
       schema={{
         type: "object",
         properties: {
@@ -70,7 +101,7 @@ const PortalSystem = () => {
                 type: "object",
                 "x-component": "controllerBtns",
               },
-              name: {
+              account: {
                 type: 'string',
                 'x-component': 'Search',
                 'x-component-props': {
@@ -101,7 +132,7 @@ const PortalSystem = () => {
                   inline: true
                 },
                 properties: {
-                  contactName: {
+                  name: {
                     type: 'string',
                     'x-component-props': {
                       placeholder: '姓名',
@@ -134,7 +165,7 @@ const PortalSystem = () => {
                 icon={<PlusOutlined />}
                 onClick={() => history.push(`/memberCenter/systemSetting/salesmanManage/salesmanBind/add`)}
               >
-                {intl.formatMessage({id: 'portalSystem.added', defaultMessage: '新增'})}
+                {intl.formatMessage({ id: 'portalSystem.added', defaultMessage: '新增' })}
               </Button>
             </Space>
           </Col>

src/pages/transaction/dealAbility/productInquiry/waitAddInquiry/components/basicInfo.tsx

@@ -9,7 +9,7 @@ import { isEmpty } from '@formily/shared';
 import { ENTERPRISE_CENTER_URL } from '@/constants'
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
-import { getMemberAbilityInfoPage, getMemberManagePlatformProviderPage } from '@/services/MemberV220318Api';
+import { getMemberManagePlatformProviderPage, getMemberManageUpperProviderMerchantPage } from '@/services/MemberV220318Api';
 import { postManageWebShopWebAll } from '@/services/ManageV2Api';
 import { getIntl } from 'umi';
 import { getEnableMultiTenancy } from '@/utils/auth';
@@ -33,8 +33,8 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
   const columns: any = [
     {
       title: 'ID',
-      dataIndex: enableMultiTenancy ? 'validateId' : 'id',
-      key: enableMultiTenancy ? 'validateId' : 'id',
+      dataIndex: 'id',
+      key: 'id',
     },
     {
       title: intl.formatMessage({id: 'dealAbility.huiyuanmingcheng'}),
@@ -59,7 +59,7 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
   ]
 
   const handleFetchData = useCallback((params: any) => {
-    let getMemberApi = (enableMultiTenancy ? getMemberAbilityInfoPage : getMemberManagePlatformProviderPage)
+    let getMemberApi = (enableMultiTenancy ? getMemberManageUpperProviderMerchantPage : getMemberManagePlatformProviderPage)
     return new Promise(resolve => {
       getMemberApi({ ...params }).then(res => {
         if (res.code !== 1000) {
@@ -143,9 +143,9 @@ const BasicInfoLayout: React.FC<BasicInfoLayoutProps> = (props: any) => {
         title={intl.formatMessage({id: 'dealAbility.xuanzehuiyuan'})}
         mode="radio"
         tableProps={{
-          rowKey: enableMultiTenancy ? 'validateId' : 'id',
+          rowKey: 'id',
         }}
-        customKey={enableMultiTenancy ? 'validateId' : 'id'}
+        customKey='id'
         fetchData={handleFetchData}
         onClose={() => toggle(false)}
         onOk={handleLogisticOnOk}