diff --git a/src/components/Common/CommonInstructSet.js b/src/components/Common/CommonInstructSet.js index 11a8ac7..a231d34 100644 --- a/src/components/Common/CommonInstructSet.js +++ b/src/components/Common/CommonInstructSet.js @@ -1336,7 +1336,7 @@ const handleFaceAuth = async (props, instruct) => { }; return ( diff --git a/src/mes/costomPageFun/index.js b/src/mes/costomPageFun/index.js index 1f22c96..ba03326 100644 --- a/src/mes/costomPageFun/index.js +++ b/src/mes/costomPageFun/index.js @@ -1221,8 +1221,10 @@ const handleZlxjCheck = async (props, btnName) => { const { table0Data = [], table1Data = [], refreshTableListCount = 0 } = props; const { sTeamNo } = commonUtils.getAppData("userinfo"); + const loadFirst = commonFunc.showLocalMessage(props, 'loadFirst', '请先等待页面初始化加载完成'); + if (!refreshTableListCount) { - message.warning("请先等待页面初始化加载完成!"); + message.warning(loadFirst); return; } @@ -1444,7 +1446,7 @@ const getFaceResult = async props => { // 质量巡检-巡检项目-完成/修改 const mesTableBtnClick4 = async props => { if (window.instructSetLock) { - message.warning("请先等待上个指令集执行完成!"); + message.warning("Please wait for the previous instruction set to complete!"); return; } const { params = {}, table0Data = [], table1Data = [], tempUserName } = props;