Commit 778842fcc1b3658682835b30895b14640b2cd9c6

Authored by Min
1 parent 41492bc0

1.翻译生产进度

2.处理开工后不跳转bug
src/mes/common/siderInfoComponent/index.js
... ... @@ -354,7 +354,7 @@ const WorkOrderTypeComponent = () => {
354 354 );
355 355 const task= commonFunc.showLocalMessage(props, 'task', '任务:工单信息');
356 356 const specialFocus= commonFunc.showLocalMessage(props, 'specialFocus', '任务:工单信息');
357   -
  357 + const productionSchedule= commonFunc.showLocalMessage(props, 'productionSchedule', '生产进度');
358 358 return (
359 359 <div className={styles.workOrdertype} ref={ref}>
360 360 <div className="mesTitle">
... ... @@ -446,7 +446,7 @@ const WorkOrderTypeComponent = () =&gt; {
446 446 flex={"160px"}
447 447 className={styles.productionTitle}
448 448 >
449   - 生产进度:
  449 + {productionSchedule}
450 450 {/* <Button
451 451 type="link"
452 452 icon={<LeftOutlined />}
... ...
src/mes/scheduledTasks/machineTasks/index.js
... ... @@ -348,6 +348,7 @@
348 348 const btnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
349 349 const pause = commonFunc.showLocalMessage(props, 'pause', '暂停');
350 350 const pausingReason = commonFunc.showLocalMessage(props, 'pausingReason', '请选择暂停原因');
  351 + const sLanguage = props?.app?.userinfo?.sLanguage ;
351 352 // 开工、暂停事件
352 353 const handleTableBtnClick = async item => {
353 354 const { tableName, index, record, tableData, config, iFlag } = item;
... ... @@ -423,10 +424,18 @@
423 424 tempTaskId: ""
424 425 });
425 426 }
426   - props.onChangeRouter({
427   - type: "name",
428   - path: ["生产执行", "生产执行"]
429   - });
  427 + if(sLanguage ==='sEnglish') {
  428 + props.onChangeRouter({
  429 + type: "name",
  430 + path: ["Production Execution", "Production Execution"]
  431 + });
  432 + }else {
  433 + props.onChangeRouter({
  434 + type: "name",
  435 + path: ["生产执行", "生产执行"]
  436 + });
  437 + }
  438 +
430 439 } else if (code === -7) {
431 440 // 如果有开工中的任务,即接口返回-7,弹出确认窗体
432 441 itemClickRef.current = { data: item };
... ...