From 778842fcc1b3658682835b30895b14640b2cd9c6 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 5 Sep 2025 15:50:29 +0800
Subject: [PATCH] 1.翻译生产进度 2.处理开工后不跳转bug
---
src/mes/common/siderInfoComponent/index.js | 4 ++--
src/mes/scheduledTasks/machineTasks/index.js | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/mes/common/siderInfoComponent/index.js b/src/mes/common/siderInfoComponent/index.js
index 82be672..428f94d 100644
--- a/src/mes/common/siderInfoComponent/index.js
+++ b/src/mes/common/siderInfoComponent/index.js
@@ -354,7 +354,7 @@ const WorkOrderTypeComponent = () => {
);
const task= commonFunc.showLocalMessage(props, 'task', '任务:工单信息');
const specialFocus= commonFunc.showLocalMessage(props, 'specialFocus', '任务:工单信息');
-
+ const productionSchedule= commonFunc.showLocalMessage(props, 'productionSchedule', '生产进度');
return (
@@ -446,7 +446,7 @@ const WorkOrderTypeComponent = () => {
flex={"160px"}
className={styles.productionTitle}
>
- 生产进度:
+ {productionSchedule}
{/* }
diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js
index f5802f8..37e6a11 100644
--- a/src/mes/scheduledTasks/machineTasks/index.js
+++ b/src/mes/scheduledTasks/machineTasks/index.js
@@ -348,6 +348,7 @@
const btnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
const pause = commonFunc.showLocalMessage(props, 'pause', '暂停');
const pausingReason = commonFunc.showLocalMessage(props, 'pausingReason', '请选择暂停原因');
+ const sLanguage = props?.app?.userinfo?.sLanguage ;
// 开工、暂停事件
const handleTableBtnClick = async item => {
const { tableName, index, record, tableData, config, iFlag } = item;
@@ -423,10 +424,18 @@
tempTaskId: ""
});
}
- props.onChangeRouter({
- type: "name",
- path: ["生产执行", "生产执行"]
- });
+ if(sLanguage ==='sEnglish') {
+ props.onChangeRouter({
+ type: "name",
+ path: ["Production Execution", "Production Execution"]
+ });
+ }else {
+ props.onChangeRouter({
+ type: "name",
+ path: ["生产执行", "生产执行"]
+ });
+ }
+
} else if (code === -7) {
// 如果有开工中的任务,即接口返回-7,弹出确认窗体
itemClickRef.current = { data: item };
--
libgit2 0.22.2