From dccb02bf972edf6ffe790241ff0477e8e44021d5 Mon Sep 17 00:00:00 2001
From: by1642146903 <1642146903@qq.com>
Date: Sun, 30 Oct 2022 15:12:15 +0800
Subject: [PATCH] 订件
---
src/pages/pms/comonents/PartModal.tsx | 16 +++++++++-------
src/pages/pms/comonents/SupplierModal.tsx | 10 +++++-----
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/pages/pms/comonents/PartModal.tsx b/src/pages/pms/comonents/PartModal.tsx
index b952cc7..f0b07b2 100644
--- a/src/pages/pms/comonents/PartModal.tsx
+++ b/src/pages/pms/comonents/PartModal.tsx
@@ -33,7 +33,7 @@ export default function Index({ onCancel, visible, parts=[], onOk }: Props) {
}
const handleChange = debounce((value) => {
- setPartList(partList.filter(it => {
+ setPartList(parts.filter(it => {
return (it.partCode || '').includes(value)
|| (it.partName || '').includes(value)
|| (it.supplierName || '').includes(value);
@@ -74,9 +74,9 @@ export default function Index({ onCancel, visible, parts=[], onOk }: Props) {
pagination={false}
rowSelection={{
type: "checkbox",
- selectedRowKeys: selectedParts.map(part => part.partCode || ''),
+ selectedRowKeys: selectedParts.map(part => `${part.partCode}-${part.storageId}`),
onSelect: (row: PartVO, _selected: boolean) => {
- const index = selectedParts.findIndex(_row => _row.partCode == row.partCode);
+ const index = selectedParts.findIndex(_row => _row.partCode == row.partCode && _row.storageId == row.storageId);
let newData = [...selectedParts];
if (_selected) {
newData.unshift(row);
@@ -86,23 +86,25 @@ export default function Index({ onCancel, visible, parts=[], onOk }: Props) {
setSelectedParts([...newData]);
},
onSelectAll: (selected, selectedRows, changeRows) => {
- const changedKeys = changeRows.map(row => row.partCode);
+ const changedKeys = changeRows.map(row => `${row.partCode}-${row.storageId}`);
let newData = [...selectedParts];
// 全选
if (selected) {
// 过滤掉已选的
- newData = selectedParts.concat(changeRows.filter(row => !selectedParts.some(item => item.partCode == row.partCode)),);
+ newData = selectedParts.concat(changeRows.filter(row => !selectedParts.some(item => item.partCode == row.partCode && item.storageId == row.storageId)),);
} else {
// 全不选 - 去掉已选的
- newData = selectedParts.filter(row => !changedKeys.includes(row.partCode));
+ newData = selectedParts.filter(row => !changedKeys.includes(`${row.partCode}-${row.storageId}`));
}
setSelectedParts(newData);
},
}}
- rowKey={(record) => `${record.partCode}`}
+ rowKey={(record) => `${record.partCode}-${record.storageId}`}
>
+
+
diff --git a/src/pages/pms/comonents/SupplierModal.tsx b/src/pages/pms/comonents/SupplierModal.tsx
index 5ecd1c2..04682f5 100644
--- a/src/pages/pms/comonents/SupplierModal.tsx
+++ b/src/pages/pms/comonents/SupplierModal.tsx
@@ -96,7 +96,7 @@ export default function Index({ onCancel, brandId, visible, parts = [], onOk, su
dataSource={selectedParts}
pagination={false}
scroll={{y: 600}}
- rowKey="partCode"
+ rowKey={(t, _) => `${t.partCode}-${t.storageId}`}
>
@@ -107,7 +107,7 @@ export default function Index({ onCancel, brandId, visible, parts = [], onOk, su
(
- setSelectedParts(selectedParts.filter(i => i.partCode != _item.partCode))}>
+ setSelectedParts(selectedParts.filter(i => i.partCode != _item.partCode || i.storageId != _item.storageId))}>
删除
)}
@@ -116,10 +116,10 @@ export default function Index({ onCancel, brandId, visible, parts = [], onOk, su
setVisiblePart(false)}
- parts={partData.filter(it => !selectedParts.map(i => i.partCode).includes(it.partCode))}
+ parts={partData.filter(it => !selectedParts.map(i => `${i.partCode}-${i.storageId}`).includes(`${it.partCode}-${it.storageId}`))}
onOk={(ps=[]) => {
- const ids = [...selectedParts, ...ps].map(it => it.partCode);
- setSelectedParts(parts.filter(it => ids.includes(it.partCode)));
+ const ids = [...selectedParts, ...ps].map(it => `${it.partCode}-${it.storageId}`);
+ setSelectedParts(parts.filter(it => ids.includes(`${it.partCode}-${it.storageId}`)));
}}
/>
--
libgit2 0.22.2