1.修复登录提示，指令集弹窗提示

Min
1 parent d630d36c
Showing 4 changed files with 7 additions and 6 deletions
src/components/Common/CommonInstructSet.js
src/components/Common/CommonTable/index.js
src/components/Draggable/index.js
src/mes/login/index.js
@@ -1961,7 +1961,7 @@ const handlePoprepair = async (props, instruct) =&gt; {
         config,
         record: { ...record, ...tableData[index], ...extraData },
         filterConfig,
-        confirmBtnName,
+        confirmBtnName: confirmBtnName === '打印' ? 'Print' : confirmBtnName,
         callback: rowData => {
           resolve(rowData);
         }
@@ -8815,7 +8815,7 @@ class CommonTableRc extends React.Component {
                   }
                 >
                   {" "}
-                  {sValue}
+                  {sValue}热热热
                 </span>
               </Tooltip>
             )}
@@ -194,6 +194,7 @@ export const DraggablePage = ({
       }
       open={open}
       onCancel={handleCancel}
+
       modalRender={modal => (
         <Draggable
           disabled={disabled}
@@ -154,13 +154,13 @@ const useLoginEvent = props =&gt; {
       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 {