diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index d1fc4a2..148e39d 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -287,7 +287,7 @@ const useCommonModelEvent = props => { let result = {}; if(!noGetData && sModelsId === '17211911815017669983448000'){ result = await handleGetDataPop(tableList, true, true) - } else if (!commonUtils.isEmptyObject(copyTo) && !refreshCount) { + } else if (!commonUtils.isEmptyObject(copyTo)) { result = await handleGetData(tableList, true, true); } else if (noGetData) { result = await handleGetData( @@ -2627,7 +2627,7 @@ const CommonTableComponent = props => { else if (color === 'M' && item.mPlateNum !== undefined) plateNum = item.mPlateNum; else if (color === 'Y' && item.yPlateNum !== undefined) plateNum = item.yPlateNum; else if (color === 'K' && item.kPlateNum !== undefined) plateNum = item.kPlateNum; - + processedColorList.push({ ...item, sId: `${item.sId}_${color}`, // 生成唯一ID