diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js index f5b2d2a..8faea8c 100644 --- a/src/mes/scheduledTasks/machineTasks/index.js +++ b/src/mes/scheduledTasks/machineTasks/index.js @@ -526,6 +526,10 @@ const MachineTasks = baseProps => { const actProduceReportConfig = slave0Config?.gdsconfigformslave?.find( item => item.sControlName === 'BtnTableCopyTo.tmpInfoBySqlActProduceReport' ) || {}; + // 自定义按钮 + const otherConfig = slave0Config?.gdsconfigformslave?.find( + item => item.sControlName === 'BtnTableSample' + ) || {}; const copytoConfig = slave0Config?.gdsconfigformslave?.find( item => item.sControlName === "BtnTableCopyTo" ) || {}; @@ -588,12 +592,12 @@ const MachineTasks = baseProps => { sDefault = "${false}"; } if (bManual) { - finishBtnBgColor = "#1890FF" + finishBtnBgColor = "#1890FF" finishSdefault = "${true}"; } const outPut = bManual ? [actProduceReportConfig, - { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, + { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [otherConfig, { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] return [ ...outPut,