Commit 837238b192ce18a1149346e141390823b45c4884
1 parent
8a5bbbf3
扫脸限制人员重复扫
Showing
2 changed files
with
4 additions
and
5 deletions
src/components/Common/CommonTable/index.js
| @@ -4862,7 +4862,6 @@ class CommonTableRc extends React.Component { | @@ -4862,7 +4862,6 @@ class CommonTableRc extends React.Component { | ||
| 4862 | }} | 4862 | }} |
| 4863 | loading={bLoading} | 4863 | loading={bLoading} |
| 4864 | onClick={e => { | 4864 | onClick={e => { |
| 4865 | - console.log("🚀 ~ CommonTableRc ~ e:", e) | ||
| 4866 | e.stopPropagation(); /* 阻止父级穿透 */ | 4865 | e.stopPropagation(); /* 阻止父级穿透 */ |
| 4867 | const onTempTableBtnClick = nextProps => { | 4866 | const onTempTableBtnClick = nextProps => { |
| 4868 | props.onTableBtnClick && | 4867 | props.onTableBtnClick && |
src/mes/common/commonOperationBarComponent/MesToolbar.js
| @@ -1059,9 +1059,9 @@ const handleScanFace = (props) => { | @@ -1059,9 +1059,9 @@ const handleScanFace = (props) => { | ||
| 1059 | proData.forEach(item => { | 1059 | proData.forEach(item => { |
| 1060 | const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item) | 1060 | const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item) |
| 1061 | const index = tableData.findIndex(x => x.sEmployeeNo === item.sEmployeeNo) | 1061 | const index = tableData.findIndex(x => x.sEmployeeNo === item.sEmployeeNo) |
| 1062 | - // if (index !== -1) { | ||
| 1063 | - // message.error('人员重复,请重新添加', 5) | ||
| 1064 | - // } else { | 1062 | + if (index !== -1) { |
| 1063 | + message.error('人员重复,请重新添加', 5) | ||
| 1064 | + } else { | ||
| 1065 | tableData.push({ | 1065 | tableData.push({ |
| 1066 | ...item, | 1066 | ...item, |
| 1067 | ...data, | 1067 | ...data, |
| @@ -1070,7 +1070,7 @@ const handleScanFace = (props) => { | @@ -1070,7 +1070,7 @@ const handleScanFace = (props) => { | ||
| 1070 | sParentId: props.masterData.sId, | 1070 | sParentId: props.masterData.sId, |
| 1071 | slaveId: props?.slaveData ? props?.slaveData[0].sId : '' | 1071 | slaveId: props?.slaveData ? props?.slaveData[0].sId : '' |
| 1072 | }) | 1072 | }) |
| 1073 | - // } | 1073 | + } |
| 1074 | 1074 | ||
| 1075 | }); | 1075 | }); |
| 1076 | 1076 |