diff --git a/src/mes/common/buttonComponent/index.js b/src/mes/common/buttonComponent/index.js index c928797..86a9acc 100644 --- a/src/mes/common/buttonComponent/index.js +++ b/src/mes/common/buttonComponent/index.js @@ -197,11 +197,12 @@ const ButtonComponent = props => { // null, // null, ["质量巡检", 15], - ["班组报工", 16], + ["其它机台日报", 16], ["签样/完成", 17], // ["班组交接", 18], ["工单变更信息", 19], - ["其它机台日报", 16], + + ["班组报工", 16], // null, // null, ["工艺巡检", 20] @@ -216,11 +217,11 @@ const ButtonComponent = props => { // null, // null, ["Quality Patrol Inspection List", 15], - ["Team Production Reporting", 16], + ["Other Machine Daily Report", 16], ["Sign-off/Completion", 17], // ["Team Handover", 18], ["Work Order Change Information", 19], - ["Other Machine Daily Report", 16], + ["Team Production Reporting", 16], // null, // null, ["Process Inspection", 20] diff --git a/src/mes/productionExec/noticeModal/reportInfoButton.js b/src/mes/productionExec/noticeModal/reportInfoButton.js index 31867cb..0a07656 100644 --- a/src/mes/productionExec/noticeModal/reportInfoButton.js +++ b/src/mes/productionExec/noticeModal/reportInfoButton.js @@ -185,7 +185,8 @@ export default (_props) => { }) props.handleReportInfo(); } - + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认'); + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消'); return ( { footer={ }