diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 424e125..cf9544a 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -4862,7 +4862,6 @@ class CommonTableRc extends React.Component { }} loading={bLoading} onClick={e => { - console.log("🚀 ~ CommonTableRc ~ e:", e) e.stopPropagation(); /* 阻止父级穿透 */ const onTempTableBtnClick = nextProps => { props.onTableBtnClick && diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js index 87e5fb4..beb733b 100644 --- a/src/mes/common/commonOperationBarComponent/MesToolbar.js +++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js @@ -1059,9 +1059,9 @@ const handleScanFace = (props) => { proData.forEach(item => { const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item) const index = tableData.findIndex(x => x.sEmployeeNo === item.sEmployeeNo) - // if (index !== -1) { - // message.error('人员重复,请重新添加', 5) - // } else { + if (index !== -1) { + message.error('人员重复,请重新添加', 5) + } else { tableData.push({ ...item, ...data, @@ -1070,7 +1070,7 @@ const handleScanFace = (props) => { sParentId: props.masterData.sId, slaveId: props?.slaveData ? props?.slaveData[0].sId : '' }) - // } + } });