diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js index 614ce13..3fd5cf1 100644 --- a/src/mes/common/commonOperationBarComponent/MesToolbar.js +++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js @@ -6,21 +6,20 @@ const ToolbarFun = (props) => { const { btnConfig, bMesBill } = props; const currentMesPane = commonUtils.getAppData("currentMesPane"); const { sModelType } = currentMesPane; - if (!["/indexPage/commonList", "/indexPage/commonBill"].includes(sModelType) && !bMesBill) { + + if (!["/indexPage/commonList", "/indexPage/commonBill", "/indexMes/processReport"].includes(sModelType) && !bMesBill) { return false; } const { sControlName } = btnConfig; const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase(); - console.log("🚀 ~ ToolbarFun ~ btnName:", btnName) - if (btnName === 'btnadd') { handleAdd(props); } else if (btnName === 'btnsave') { handleSave(props); } else if (btnName === 'btnupd') { props.onSaveState({ enabled: true }); - } else if (btnName === 'btnscanface') { + } else if (btnName === 'btnscanface' || btnName === 'btnscanface1') { handleScanFace(props); } else if (btnName === 'btncancel') { props.onCancel() diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js index 3b6a976..3b0dca6 100644 --- a/src/mes/common/commonOperationBarComponent/index.js +++ b/src/mes/common/commonOperationBarComponent/index.js @@ -92,7 +92,6 @@ const useCommonOperationBarComponentEvent = props => { const delayedOvertime = commonFunc.showLocalMessage(props, 'delayedOvertime', '延迟加班'); const cancelDelayedOvertime = commonFunc.showLocalMessage(props, 'cancelDelayedOvertime', '取消延迟加班'); - // 走工具栏功能逻辑 if (MesToolbar({ ...props, btnConfig: config })) { return;