From c7ef589047e5aa3372c51dd02843158a2b28be14 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 10 Oct 2025 11:58:24 +0800
Subject: [PATCH] 1.翻译MES弹窗取消，清空，确认 2.主表 printpdf支持打印pdf

---
 src/components/Common/CommonComponent/index.js      | 2 +-
 src/mes/common/commonModelComponent/index.js        | 4 ++--
 src/mes/common/commonOperationBarComponent/index.js | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js
index 40266da..5c26d03 100644
--- a/src/components/Common/CommonComponent/index.js
+++ b/src/components/Common/CommonComponent/index.js
@@ -2867,7 +2867,7 @@ export default class CommonComponent extends Component {
             display: this.state.sActiveDisplay ? 'block' : 'none',
             // top: this.props.name === 'slaveInfo' ? '1px' : '',
             // left: this.props.name === 'slaveInfo' ? '2px' : this.props.name === 'master' ? '1px' : '',
-            position: 'absolute',
+            // position: 'absolute',
             height: '100%',
             overflow: 'hidden',
           }}
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index dcb844d..e0407ed 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -1936,7 +1936,7 @@ const CommonRepairComponent = props => {
     filterConfig,
     record = {},
     callback,
-    confirmBtnName = "确认",
+    confirmBtnName = "Sure",
     enabled = true,
     width = 600,
     height = "auto",
@@ -2049,7 +2049,7 @@ const CommonRepairComponent = props => {
         <Space>
             {/* //  OQC标签弹窗添加清空按钮 */}
             {
-                params.tableName=='slaveWyrj2'? <Button size="large" onClick={onEmptyClick}>清空</Button> : null
+                params.tableName=='slaveWyrj2'? <Button size="large" onClick={onEmptyClick}>Clear</Button> : null
             }
           <Button size="large" onClick={onCancel}>
             {BtnCancel}
diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js
index b4a0052..7f58e3a 100644
--- a/src/mes/common/commonOperationBarComponent/index.js
+++ b/src/mes/common/commonOperationBarComponent/index.js
@@ -1021,7 +1021,6 @@ const CommonOperationBarComponent = basProps => {
       <div className="leftBar">
         <Space>
           {btnLeftConfig.map(item => {
-            console.log('ssss', item);
             let sTooltip = item.showName +'-'+ item.sChinese || item.showName ;
             if(item.showName === 'Proofreading/revision Complete'){
               sTooltip = item.showName + '-装校版结束';
--
libgit2 0.22.2