diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js index 6897d42..bfcbf7a 100644 --- a/src/mes/indexMes/index.js +++ b/src/mes/indexMes/index.js @@ -700,6 +700,11 @@ const SiderComponent = () => { c_icon: c_guideIcon } ]; + const {bManual = false} = props?.app?.userinfo || {} + if (bManual) { + const index = filteredMenuList.findIndex(item => item.id === 'productionExec'); + filteredMenuList.splice(index, 1); + } let [hoverState, setHoverState] = useState(null); return ( diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index fef6ff5..43982ad 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -562,6 +562,7 @@ const MachineTasks = baseProps => { tableBtnsConfig: params => { const { record, index } = params; const { iStar, bManual } = record; + let showName, btnBgColor, sDefault, finishBtnBgColor, finishSdefault; if (iStar === 1) { showName = "暂停"; @@ -574,6 +575,7 @@ const MachineTasks = baseProps => { btnBgColor = "#AAA"; sDefault = "${false}"; } + if (iStar === 2) { finishBtnBgColor = "#AAA" finishSdefault = "${false}"; @@ -585,6 +587,10 @@ const MachineTasks = baseProps => { if (!bStartWork) { sDefault = "${false}"; } + if (bManual) { + finishBtnBgColor = "#1890FF" + finishSdefault = "${true}"; + } const outPut = bManual ? [actProduceReportConfig, { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig },