Commit b2cc0db1 authored by XieZhiXiong's avatar XieZhiXiong

chore: 调整接口参数字段名

parent 11573239
......@@ -289,9 +289,9 @@ const QuotaMenage: React.FC = () => {
} = data;
return {
memberTypeName: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberRoleName: roles.map(item => ({ label: item.roleName, value: item.roleId })),
memberLevelName: levels.map(item => ({ label: item.levelTag, value: item.level })),
level: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberTypeId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
subRoleId: levels.map(item => ({ label: item.levelTag, value: item.level })),
};
}
return {};
......@@ -328,7 +328,7 @@ const QuotaMenage: React.FC = () => {
fetchSearchItems,
);
useAsyncInitSelect(
['memberLevelName', 'memberTypeName', 'memberRoleName'],
['level', 'memberTypeId', 'subRoleId'],
fetchSearchMemberItems,
);
}}
......
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-27 17:47:42
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-10-27 15:28:17
* @LastEditTime: 2021-01-04 10:26:01
* @Description:
*/
import { ISchema } from '@formily/antd';
......@@ -35,7 +35,7 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
memberLevelName: {
level: {
type: 'string',
default: undefined,
enum: [],
......@@ -44,7 +44,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
memberTypeName: {
memberTypeId: {
type: 'string',
default: undefined,
enum: [],
......@@ -53,7 +53,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
memberRoleName: {
subRoleId: {
type: 'string',
default: undefined,
enum: [],
......
......@@ -172,9 +172,9 @@ const QuotaPr1: React.FC = () => {
} = data;
return {
memberTypeName: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberRoleName: roles.map(item => ({ label: item.roleName, value: item.roleId })),
memberLevelName: levels.map(item => ({ label: item.levelTag, value: item.level })),
memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
subRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
level: levels.map(item => ({ label: item.levelTag, value: item.level })),
};
}
return {};
......@@ -206,7 +206,7 @@ const QuotaPr1: React.FC = () => {
fetchSearchItems,
);
useAsyncInitSelect(
['memberLevelName', 'memberTypeName', 'memberRoleName'],
['memberTypeId', 'subRoleId', 'level'],
fetchSearchMemberItems,
);
}}
......
......@@ -172,9 +172,9 @@ const QuotaPr1: React.FC = () => {
} = data;
return {
memberTypeName: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberRoleName: roles.map(item => ({ label: item.roleName, value: item.roleId })),
memberLevelName: levels.map(item => ({ label: item.levelTag, value: item.level })),
memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
subRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
level: levels.map(item => ({ label: item.levelTag, value: item.level })),
};
}
return {};
......@@ -206,7 +206,7 @@ const QuotaPr1: React.FC = () => {
fetchSearchItems,
);
useAsyncInitSelect(
['memberLevelName', 'memberTypeName', 'memberRoleName'],
['memberTypeId', 'subRoleId', 'level'],
fetchSearchMemberItems,
);
}}
......
......@@ -172,9 +172,9 @@ const QuotaPr3: React.FC = () => {
} = data;
return {
memberTypeName: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberRoleName: roles.map(item => ({ label: item.roleName, value: item.roleId })),
memberLevelName: levels.map(item => ({ label: item.levelTag, value: item.level })),
memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
subRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
level: levels.map(item => ({ label: item.levelTag, value: item.level })),
};
}
return {};
......@@ -206,7 +206,7 @@ const QuotaPr3: React.FC = () => {
fetchSearchItems,
);
useAsyncInitSelect(
['memberLevelName', 'memberTypeName', 'memberRoleName'],
['memberTypeId', 'subRoleId', 'level'],
fetchSearchMemberItems,
);
}}
......
......@@ -172,9 +172,9 @@ const QuotaPrConfirm: React.FC = () => {
} = data;
return {
memberTypeName: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberRoleName: roles.map(item => ({ label: item.roleName, value: item.roleId })),
memberLevelName: levels.map(item => ({ label: item.levelTag, value: item.level })),
memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
subRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
level: levels.map(item => ({ label: item.levelTag, value: item.level })),
};
}
return {};
......@@ -206,7 +206,7 @@ const QuotaPrConfirm: React.FC = () => {
fetchSearchItems,
);
useAsyncInitSelect(
['memberLevelName', 'memberTypeName', 'memberRoleName'],
['memberTypeId', 'subRoleId', 'level'],
fetchSearchMemberItems,
);
}}
......
......@@ -172,9 +172,9 @@ const QuotaPrSubmit: React.FC = () => {
} = data;
return {
memberTypeName: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
memberRoleName: roles.map(item => ({ label: item.roleName, value: item.roleId })),
memberLevelName: levels.map(item => ({ label: item.levelTag, value: item.level })),
memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
subRoleId: roles.map(item => ({ label: item.roleName, value: item.roleId })),
level: levels.map(item => ({ label: item.levelTag, value: item.level })),
};
}
return {};
......@@ -206,7 +206,7 @@ const QuotaPrSubmit: React.FC = () => {
fetchSearchItems,
);
useAsyncInitSelect(
['memberLevelName', 'memberTypeName', 'memberRoleName'],
['memberTypeId', 'subRoleId', 'level'],
fetchSearchMemberItems,
);
}}
......
......@@ -59,7 +59,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
memberLevelName: {
level: {
type: 'string',
default: undefined,
enum: [],
......@@ -68,7 +68,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
memberTypeName: {
memberTypeId: {
type: 'string',
default: undefined,
enum: [],
......@@ -77,7 +77,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
memberRoleName: {
subRoleId: {
type: 'string',
default: undefined,
enum: [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment