Commit 7a562f9bf4dbf1775afcbbe2859d79f59ce6f2b5

Authored by Min
1 parent e1581b64

1.处理前期生产,问题反馈的界面报错

src/mes/scheduledTasks/machineTasks/index.js
@@ -562,7 +562,7 @@ const MachineTasks = baseProps => { @@ -562,7 +562,7 @@ const MachineTasks = baseProps => {
562 tableBtnsConfig: params => { 562 tableBtnsConfig: params => {
563 const { record, index } = params; 563 const { record, index } = params;
564 const { iStar, bManual } = record; 564 const { iStar, bManual } = record;
565 - 565 +
566 let showName, btnBgColor, sDefault, finishBtnBgColor, finishSdefault; 566 let showName, btnBgColor, sDefault, finishBtnBgColor, finishSdefault;
567 if (iStar === 1) { 567 if (iStar === 1) {
568 showName = "暂停"; 568 showName = "暂停";
@@ -575,7 +575,7 @@ const MachineTasks = baseProps => { @@ -575,7 +575,7 @@ const MachineTasks = baseProps => {
575 btnBgColor = "#AAA"; 575 btnBgColor = "#AAA";
576 sDefault = "${false}"; 576 sDefault = "${false}";
577 } 577 }
578 - 578 +
579 if (iStar === 2) { 579 if (iStar === 2) {
580 finishBtnBgColor = "#AAA" 580 finishBtnBgColor = "#AAA"
581 finishSdefault = "${false}"; 581 finishSdefault = "${false}";
@@ -591,7 +591,7 @@ const MachineTasks = baseProps => { @@ -591,7 +591,7 @@ const MachineTasks = baseProps => {
591 finishBtnBgColor = "#1890FF" 591 finishBtnBgColor = "#1890FF"
592 finishSdefault = "${true}"; 592 finishSdefault = "${true}";
593 } 593 }
594 - 594 +
595 const outPut = bManual ? [actProduceReportConfig, 595 const outPut = bManual ? [actProduceReportConfig,
596 { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig }, 596 { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] : [{ showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig },
597 { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }] 597 { showName: "完工", btnBgColor: finishBtnBgColor, sDefault: finishSdefault }]
@@ -647,7 +647,7 @@ const MachineTasks = baseProps => { @@ -647,7 +647,7 @@ const MachineTasks = baseProps => {
647 if (issue?.length > 0) { 647 if (issue?.length > 0) {
648 return ( 648 return (
649 <div className="marginTop componentBox"> 649 <div className="marginTop componentBox">
650 - {issue[id].items.map(item => ( 650 + {issue[id]?.items.map(item => (
651 <p> 651 <p>
652 <span>{item.title}:</span> 652 <span>{item.title}:</span>
653 {slave1Data[0] ? ( 653 {slave1Data[0] ? (