Commit 4e7848fc8c02b2cf3d44de7182e4ab7382107fd4
1 parent
8cea5809
手工上报展示按钮
Showing
1 changed file
with
10 additions
and
4 deletions
src/mes/common/commonOperationBarComponent/index.js
| @@ -982,10 +982,16 @@ const CommonOperationBarComponent = basProps => { | @@ -982,10 +982,16 @@ const CommonOperationBarComponent = basProps => { | ||
| 982 | if (btnLeftConfig.length !== 0) { | 982 | if (btnLeftConfig.length !== 0) { |
| 983 | btnLeftConfig[0].btnBgColor = "red"; | 983 | btnLeftConfig[0].btnBgColor = "red"; |
| 984 | } | 984 | } |
| 985 | - | ||
| 986 | - const btnRightConfig = gdsconfigformslave.filter( | ||
| 987 | - item => item.bVisible && item.sControlName.includes("BtnRight.") | ||
| 988 | - ); | 985 | + const bManual = props.bManual; |
| 986 | + const btnRightConfig = gdsconfigformslave.filter(item => { | ||
| 987 | + // 排除条件:sControlName是BtnRight.BtnEnventInsertWork且bManual=1的项 | ||
| 988 | + const isExcludeItem = item.sControlName === 'BtnRight.BtnEnventInsertWork' && !bManual; | ||
| 989 | + // 保留条件:不是排除项,且满足原有过滤规则 | ||
| 990 | + return !isExcludeItem && item.bVisible && item.sControlName.includes('BtnRight.'); | ||
| 991 | + }); | ||
| 992 | + // const btnRightConfig = gdsconfigformslave.filter( | ||
| 993 | + // item => item.bVisible && item.sControlName.includes("BtnRight.") | ||
| 994 | + // ); | ||
| 989 | 995 | ||
| 990 | if (!searchField && !btnRightConfig.length) return ""; | 996 | if (!searchField && !btnRightConfig.length) return ""; |
| 991 | 997 |