This commit is contained in:
1 parent
448a799223
commit
c037de727c
9 files changed
+56
-59
No files matched your search
@@ -27,6 +27,7 @@
|
||||
</el-row>
|
||||
<el-table
|
||||
ref="spuMultipleTableRef"
|
||||
border
|
||||
:data="spuDataList"
|
||||
v-loading="spuListLoading"
|
||||
:row-key="(row:any) => row.id"
|
||||
@@ -34,7 +35,7 @@
|
||||
@row-click="rowClick"
|
||||
:row-style="{ cursor: 'pointer' }"
|
||||
>
|
||||
<el-table-column type="selection" width="40" fixed="left" align="center" />
|
||||
<el-table-column type="selection" width="50" fixed="left" align="center" />
|
||||
<el-table-column type="index" label="#" width="50" fixed="left" align="center" />
|
||||
<el-table-column prop="productName" label="商品名称" min-width="150px" align="center" show-overflow-tooltip />
|
||||
<el-table-column prop="picUrl" label="封面图" align="center" show-overflow-tooltip>
|
||||
@@ -45,18 +46,17 @@
|
||||
<!-- <el-table-column prop="barcode" label="自编码/条码" min-width="150px" align="center" show-overflow-tooltip /> -->
|
||||
<el-table-column prop="stock" label="库存" min-width="80px" align="center" show-overflow-tooltip />
|
||||
<el-table-column prop="productCode" label="货号" min-width="100px" align="center" show-overflow-tooltip />
|
||||
<!-- <el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>-->
|
||||
<!-- <template #default="scope">-->
|
||||
<!-- {{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<!-- <el-table-column prop="brandId" label="品牌" min-width="100px" align="center" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="categoryId" label="分类" min-width="100px" align="center" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column prop="deptId" label="商户" min-width="100px" align="center" show-overflow-tooltip /> -->
|
||||
<el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip />
|
||||
</el-table-column> -->
|
||||
<!-- <el-table-column prop="supplierId" label="货商" min-width="100px" align="center" show-overflow-tooltip /> -->
|
||||
<el-table-column prop="status" label="状态" min-width="100px" align="center" show-overflow-tooltip>
|
||||
<template #default="scope">
|
||||
<dict-tag :options="status" :value="scope.row.status" />
|
||||
@@ -129,14 +129,11 @@ const getDataListAndSelect = async () => {
|
||||
// 清空表格数据后重新设置
|
||||
nextTick(() => {
|
||||
// 合并当前页面数据中的已选行和之前保存的已选行
|
||||
const rowsToSelect = [
|
||||
// ...currentSelectedRows,
|
||||
...props.selectedSpuRows.filter((row) => spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
|
||||
]
|
||||
const rowsToSelect = [...props.selectedSpuRows.filter((row) => spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId))]
|
||||
// 去重
|
||||
const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpSpuId, row])).values())
|
||||
// const uniqueRowsToSelect = Array.from(new Map(rowsToSelect.map((row) => [row.erpSpuId, row])).values())
|
||||
// 为匹配的行设置选中状态
|
||||
uniqueRowsToSelect.forEach((row) => {
|
||||
rowsToSelect.forEach((row) => {
|
||||
const targetRow = spuDataList.value.find((item) => item.erpSpuId === row.erpSpuId)
|
||||
targetRow && spuMultipleTableRef.value?.toggleRowSelection(targetRow, true)
|
||||
})
|
||||
@@ -183,14 +180,14 @@ const handleSelectDialogConfirm = () => {
|
||||
...props.selectedSpuRows.filter((row) => !spuDataList.value.some((item) => item.erpSpuId === row.erpSpuId)),
|
||||
]
|
||||
// 去重
|
||||
const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpSpuId, row])).values())
|
||||
// const uniqueSelectedRows = Array.from(new Map(allSelectedRows.map((row) => [row.erpSpuId, row])).values())
|
||||
|
||||
emit("getSelectedSpuRows", uniqueSelectedRows)
|
||||
emit("getSelectedSpuRows", allSelectedRows)
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// 获取商品分类
|
||||
onMounted(async () => {
|
||||
// // 获取商品分类
|
||||
// try {
|
||||
// const res = await getSupermarketCategory()
|
||||
// supermarketCategory.value = res.data
|
||||
|
||||
Reference in new issue
Block a user