Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx

@@ -59,7 +59,7 @@ const common_columns: any = [
 ]
 const MemberSettleAdd: React.FC = () => {
   const [visible,  setVisible] = useState(false)
-  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'memberId' });
+  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'uniqueId' });
   const [initialValue, setInitialValue] = useState({});
   const [cacheMember, setCacheMember] = useState([]);
   const { id, preview } = usePageStatus();
@@ -88,7 +88,7 @@ const MemberSettleAdd: React.FC = () => {
         title: '操作',
         render: (text, record) => {
           return (
-            <a onClick={() => handleRemove(record.memberId)}>删除</a>
+            <a onClick={() => handleRemove(record.uniqueId)}>删除</a>
           )
         }
       }
@@ -102,11 +102,13 @@ const MemberSettleAdd: React.FC = () => {
   // 获取适用会员
   const fetchMemberData =  async (params: any) => {
     ///member/manage/all/provider/page
-    const { data, code } = await PublicApi.getMemberManageAllProviderPage(params);
-    if(code === 1000) {
-      return data
+    const { data } = await PublicApi.getMemberManageAllProviderPage(params);
+    console.log(data);
+    return {
+      ...data,
+      data: data.data.map((v) => ({...v, uniqueId: v.memberId + "_" + v.roleId})),
+      totalCount: data.totalCount
     }
-    return [];
   }
 
   // 获取适用会员下拉搜索框
@@ -175,11 +177,11 @@ const MemberSettleAdd: React.FC = () => {
   const handleRemove = (id: number) => {
     const string = 'Tabs.memberTab.someLists';
     const chooseList = formActions.getFieldValue(string);
-    const res = chooseList.filter((item) => item.memberId !== id);
+    const res = chooseList.filter((item) => item.uniqueId !== id);
     formActions.setFieldValue(string, res);
     // 必须设置key
     memberRowCtl.setSelectRow(res);
-    memberRowCtl.setSelectedRowKeys(res.map((item) => item.memberId))
+    memberRowCtl.setSelectedRowKeys(res.map((item) => item.uniqueId))
   }
 
 
@@ -221,15 +223,14 @@ const MemberSettleAdd: React.FC = () => {
 
           })
           formActions.setFieldValue('Tabs.memberTab.layout.isDefault', res.data.isDefault)
-          formActions.setFieldValue('Tabs.memberTab.someLists', res.data.memberList);
+          const list = res.data.memberList.map((item) => ({...item, uniqueId: item.memberId + "_" + item.roleId}))
+          formActions.setFieldValue('Tabs.memberTab.someLists', list);
           // 必须设置key
-          memberRowCtl.setSelectRow(res.data.memberList);
-          memberRowCtl.setSelectedRowKeys(res.data.memberList.map((item) => item.memberId))
+          memberRowCtl.setSelectRow(list);
+          memberRowCtl.setSelectedRowKeys(res.data.memberList.map((item) => item.memberId + "_" + item.roleId))
         } else {
           message.error({content: res.message})
         }
-
-       
       }
       getInfo();
     }
@@ -272,7 +273,7 @@ const MemberSettleAdd: React.FC = () => {
           rowSelection={memberRowSelection}
           fetchTableData={params => fetchMemberData(params)}
           tableProps={{
-            rowKey: 'memberId',
+            rowKey: 'uniqueId',
           }}
           width={1000}
           formilyProps={

src/pages/ruleSettingManage/platformSettlementStrategy/info/schema.tsx

@@ -114,7 +114,7 @@ export const addSchema: ISchema = {
               },
               'x-component': 'MultTable',
               'x-component-props': {
-                rowKey: 'memberId',
+                rowKey: 'uniqueId',
                 prefix: "{{tableAddButton}}",
                 columns: "{{tableColumns}}"
                 // columns: "{{tableColumns}}",