diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx index 7bb9c5ad..3b5f72d7 100644 --- a/src/components/estimate/Estimate.jsx +++ b/src/components/estimate/Estimate.jsx @@ -1105,13 +1105,34 @@ export default function Estimate({ params }) {
{specialNoteList.map((row) => { if (row.code === showContentCode) { - return ( -
-
{row.codeNm}
- {/*
*/} -
-
- ) + let showcontent = popShowSpecialNoteList.find((item) => { + return item.code === showContentCode + }) + + if (isObjectNotEmpty(showcontent)) { + return ( +
+
{showcontent.codeNm}
+
+
+ ) + } else { + let pushData = [] + popShowSpecialNoteList.map((item) => { + let option = showContentCode.split(',') + option.map((item2) => { + if (item.code === item2) { + pushData.push(item) + } + }) + }) + return pushData.map((item) => ( +
+
{item.codeNm}
+
+
+ )) + } } })}