Commit 94bc2b7c5bd05c55207450955f22f6a3b87a4a38
1 parent
4586dcb1
自定义按钮
Showing
1 changed file
with
6 additions
and
2 deletions
src/mes/scheduledTasks/machineTasks/index.js
| @@ -526,6 +526,10 @@ const MachineTasks = baseProps => { | @@ -526,6 +526,10 @@ const MachineTasks = baseProps => { | ||
| 526 | const actProduceReportConfig = slave0Config?.gdsconfigformslave?.find( | 526 | const actProduceReportConfig = slave0Config?.gdsconfigformslave?.find( |
| 527 | item => item.sControlName === 'BtnTableCopyTo.tmpInfoBySqlActProduceReport' | 527 | item => item.sControlName === 'BtnTableCopyTo.tmpInfoBySqlActProduceReport' |
| 528 | ) || {}; | 528 | ) || {}; |
| 529 | + // 自定义按钮 | ||
| 530 | + const otherConfig = slave0Config?.gdsconfigformslave?.find( | ||
| 531 | + item => item.sControlName === 'BtnTableSample' | ||
| 532 | + ) || {}; | ||
| 529 | const copytoConfig = slave0Config?.gdsconfigformslave?.find( | 533 | const copytoConfig = slave0Config?.gdsconfigformslave?.find( |
| 530 | item => item.sControlName === "BtnTableCopyTo" | 534 | item => item.sControlName === "BtnTableCopyTo" |
| 531 | ) || {}; | 535 | ) || {}; |
| @@ -588,12 +592,12 @@ const MachineTasks = baseProps => { | @@ -588,12 +592,12 @@ const MachineTasks = baseProps => { | ||
| 588 | sDefault = "${false}"; | 592 | sDefault = "${false}"; |
| 589 | } | 593 | } |
| 590 | if (bManual) { | 594 | if (bManual) { |
| 591 | - finishBtnBgColor = "#1890FF" | 595 | + finishBtnBgColor = "#1890FF" |
| 592 | finishSdefault = "${true}"; | 596 | finishSdefault = "${true}"; |
| 593 | } | 597 | } |
| 594 | 598 | ||
| 595 | const outPut = bManual ? [actProduceReportConfig, | 599 | const outPut = bManual ? [actProduceReportConfig, |
| 596 | - { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, | 600 | + { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [otherConfig, { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, |
| 597 | { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] | 601 | { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] |
| 598 | return [ | 602 | return [ |
| 599 | ...outPut, | 603 | ...outPut, |