From 8612258da7eaa07afdeb85265e4e4eac794f7619 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 26 Sep 2025 10:39:17 +0800
Subject: [PATCH] 1.修复登录提示，指令集弹窗提示

---
 src/components/Common/CommonInstructSet.js | 2 +-
 src/components/Common/CommonTable/index.js | 2 +-
 src/components/Draggable/index.js          | 1 +
 src/mes/login/index.js                     | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js
index a231d34..f2ecfdc 100644
--- a/src/components/Common/CommonInstructSet.js
+++ b/src/components/Common/CommonInstructSet.js
@@ -1961,7 +1961,7 @@ const handlePoprepair = async (props, instruct) => {
         config,
         record: { ...record, ...tableData[index], ...extraData },
         filterConfig,
-        confirmBtnName,
+        confirmBtnName: confirmBtnName === '打印' ? 'Print' : confirmBtnName,
         callback: rowData => {
           resolve(rowData);
         }
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index dce9a70..17ee1df 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -8815,7 +8815,7 @@ class CommonTableRc extends React.Component {
                   }
                 >
                   {" "}
-                  {sValue}
+                  {sValue}热热热
                 </span>
               </Tooltip>
             )}
diff --git a/src/components/Draggable/index.js b/src/components/Draggable/index.js
index 289a512..3ab272a 100644
--- a/src/components/Draggable/index.js
+++ b/src/components/Draggable/index.js
@@ -194,6 +194,7 @@ export const DraggablePage = ({
       }
       open={open}
       onCancel={handleCancel}
+
       modalRender={modal => (
         <Draggable
           disabled={disabled}
diff --git a/src/mes/login/index.js b/src/mes/login/index.js
index 234d974..eb688ac 100644
--- a/src/mes/login/index.js
+++ b/src/mes/login/index.js
@@ -154,13 +154,13 @@ const useLoginEvent = props => {
 
       const pleaseSelectUser = getConfigByName('pleaseSelectUser', configsData,  sLanguage);
 
-      const pleaseInputPassword = getConfigByName('pleaseInputPassword', configsData,  sLanguage);
+      const pleaseInputPassword = getConfigByName('pleaseInputPassword', configsData,  sLanguage) || 'Please Input Password';
 
-      const pleaseSelectTeam = getConfigByName('pleaseSelectTeam', configsData,  sLanguage);
+      const pleaseSelectTeam = getConfigByName('pleaseSelectTeam', configsData,  sLanguage) || 'Please Select Team' ;
 
-      const pleaseselectShift = getConfigByName('pleaseselectShift', configsData,  sLanguage);
+      const pleaseselectShift = getConfigByName('pleaseselectShift', configsData,  sLanguage) || 'Please Select Shift';
 
-      const pleaseSelectMachine = getConfigByName('pleaseSelectMachine', configsData,  sLanguage);
+      const pleaseSelectMachine = getConfigByName('pleaseSelectMachine', configsData,  sLanguage) || 'Please Select Machine';
 
 
       const {
--
libgit2 0.22.2