diff --git a/src/components/Manufacture/CommonPackEvent.js b/src/components/Manufacture/CommonPackEvent.js index f5939c2..53741a7 100644 --- a/src/components/Manufacture/CommonPackEvent.js +++ b/src/components/Manufacture/CommonPackEvent.js @@ -1161,11 +1161,23 @@ const CommonPackEvent = props => { }); } + const filterProductData = data.filter(item => item.sType === '3'); + + if (commonUtils.isNotEmptyArr(filterProductData)) { + filterProductData.forEach((item, iIndex) => { + item.iOrder = iIndex + 1; + const iFilterIndex = commonUtils.isNotEmptyArr(allData) ? allData.findIndex(row => item.sId === row.sId) : -1; + if (iFilterIndex > -1) { + allData[iFilterIndex] = { ...item, iOrder: iIndex + 20000 }; + } + }); + } + /* 找到所属控制表的iOrder * 10000 */ allData.forEach((item, iIndex) => { const iControlIndex = commonUtils.isNotEmptyArr(controlData) ? controlData.findIndex(row => item.sControlId === row.sId) : -1; if (iControlIndex > -1) { - const iControlOrder = controlData[iControlIndex].iOrder * 10000; + const iControlOrder = controlData[iControlIndex].iOrder * 100; allData[iIndex].iControlOrder = iControlOrder; allData[iIndex].iOrder = iControlOrder + item.iOrder; }