Commit 2387ce333ca8573f72cfcc6de2b3ead577a1e9b8
1 parent
04914a91
调机开始按钮隐藏
Showing
2 changed files
with
4 additions
and
2 deletions
src/mes/common/commonOperationBarComponent/index.js
| @@ -840,7 +840,7 @@ const useCommonOperationBarComponentEvent = props => { | @@ -840,7 +840,7 @@ const useCommonOperationBarComponentEvent = props => { | ||
| 840 | style.color = "#000"; | 840 | style.color = "#000"; |
| 841 | defaultProps.style = style; | 841 | defaultProps.style = style; |
| 842 | } | 842 | } |
| 843 | - if (config.btnBgColor) { | 843 | + if (config.sControlName.includes('setUpStart') && config.showName === '调机结束') { |
| 844 | const { style = {} } = defaultProps; | 844 | const { style = {} } = defaultProps; |
| 845 | style.backgroundColor = config.btnBgColor; | 845 | style.backgroundColor = config.btnBgColor; |
| 846 | style.borderColor = config.btnBgColor; | 846 | style.borderColor = config.btnBgColor; |
src/mes/productionExec/productionExecMain/index.js
| @@ -559,9 +559,11 @@ const ProductionExecContentByType = props => { | @@ -559,9 +559,11 @@ const ProductionExecContentByType = props => { | ||
| 559 | !deviceTargetInfoData[0]?.sStatus | 559 | !deviceTargetInfoData[0]?.sStatus |
| 560 | ) | 560 | ) |
| 561 | return; | 561 | return; |
| 562 | - const { globalData } = props?.app | 562 | + const { globalData, userinfo } = props?.app |
| 563 | const { currentWorkOrderInfo } = globalData || {} | 563 | const { currentWorkOrderInfo } = globalData || {} |
| 564 | const { dAdjustOrRun } = currentWorkOrderInfo || {} | 564 | const { dAdjustOrRun } = currentWorkOrderInfo || {} |
| 565 | + const { bAdjust } = userinfo || {} | ||
| 566 | + if (bAdjust === 0) return | ||
| 565 | // const sStatusNameValue = dAdjustOrRun === 0 | 567 | // const sStatusNameValue = dAdjustOrRun === 0 |
| 566 | // ? 0 | 568 | // ? 0 |
| 567 | // : 1; | 569 | // : 1; |