Commit 4b8a88d3a48829cc1ef26d23b6593c7733d17a33

Authored by Min
1 parent bf9d1b77

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

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