diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js index fef4cbf..8313bae 100644 --- a/src/mes/common/commonOperationBarComponent/index.js +++ b/src/mes/common/commonOperationBarComponent/index.js @@ -982,10 +982,16 @@ const CommonOperationBarComponent = basProps => { if (btnLeftConfig.length !== 0) { btnLeftConfig[0].btnBgColor = "red"; } - - const btnRightConfig = gdsconfigformslave.filter( - item => item.bVisible && item.sControlName.includes("BtnRight.") - ); + const bManual = props.bManual; + const btnRightConfig = gdsconfigformslave.filter(item => { + // 排除条件:sControlName是BtnRight.BtnEnventInsertWork且bManual=1的项 + const isExcludeItem = item.sControlName === 'BtnRight.BtnEnventInsertWork' && !bManual; + // 保留条件:不是排除项,且满足原有过滤规则 + return !isExcludeItem && item.bVisible && item.sControlName.includes('BtnRight.'); + }); + // const btnRightConfig = gdsconfigformslave.filter( + // item => item.bVisible && item.sControlName.includes("BtnRight.") + // ); if (!searchField && !btnRightConfig.length) return "";