diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js index b9dd725..9e54a4e 100644 --- a/src/mes/common/commonOperationBarComponent/index.js +++ b/src/mes/common/commonOperationBarComponent/index.js @@ -840,7 +840,7 @@ const useCommonOperationBarComponentEvent = props => { style.color = "#000"; defaultProps.style = style; } - if (config.btnBgColor) { + if (config.sControlName.includes('setUpStart') && config.showName === '调机结束') { const { style = {} } = defaultProps; style.backgroundColor = config.btnBgColor; style.borderColor = config.btnBgColor; diff --git a/src/mes/productionExec/productionExecMain/index.js b/src/mes/productionExec/productionExecMain/index.js index eded197..5a01215 100644 --- a/src/mes/productionExec/productionExecMain/index.js +++ b/src/mes/productionExec/productionExecMain/index.js @@ -559,9 +559,11 @@ const ProductionExecContentByType = props => { !deviceTargetInfoData[0]?.sStatus ) return; - const { globalData } = props?.app + const { globalData, userinfo } = props?.app const { currentWorkOrderInfo } = globalData || {} const { dAdjustOrRun } = currentWorkOrderInfo || {} + const { bAdjust } = userinfo || {} + if (bAdjust === 0) return // const sStatusNameValue = dAdjustOrRun === 0 // ? 0 // : 1;