Commit 4b8a88d3a48829cc1ef26d23b6593c7733d17a33

Authored by Min
1 parent bf9d1b77

1.修复异常提报的弹窗翻译

2.处理班组上班在生产执行下面
src/mes/common/buttonComponent/index.js
@@ -197,11 +197,12 @@ const ButtonComponent = props => { @@ -197,11 +197,12 @@ const ButtonComponent = props => {
197 // null, 197 // null,
198 // null, 198 // null,
199 ["质量巡检", 15], 199 ["质量巡检", 15],
200 - ["班组报工", 16], 200 + ["其它机台日报", 16],
201 ["签样/完成", 17], 201 ["签样/完成", 17],
202 // ["班组交接", 18], 202 // ["班组交接", 18],
203 ["工单变更信息", 19], 203 ["工单变更信息", 19],
204 - ["其它机台日报", 16], 204 +
  205 + ["班组报工", 16],
205 // null, 206 // null,
206 // null, 207 // null,
207 ["工艺巡检", 20] 208 ["工艺巡检", 20]
@@ -216,11 +217,11 @@ const ButtonComponent = props => { @@ -216,11 +217,11 @@ const ButtonComponent = props => {
216 // null, 217 // null,
217 // null, 218 // null,
218 ["Quality Patrol Inspection List", 15], 219 ["Quality Patrol Inspection List", 15],
219 - ["Team Production Reporting", 16], 220 + ["Other Machine Daily Report", 16],
220 ["Sign-off/Completion", 17], 221 ["Sign-off/Completion", 17],
221 // ["Team Handover", 18], 222 // ["Team Handover", 18],
222 ["Work Order Change Information", 19], 223 ["Work Order Change Information", 19],
223 - ["Other Machine Daily Report", 16], 224 + ["Team Production Reporting", 16],
224 // null, 225 // null,
225 // null, 226 // null,
226 ["Process Inspection", 20] 227 ["Process Inspection", 20]
src/mes/productionExec/noticeModal/reportInfoButton.js
@@ -185,7 +185,8 @@ export default (_props) => { @@ -185,7 +185,8 @@ export default (_props) => {
185 }) 185 })
186 props.handleReportInfo(); 186 props.handleReportInfo();
187 } 187 }
188 - 188 + const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
  189 + const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
189 return ( 190 return (
190 <Modal 191 <Modal
191 title={props.reportRef?.sDefault || ""} 192 title={props.reportRef?.sDefault || ""}
@@ -197,10 +198,10 @@ export default (_props) =&gt; { @@ -197,10 +198,10 @@ export default (_props) =&gt; {
197 footer={ 198 footer={
198 <Space> 199 <Space>
199 <Button size="large" onClick={cancelCache}> 200 <Button size="large" onClick={cancelCache}>
200 - 取消 201 + { BtnCancel}
201 </Button> 202 </Button>
202 <Button size="large" type="primary" onClick={handleOk}> 203 <Button size="large" type="primary" onClick={handleOk}>
203 - 确定 204 + {BtnSure}
204 </Button> 205 </Button>
205 </Space> 206 </Space>
206 } 207 }