diff --git a/src/pages/sampleCutting/sampleCuttingList/index.module.scss b/src/pages/sampleCutting/sampleCuttingList/index.module.scss index 429fe8f..a394e7c 100644 --- a/src/pages/sampleCutting/sampleCuttingList/index.module.scss +++ b/src/pages/sampleCutting/sampleCuttingList/index.module.scss @@ -84,7 +84,7 @@ page { flex-flow: column nowrap; } .addButton { - width: 30%; + width: 250px; display: flex; justify-content: flex-end; align-items: center; diff --git a/src/pages/sampleCutting/sampleCuttingList/index.tsx b/src/pages/sampleCutting/sampleCuttingList/index.tsx index 2f8da32..f3abf1e 100644 --- a/src/pages/sampleCutting/sampleCuttingList/index.tsx +++ b/src/pages/sampleCutting/sampleCuttingList/index.tsx @@ -169,6 +169,10 @@ const SampleCuttingList = () => { const [show, setShow] = useState(false) const onClose = () => { + const index = multipleSelection.current.findIndex(mul => mul.product_id === currentSelect.current.id) + if (index !== -1) { + multipleSelection.current[index].multipleSelection = productMultipleSelection + } setShow(false) setProductMultipleSelection([]) } @@ -197,9 +201,6 @@ const SampleCuttingList = () => { } } - const handleClose = () => { - onClose() - } const handleAddProduct = () => { const index = multipleSelection.current.findIndex(mul => mul.product_id === currentSelect.current.id) if (index !== -1) { @@ -212,7 +213,8 @@ const SampleCuttingList = () => { multipleSelection: productMultipleSelection, }) } - onClose() + setShow(false) + setProductMultipleSelection([]) } const [productMultipleSelection, setProductMultipleSelection] = useState([]) @@ -263,7 +265,7 @@ const SampleCuttingList = () => { onClick={() => handleClickAddButton(item)} > { - isAdd?.includes(item.id) || multipleSelection.current.some(mul => mul.product_id === item.id) ? '继续添加' : '添加' + isAdd?.includes(item.id) || multipleSelection.current.find(mul => mul.product_id === item.id)?.multipleSelection.length ? '继续添加' : '添加' } @@ -335,7 +337,7 @@ const SampleCuttingList = () => { round plain customStyles={{ width: '48%' }} - onClick={handleClose} + onClick={onClose} > 取消