@@ -33,6 +33,7 @@ export default function Index() { | |||
//门店 | |||
const [storeIdArray, setStoreIdArray] = useState(""); | |||
const [storeSelect, setStoreSelect] = useState([]); | |||
const [storeList, setStoreList] = useState([]); | |||
//商品 | |||
const [goodsIdArray, setGoodsIdArray] = useState([]); | |||
const [goodsIdSelect, setGoodsIdSelect] = useState([]); | |||
@@ -52,9 +53,9 @@ export default function Index() { | |||
dataIndex: 'storeId', | |||
key: 'storeId', | |||
render: (text) => { | |||
const findGoods = storeSelect.find(item => item.id === text); | |||
const findGoods = storeList.find(item => item.key === text); | |||
if (findGoods) { | |||
return <span>{findGoods.name}</span> | |||
return <span>{findGoods.title}</span> | |||
} else { | |||
return <span>暂无门店名称</span> | |||
} | |||
@@ -123,10 +124,11 @@ export default function Index() { | |||
*/ | |||
const onQueryStoreList = async () => { | |||
setShowLoading(true); | |||
const response = await costSalesAPI.gettree({}); | |||
const response = await costSalesAPI.gettree(); | |||
setShowLoading(false); | |||
if (response.statusCode === 200) { | |||
setStoreSelect(response.data); | |||
setStoreList(treeArrayToFlat(response.data)); | |||
} else { | |||
message.error('查询店铺列表失败'); | |||
} | |||
@@ -135,7 +137,7 @@ export default function Index() { | |||
//查询商品列表 | |||
const onQueryGoodsList = async () => { | |||
setShowLoading(true); | |||
const response = await costSalesAPI.goodsList({}); | |||
const response = await costSalesAPI.goodsList(); | |||
setShowLoading(false); | |||
if (response.statusCode === 200) { | |||
setGoodsIdSelect(response.data); | |||
@@ -147,7 +149,7 @@ export default function Index() { | |||
//查询商品分类类型列表 | |||
const onQueryGoodsType = async () => { | |||
setShowLoading(true); | |||
const response = await costSalesAPI.goodsTypeList({}); | |||
const response = await costSalesAPI.goodsTypeList(); | |||
setShowLoading(false); | |||
if (response.statusCode === 200) { | |||
setGoodsTypeSelect(response.data); | |||
@@ -167,6 +169,18 @@ export default function Index() { | |||
]); | |||
} | |||
//树形数据扁平化 | |||
const treeArrayToFlat = (tree, arr = []) => { | |||
tree.forEach(item => { | |||
const { children, ...props } = item; | |||
arr.push(props); | |||
if (children && children.length > 0) { | |||
treeArrayToFlat(children, arr); | |||
} | |||
}); | |||
return arr; | |||
} | |||
useEffect(() => { | |||
onQueryReportSalescost(); | |||
onQueryStoreList(); | |||
@@ -35,6 +35,7 @@ export default function Index() { | |||
//门店 | |||
const [storeIdArray, setStoreIdArray] = useState([]); | |||
const [storeSelect, setStoreSelect] = useState([]); | |||
const [storeList, setStoreList] = useState([]); | |||
const columns = [ | |||
{ | |||
@@ -42,13 +43,12 @@ export default function Index() { | |||
dataIndex: 'storeId', | |||
key: 'storeId', | |||
render: (text) => { | |||
const findGoods = storeSelect.find(item => item.id === text); | |||
const findGoods = storeList.find(item => item.key === text); | |||
if (findGoods) { | |||
return <span>{findGoods.name}</span> | |||
return <span>{findGoods.title}</span> | |||
} else { | |||
return <span>暂无门店名称</span> | |||
} | |||
}, | |||
}, | |||
{ | |||
@@ -92,6 +92,7 @@ export default function Index() { | |||
setShowLoading(false); | |||
if (response.statusCode === 200) { | |||
setStoreSelect(response.data); | |||
setStoreList(treeArrayToFlat(response.data)); | |||
} else { | |||
message.error('查询店铺列表失败'); | |||
} | |||
@@ -106,6 +107,18 @@ export default function Index() { | |||
]); | |||
} | |||
//树形数据扁平化 | |||
const treeArrayToFlat = (tree, arr = []) => { | |||
tree.forEach(item => { | |||
const { children, ...props } = item; | |||
arr.push(props); | |||
if (children && children.length > 0) { | |||
treeArrayToFlat(children, arr); | |||
} | |||
}); | |||
return arr; | |||
} | |||
useEffect(() => { | |||
onQueryReportSalescost(); | |||
onQueryStoreList(); | |||
@@ -33,6 +33,7 @@ export default function Index() { | |||
//门店 | |||
const [storeIdArray, setStoreIdArray] = useState(""); | |||
const [storeSelect, setStoreSelect] = useState([]); | |||
const [storeList, setStoreList] = useState([]); | |||
//商品 | |||
const [goodsIdArray, setGoodsIdArray] = useState([]); | |||
const [goodsIdSelect, setGoodsIdSelect] = useState([]); | |||
@@ -46,13 +47,12 @@ export default function Index() { | |||
dataIndex: 'storeId', | |||
key: 'storeId', | |||
render: (text) => { | |||
const findGoods = storeSelect.find(item => item.id === text); | |||
const findGoods = storeList.find(item => item.key === text); | |||
if (findGoods) { | |||
return <span>{findGoods.name}</span> | |||
return <span>{findGoods.title}</span> | |||
} else { | |||
return <span>暂无门店名称</span> | |||
} | |||
}, | |||
}, | |||
{ | |||
@@ -112,6 +112,7 @@ export default function Index() { | |||
setShowLoading(false); | |||
if (response.statusCode === 200) { | |||
setStoreSelect(response.data); | |||
setStoreList(treeArrayToFlat(response.data)); | |||
} else { | |||
message.error('查询店铺列表失败'); | |||
} | |||
@@ -152,6 +153,18 @@ export default function Index() { | |||
]); | |||
} | |||
//树形数据扁平化 | |||
const treeArrayToFlat = (tree, arr = []) => { | |||
tree.forEach(item => { | |||
const { children, ...props } = item; | |||
arr.push(props); | |||
if (children && children.length > 0) { | |||
treeArrayToFlat(children, arr); | |||
} | |||
}); | |||
return arr; | |||
} | |||
useEffect(() => { | |||
onQueryReportSalescost(); | |||
onQueryStoreList(); | |||