Skip to content

J
jinfa-admin
Commit e86e7d0d authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

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

parents 60e276c7 d5e7b1e7
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 112 deletions
src/pages/pageCustomized/mallEdit/index.tsx
View file @ e86e7d0d
......@@ -51,7 +51,7 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
type: 1
}
PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
} else {
......@@ -68,7 +68,7 @@ const MallEdit: React.FC<MallEditPropsType> = (props) => {
type: 2
}
PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
} else {
......
src/pages/pageCustomized/preview/mallPreview/index.tsx
View file @ e86e7d0d
......@@ -50,7 +50,7 @@ const MallPreview: React.FC<MallPreviewPropsType> = (props) => {
type: 1
}
PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
} else {
......@@ -67,7 +67,7 @@ const MallPreview: React.FC<MallPreviewPropsType> = (props) => {
type: 2
}
PublicApi.getTemplatePlatformFindAdvertsByType(params).then(res => {
PublicApi.getTemplateAdornWebEnterpriseFindAdvertsByType(params).then(res => {
if (res.code === 1000) {
resolve(res.data)
} else {
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/AdvertSetting/index.tsx
View file @ e86e7d0d
......@@ -10,7 +10,7 @@ import { clearSelectedStatus, changeProps } from 'lingxi-editor-core';
import { ArrowUpOutlined, DeleteOutlined, PlusOutlined, ArrowDownOutlined, CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons'
import styles from './index.less'
interface advertItemType {
interface AdvertItemType {
/**
* ID
*/
......@@ -53,7 +53,7 @@ interface advertItemType {
interface AdvertSettingPropsType {
advertList: advertItemType[];
advertList: AdvertItemType[];
onChange: Function;
type: 'top' | 'banner' | 'interact' | 'category';
templateid: number;
......@@ -62,7 +62,7 @@ interface AdvertSettingPropsType {
const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref) => {
const { advertList = [], templateid, type, categoryid } = props
const [list, setList] = useState<advertItemType[]>(advertList)
const [list, setList] = useState<AdvertItemType[]>(advertList)
const [confirmLoading, setConfirmLoading] = useState<boolean>(false)
const [newProps, setNewProps] = useState(props)
......@@ -85,10 +85,10 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
setNewProps(newProps)
}
const sortUp = (index: number, item: advertItemType) => {
let newList = JSON.parse(JSON.stringify(list))
let tempItem = JSON.parse(JSON.stringify(item))
let temp = newList[index - 1]
const sortUp = (index: number, item: AdvertItemType) => {
const newList = JSON.parse(JSON.stringify(list))
const tempItem = JSON.parse(JSON.stringify(item))
const temp = newList[index - 1]
newList[index - 1] = item
newList[index - 1].sort = temp.sort
newList[index] = temp
......@@ -97,10 +97,10 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
changeNewProps('advertList', newList)
}
const sortDown = (index: number, item: advertItemType) => {
let newList = JSON.parse(JSON.stringify(list))
let temp = newList[index + 1]
let tempItem = JSON.parse(JSON.stringify(item))
const sortDown = (index: number, item: AdvertItemType) => {
const newList = JSON.parse(JSON.stringify(list))
const temp = newList[index + 1]
const tempItem = JSON.parse(JSON.stringify(item))
newList[index + 1] = item
newList[index + 1].sort = temp.sort
newList[index] = temp
......@@ -110,7 +110,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
}
const addSliderItem = () => {
let newList = JSON.parse(JSON.stringify(list))
const newList = JSON.parse(JSON.stringify(list))
let sort = 0
if (newList.length <= 0) {
sort = 1
......@@ -118,7 +118,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
sort = newList[newList.length - 1].sort + 1
}
let tempItem: any = {
const tempItem: any = {
templateId: Number(templateid),
type: getAdvertType(type),
name: '',
......@@ -138,7 +138,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
}
const handleDeleteItem = (index: number) => {
let newList = JSON.parse(JSON.stringify(list))
const newList = JSON.parse(JSON.stringify(list))
newList.splice(index, 1)
let sort = 1
newList.map(item => {
......@@ -150,7 +150,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
}
const handleExpand = (sort: number, state: boolean) => {
let newList = JSON.parse(JSON.stringify(list))
const newList = JSON.parse(JSON.stringify(list))
newList.map(item => {
if (item.sort === sort) {
item.expand = state
......@@ -160,7 +160,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
}
const handleKeyChange = (value: string, sort: number, key: string) => {
let newList = JSON.parse(JSON.stringify(list))
const newList = JSON.parse(JSON.stringify(list))
newList.map(item => {
if (item.sort === sort) {
item[key] = value
......@@ -223,7 +223,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
reject()
return
}
let param: any = {
const param: any = {
templateId: templateid,
type: getAdvertType(type),
adverts: addTempalteIdToList(advertList, templateid)
......@@ -231,7 +231,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
if (type === 'category') {
param.categoryId = categoryid
}
PublicApi.postTemplatePlatformSaveAdvert(param).then(res => {
PublicApi.postTemplateAdornWebEnterpriseSaveAdvert(param).then(res => {
if (res.code === 1000) {
resolve()
} else {
......@@ -273,7 +273,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
<div className={styles.advert_setting_line_name} onClick={() => handleExpand(item.sort, !item.expand)}>
<span>{item.name}</span>
{
!!item.expand ? <CaretUpOutlined className={styles.icon} /> : <CaretDownOutlined className={styles.icon} />
item.expand ? <CaretUpOutlined className={styles.icon} /> : <CaretDownOutlined className={styles.icon} />
}
</div>
{
......@@ -320,4 +320,6 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
)
})
export default AdvertSetting
\ No newline at end of file
AdvertSetting.displayName = "AdvertSetting"
export default AdvertSetting
src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.tsx
View file @ e86e7d0d
......@@ -4,7 +4,7 @@ import { Row, Col, Button, Input, Pagination, Form, message, Modal } from 'antd'
import SettingList from '../../../../components/SettingList'
import BrandItem from './BrandItem'
import SettingPanel from '../../../../components/SettingPanel'
import { GetTemplatePlatformFindBrandListResponseDetail } from '@/services'
import { GetTemplateAdornWebEnterpriseFindBrandListResponseDetail } from '@/services/TemplateApi'
import { PublicApi } from '@/services/api'
import { filterProps } from '../../../../utils'
import styles from './index.less'
......@@ -33,7 +33,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
const { templateid, categoryid, brandList = [] } = props
const [current, setCurrent] = useState<number>(1)
const [pageSize, setPageSize] = useState<number>(10)
const [noSelectBrands, setNoSelectBrands] = useState<GetTemplatePlatformFindBrandListResponseDetail[]>([])
const [noSelectBrands, setNoSelectBrands] = useState<GetTemplateAdornWebEnterpriseFindBrandListResponseDetail[]>([])
const [selectList, setSelectList] = useState<any>([])
const [selectBrandList, setSelectBrandList] = useState<any>(brandList)
const [brandIds, setBrandIds] = useState<any>([])
......@@ -56,7 +56,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
param = Object.assign(param, filterParam)
}
PublicApi.getTemplatePlatformFindBrandList(param).then((res: any) => {
PublicApi.getTemplateAdornWebEnterpriseFindBrandList(param).then((res: any) => {
if (res.code === 1000) {
const dataInfo = res.data
setTotalCount(dataInfo.totalCount)
......@@ -144,7 +144,7 @@ const BrandSetting: React.FC<ShopSettingPropsType> = (props) => {
ids.push(item.brandId)
}
param.brandIds = ids
PublicApi.postTemplatePlatformSaveBrand(param).then(res => {
PublicApi.postTemplateAdornWebEnterpriseSaveBrand(param).then(res => {
if (res.code === 1000) {
resolve()
} else {
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.tsx
View file @ e86e7d0d
......@@ -6,13 +6,13 @@ import { clearSelectedStatus, changeProps } from 'lingxi-editor-core'
import { PublicApi } from '@/services/api'
import styles from './index.less'
interface categoryItemType {
interface CategoryItemType {
categoryId: number,
categoryName: string
}
interface CategoryRecommendSettingPropsType {
secondCategoryList: categoryItemType[];
secondCategoryList: CategoryItemType[];
categoryAdvertPicUrl: string;
onChange: Function;
templateid: number;
......@@ -40,20 +40,20 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
}, [])
const initSelectKeys = () => {
let result: number[] = []
for (let item of secondCategoryList) {
const result: number[] = []
for (const item of secondCategoryList) {
result.push(item.categoryId)
}
setSelectKeys(result)
}
const fetchCategoryList = () => {
let param = {
const param: any = {
categoryId: categoryid,
templateId: templateid
}
//@ts-ignore
PublicApi.getTemplatePlatformFindCategoryList(param).then(res => {
PublicApi.getTemplateAdornWebEnterpriseFindCategoryList(param).then(res => {
const data = res.data
setCategoryResponseList(data.categoryBOList || [])
})
......@@ -61,7 +61,7 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
const handleSecondCategoryChange = (keys: any) => {
setSelectKeys(keys)
let result = categoryResponseList.filter(item => keys.includes(item.categoryId))
const result = categoryResponseList.filter(item => keys.includes(item.categoryId))
changeNewProps('secondCategoryList', result)
}
......@@ -115,14 +115,14 @@ const CategoryRecommendSetting: React.FC<CategoryRecommendSettingPropsType> = (p
message.error('最多推荐3个二级品类')
return
}
let param = {
const param: any = {
templateId: templateid,
categoryId: categoryid,
categoryAdvertPicUrl,
twoCategoryIds: selectKeys
}
//@ts-ignore
PublicApi.postTemplatePlatformSaveCategory(param).then(res => {
PublicApi.postTemplateAdornWebEnterpriseSaveCategory(param).then(res => {
if (res.code === 1000) {
resolve()
} else {
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.tsx
View file @ e86e7d0d
......@@ -5,7 +5,7 @@ import SettingList from '../../../../components/SettingList'
import GoodsItem from './GoodsItem'
import SettingPanel from '../../../../components/SettingPanel'
import { CaretUpOutlined, CaretDownOutlined } from '@ant-design/icons'
import { GetTemplatePlatformFindGoodsListResponseDetail } from '@/services'
import { GetTemplateAdornWebEnterpriseFindGoodsListResponseDetail } from '@/services/TemplateApi'
import { PublicApi } from '@/services/api'
import { filterProps } from '../../../../utils'
import styles from './index.less'
......@@ -36,7 +36,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
const { templateid, categoryid, goodsList = [] } = props
const [current, setCurrent] = useState<number>(1)
const [pageSize, setPageSize] = useState<number>(10)
const [noSelectGoods, setNoSelectGoods] = useState<GetTemplatePlatformFindGoodsListResponseDetail[]>([])
const [noSelectGoods, setNoSelectGoods] = useState<GetTemplateAdornWebEnterpriseFindGoodsListResponseDetail[]>([])
const [selectList, setSelectList] = useState<any>([])
const [selectGoodsList, setSelectGoodsList] = useState<any>(goodsList)
const [goodsIds, setGoodsIds] = useState<any>([])
......@@ -70,7 +70,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
pageSize: 100
}
PublicApi.getTemplatePlatformFindCategoryList(param).then(res => {
PublicApi.getTemplateAdornWebEnterpriseFindCategoryList(param).then(res => {
if (res.code === 1000) {
const data = res.data
setCategoryResponseList(data.categoryBOList || [])
......@@ -109,7 +109,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
}
setSpinLoading(true)
PublicApi.getTemplatePlatformFindGoodsList(param).then((res: any) => {
PublicApi.getTemplateAdornWebEnterpriseFindGoodsList(param).then((res: any) => {
if (res.code === 1000) {
const dataInfo = res.data
setTotalCount(dataInfo.totalCount)
......@@ -232,7 +232,7 @@ const GoodsSetting: React.FC<GoodsSettingPropsType> = (props) => {
ids.push(item.goodsId)
}
param.goodsIds = ids
PublicApi.postTemplatePlatformSaveGoods(param).then(res => {
PublicApi.postTemplateAdornWebEnterpriseSaveGoods(param).then(res => {
if (res.code === 1000) {
resolve()
} else {
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.tsx
View file @ e86e7d0d
......@@ -4,7 +4,7 @@ import { Row, Col, Button, Input, Pagination, Form, message, Modal } from 'antd'
import SettingList from '../../../../components/SettingList'
import ShopItem from './ShopItem'
import SettingPanel from '../../../../components/SettingPanel'
import { GetTemplatePlatformFindShopListResponseDetail } from '@/services'
import { GetTemplateAdornWebEnterpriseFindShopListResponseDetail } from '@/services/TemplateApi'
import { PublicApi } from '@/services/api'
import { filterProps } from '../../../../utils'
import styles from './index.less'
......@@ -33,7 +33,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
const { templateid, categoryid, shopsList = [] } = props
const [current, setCurrent] = useState<number>(1)
const [pageSize, setPageSize] = useState<number>(10)
const [noSelectShops, setNoSelectShops] = useState<GetTemplatePlatformFindShopListResponseDetail[]>([])
const [noSelectShops, setNoSelectShops] = useState<GetTemplateAdornWebEnterpriseFindShopListResponseDetail[]>([])
const [selectList, setSelectList] = useState<any>([])
const [selectShopsList, setSelectShopsList] = useState<any>(shopsList)
const [shopsIds, setShopsIds] = useState<any>([])
......@@ -56,7 +56,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
param = Object.assign(param, filterParam)
}
PublicApi.getTemplatePlatformFindShopList(param).then((res: any) => {
PublicApi.getTemplateAdornWebEnterpriseFindShopList(param).then((res: any) => {
if (res.code === 1000) {
const dataInfo = res.data
setTotalCount(dataInfo.totalCount)
......@@ -160,7 +160,7 @@ const ShopSetting: React.FC<ShopSettingPropsType> = (props) => {
ids.push(item.shopId)
}
param.shopIds = ids
PublicApi.postTemplatePlatformSaveShop(param).then(res => {
PublicApi.postTemplateAdornWebEnterpriseSaveShop(param).then(res => {
if (res.code === 1000) {
resolve()
} else {
......
src/pages/platformSettlement/corporateAccount/index.tsx
View file @ e86e7d0d
......@@ -25,7 +25,7 @@ interface Config {
const ItemRender: React.FC<Config> = (props) => {
const { isEdit, name, canEdit, value, image, changeEdit, pattern, message } = props;
const [validError, setValidError] = useState(false);
const [validError, setValidError] = useState(false);
// const [inputValue, setInputValue] = useState(value);
const handleClick = (name:string) => {
changeEdit(name, { isEdit: true }, 'change')
......@@ -47,7 +47,7 @@ const ItemRender: React.FC<Config> = (props) => {
// 确定提交
const handleConfirm = (name: string) => {
if(validError) {
return
return
}
changeEdit(name, { isEdit: false }, 'confirm');
}
......@@ -63,7 +63,7 @@ const ItemRender: React.FC<Config> = (props) => {
{isEdit ? <Input value={value} style={{width: '300px'}} onChange={(e) => handleChange(e.target.value, name)}/> : value}
</div>
{
canEdit
canEdit
? !isEdit
? <div className={styles.edit} style={{width: '300px'}} onClick={() => handleClick(name)} >
<FormOutlined />
......@@ -84,7 +84,11 @@ const ItemRender: React.FC<Config> = (props) => {
)
}
const PARAM_TO_TYPE = {
name: 1,
bankAccount: 2,
bankDeposit: 3,
}
const CorporateAccount = () => {
const [configs, setConfigs] = useState<Config[]>([]);
const [datas, setDatas] = useState<any>({});
......@@ -112,15 +116,10 @@ const CorporateAccount = () => {
} else if(type == 'confirm') {
setUnsaved(false);
const postData = {
...datas,
[target.dataIndex]: target.value
}
///settle/accounts/platform/config/updatePlatformAccountConfig
PublicApi.postSettleAccountsPlatformConfigUpdatePlatformAccountConfig(postData)
PublicApi.postSettleAccountsPlatformConfigUpdatePlatformAccountConfigDetail({itemValue: target.value, itemType: PARAM_TO_TYPE[target.dataIndex]})
.then((data) => {
if(data.code == 1000) {
setDatas(postData);
// setDatas(postData);
temp[index] = {
...target,
...res,
......@@ -130,9 +129,7 @@ const CorporateAccount = () => {
}
})
}
}
useEffect(() => {
......@@ -188,11 +185,11 @@ const CorporateAccount = () => {
return (
<ItemRender key={item.name} {...item} changeEdit={changeEdit} />
)
})
})
}
<Prompt when={unsaved} message="信息还未保存，确定离开吗？"></Prompt>
</div>
)
}
export default CorporateAccount
\ No newline at end of file
export default CorporateAccount
src/pages/ruleSettingManage/platformSettlementStrategy/info/index.tsx
View file @ e86e7d0d
......@@ -40,26 +40,26 @@ const formActions = createFormActions();
const common_columns: any = [
{ title: 'ID', dataIndex: 'memberId' },
{
title: '会员名称',
dataIndex: 'name',
{
title: '会员名称',
dataIndex: 'name',
render: (text: string, record: any) => {
return record.name || record.memberName
}
},
{ title: '会员类型', dataIndex: 'memberTypeName' },
{ title: '会员角色', dataIndex: 'roleName' },
{
title: '会员等级',
dataIndex: 'levelTag',
{
title: '会员等级',
dataIndex: 'levelTag',
render: (text: string, record: any) => {
return record.levelTag || record.levelName
}
}
},
]
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();
......@@ -69,28 +69,28 @@ const MemberSettleAdd: React.FC = () => {
const tableAddButton = () => {
return (
<div>
<Button
onClick={() => setVisible(true)}
style={{marginBottom: 16}}
block
icon={<PlusOutlined/>}
<Button
onClick={() => setVisible(true)}
style={{marginBottom: 16}}
block
icon={<PlusOutlined/>}
type='dashed'
>
选择适用会员
</Button>
</Button>
</div>
)
}
const columns = common_columns.concat(
[
{
title: '操作',
{
title: '操作',
render: (text, record) => {
return (
<a onClick={() => handleRemove(record.memberId)}>删除</a>
<a onClick={() => handleRemove(record.uniqueId)}>删除</a>
)
}
}
}
]
);
......@@ -102,17 +102,19 @@ 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 [];
}
// 获取适用会员下拉搜索框
const fetchMemberSearchFilter = () => {
const linkage = useLinkageUtils();
onFormInit$().subscribe(() => {
PublicApi.getMemberManagePageitems({roleTypeEnum: '1'}).then(res => {
if(res.code === 1000) {
......@@ -135,8 +137,8 @@ const MemberSettleAdd: React.FC = () => {
// 提交
const handleSubmit = (value) => {
const memberList = value.someLists.map((item) => (
{
memberId: item.memberId,
{
memberId: item.memberId,
roleId: item.roleId,
}
)
......@@ -153,8 +155,8 @@ const MemberSettleAdd: React.FC = () => {
const serviceActions = isAdd
? PublicApi.postSettleAccountsPlatformConfigAddPlatformSettlementStrategy
: PublicApi.postSettleAccountsPlatformConfigUpdatePlatformSettlementStrategy
const postData = {...tempData, id: id || 0 }
const postData = {...tempData, id: id || 0 }
console.log(postData)
setSubmitLoading(true);
setUnsaved(false);
......@@ -175,14 +177,14 @@ 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))
}
// 从PAAS平台--规则配置--平台规则配置取已勾选的结算方式决定是否显示结算方式
const fetchBalancedMethods = async () => {
const { data } = await PublicApi.getManageRuleConfigurationList({platformType: '5'});
......@@ -218,18 +220,17 @@ const MemberSettleAdd: React.FC = () => {
active: res.data.settlementWay,
otherValues: [res.data.settlementDays, res.data.settlementDate],
},
})
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();
}
......@@ -256,13 +257,13 @@ const MemberSettleAdd: React.FC = () => {
schema={addSchema}
effects={() => {
// 获取单据类型
useAsyncSelect(
"settlementOrderType",
useAsyncSelect(
"settlementOrderType",
fetchOptions(PublicApi.getSettleAccountsCommonGetPlatformStrategySettlementOrderType )
)
}}
/>
<ModalTable
modalTitle='选择适用会员'
confirm={handleOkAddMember}
......@@ -272,12 +273,12 @@ const MemberSettleAdd: React.FC = () => {
rowSelection={memberRowSelection}
fetchTableData={params => fetchMemberData(params)}
tableProps={{
rowKey: 'memberId',
rowKey: 'uniqueId',
}}
width={1000}
formilyProps={
{
ctx: {
ctx: {
schema: memberSchema,
actions: formActions,
components: { ModalSearch: Search, SearchSelect, Submit } ,
......@@ -300,4 +301,4 @@ const MemberSettleAdd: React.FC = () => {
)
}
export default MemberSettleAdd
\ No newline at end of file
export default MemberSettleAdd
src/pages/ruleSettingManage/platformSettlementStrategy/info/schema.tsx
View file @ e86e7d0d
......@@ -2,7 +2,7 @@ import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const';
/**
* 新增会员结算策略schema
*
*
*/
export const addSchema: ISchema = {
......@@ -114,7 +114,7 @@ export const addSchema: ISchema = {
},
'x-component': 'MultTable',
'x-component-props': {
rowKey: 'memberId',
rowKey: 'uniqueId',
prefix: "{{tableAddButton}}",
columns: "{{tableColumns}}"
// columns: "{{tableColumns}}",
......@@ -192,4 +192,4 @@ export const memberSchema: ISchema = {
}
}
}
}
\ No newline at end of file
}
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