Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…

…es into release/customer/2025/AJT

Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…
…es into release/customer/2025/AJT
Min
2 parents 63fc63f1 ab7d3416
Showing 1 changed file with 39 additions and 39 deletions
src/mes/costomPageFun/index.js
@@ -196,7 +196,7 @@ const mesTableLineAdd1 = (props, tableName) =&gt; {
   const { [`${tableName}SelectedRowKeys`]: selectedRowKeys, [`${tableName}Data`]: tableData = [] } = props;
   if (commonUtils.isEmptyObject(selectedRowKeys)) {
-    message.info("请先选中一条行车记录数据！");
+    message.info("Please select a driving record data first!");
     return;
   }
@@ -206,7 +206,7 @@ const mesTableLineAdd1 = (props, tableName) =&gt; {
   const rowData = tableData[rowDataIndex];
   if (rowData.bSaveMes == 1 || rowData.bSaveAbnormal == 1) {
-    message.info("数据已上报或已异常提报,不能拆分！");
+    message.info("The data has been reported or reported abnormally and cannot be split!");
     return;
   }
@@ -216,7 +216,7 @@ const mesTableLineAdd1 = (props, tableName) =&gt; {
   // }
   if (tableData.some(item => item.bUnChanged)) {
-    message.info("请先修改刚新增的数据！");
+    message.info("Please modify the newly added data first!");
     return;
   }
@@ -298,7 +298,7 @@ const mesTableChange1 = (props, tableName) =&gt; {
   const { sId, tStartDate, tEndDate } = rowData;
   if (!tEndDate && tEndDate == null) {
-    message.info("结束时间不能为空！");
+    message.info("End time cannot be empty!");
     return;
   }
@@ -315,7 +315,7 @@ const mesTableChange1 = (props, tableName) =&gt; {
   // 检查tStartDate是否在tEndDate之前
   if (moment(tEndDate).isBefore(moment(tStartDate))) {
-    message.info("结束时间不能小于起始时间！", 3);
+    message.info("The end time cannot be less than the start time!", 3);
     tableDataNew[rowDataIndex] = rowDataOld;
     props.onSaveState({
       [`${tableName}Data`]: tableDataNew,
@@ -325,7 +325,7 @@ const mesTableChange1 = (props, tableName) =&gt; {
   // 检查tStartDate是否在tStartDateParent之后
   if (moment(tEndDate).isAfter(moment(tEndDateParent))) {
-    message.info("结束不能大于父节点的结束时间！", 3);
+    message.info("The end time cannot be greater than the end time of the parent node!", 3);
     tableDataNew[rowDataIndex] = rowDataOld;
     props.onSaveState({
       [`${tableName}Data`]: tableDataNew,
@@ -335,7 +335,7 @@ const mesTableChange1 = (props, tableName) =&gt; {
   // 检查tStartDate是否在当前时间之后
   if (moment(tEndDate).isAfter(moment())) {
-    message.info("结束不能大于当前时间！", 3);
+    message.info("The end time cannot be greater than the current time!", 3);
     tableDataNew[rowDataIndex] = rowDataOld;
     props.onSaveState({
       [`${tableName}Data`]: tableDataNew,
@@ -826,7 +826,7 @@ const mesTableBtnClick3 = props =&gt; {
   const iIndex = table0Data.findIndex(item => item.sId === sId);
   if (iIndex === -1) {
-    message.info("未找到对应报工任务，请检查登录班次！", 3);
+    message.info("The corresponding work report task was not found, please check the login shift!", 3);
     // props.onExecInstructSet({
     //   nextProps: props,
     //   btnConfig: config
@@ -865,12 +865,12 @@ const handleSlaveWypj2BtnPre = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (iIndex === 0) {
-    message.info("已是第一条数据！");
+    message.info("This is the first data!");
     return;
   }
@@ -904,12 +904,12 @@ const handleSlaveWypj2BtnNext = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (iIndex === tableData.length - 1) {
-    message.info("已是最后一条数据！");
+    message.info("This is the last piece of data!");
     return;
   }
@@ -943,12 +943,12 @@ const handleSalveWydm2BtnPre = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (iIndex === 0) {
-    message.info("已是第一条数据！");
+    message.info("This is the first data!");
     return;
   }
@@ -982,12 +982,12 @@ const handleSalveWydm2BtnNext = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (iIndex === tableData.length - 1) {
-    message.info("已是最后一条数据！");
+    message.info("This is the last piece of data!");
     return;
   }
@@ -1021,12 +1021,12 @@ const handleSlaveWyrj2BtnPre = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (iIndex === 0) {
-    message.info("已是第一条数据！");
+    message.info("This is the first data!");
     return;
   }
@@ -1060,12 +1060,12 @@ const handleSlaveWyrj2BtnNext = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (iIndex === tableData.length - 1) {
-    message.info("已是最后一条数据！");
+    message.info("This is the last piece of data!");
     return;
   }
@@ -1101,17 +1101,17 @@ const handleUpDownData = props =&gt; {
   const iIndex = tableData.findIndex(item => item.sId === rowData.sId);
   if (iIndex === -1) {
-    message.info("暂无数据！");
+    message.info("No data yet!");
     return;
   }
   if (["BtnRight.PriorCom"].includes(sFieldName) && iIndex === 0) {
-    message.info("当前为首条数据！");
+    message.info("This is the first data!");
     return;
   }
   if (["BtnRight.NextCom"].includes(sFieldName) && iIndex === tableData.length - 1) {
-    message.info("已是最后一条数据！");
+    message.info("This is the last piece of data!");
     return;
   }
@@ -1119,9 +1119,9 @@ const handleUpDownData = props =&gt; {
   if (!sInstructStr) return;
   const info = {
-    "BtnRight.PriorCom": { index: iIndex - 1, message: "上一版" },
-    "BtnRight.NextCom": { index: iIndex + 1, message: "下一版" },
-  }[sFieldName] || { index: iIndex, message: "当前" };
+    "BtnRight.PriorCom": { index: iIndex - 1, message: "Previous edition" },
+    "BtnRight.NextCom": { index: iIndex + 1, message: "next edition" },
+  }[sFieldName] || { index: iIndex, message: "current" };
   const selectedRowKeys = [tableData[info.index].sId];
   props.onSaveState(
@@ -1159,11 +1159,11 @@ const mesTableChange3 = (props, tableName) =&gt; {
   const { tWorkingDate, sShift, tConnectDate } = rowData;
   if (!tWorkingDate) {
-    message.warning("上班日期不能为空！");
+    message.warning("Working date cannot be empty!");
     mesTableChange2(props, tableName);
     return;
   } else if (!sShift) {
-    message.warning("白夜班不能为空！");
+    message.warning("Day and night shifts cannot be empty!");
     mesTableChange2(props, tableName);
     return;
   }
@@ -1189,15 +1189,15 @@ const mesTableChange3 = (props, tableName) =&gt; {
     let msg = "";
     if (sShift === "1" || sShift === "白班") {
       if (bDelayedOvertime) {
-        msg = `交接时间必须在${time}日8:00之后！`;
+        msg = `The handover time must be after 8:00 on ${time} day!`;
       } else {
-        msg = `交接时间必须在${time}日8:00-20:00之间！`;
+        msg = `The handover time must be between 8:00-20:00 on ${time} day!`;
       }
     } else {
       if (bDelayedOvertime) {
-        msg = `交接时间必须在${time}日20:00之后！`;
+        msg = `The handover time must be after 20:00 on ${time} day!`;
       } else {
-        msg = `交接时间必须在${time}日20:00-次日8:00之间！`;
+        msg = `The handover time must be between 20:00 on ${time} day and 8:00 the next day!`;
       }
     }
     message.warning(msg, 5);
@@ -1461,7 +1461,7 @@ const mesTableBtnClick4 = async props =&gt; {
     if (!faceResult) return;
     const { name } = faceResult;
     if (name !== sPollingPerson) {
-      message.error("巡检人不一致！");
+      message.error("Inspectors are inconsistent!");
       return;
     }
     addState.tempUserName = name;
@@ -1477,7 +1477,7 @@ const mesTableBtnClick4 = async props =&gt; {
   } else if (sControlName === "BtnFinish") {
     const bHasX = Object.keys(record).some(key => key?.startsWith("sItem") && record[key] === "✗");
     if (bHasX && !sQualityDeg) {
-      message.error("发现不合格项（'✗'），但质量程度未填写，请补充！");
+      message.error("Unqualified items ('✗') were found, but the quality level was not filled in. Please fill it in!");
       return;
     }
@@ -1538,7 +1538,7 @@ const handleCjlbshCheck = async props =&gt; {
     props.onSaveState({
       commonRepairModalParams: {
         visible: true,
-        title: "领班审核备注",
+        title: "Foreman review notes",
         tableName: "slave0",
         config: slave0Config,
         record: { ...slave0Data[0], bSubmit: 0 },
@@ -1630,7 +1630,7 @@ const handlePgshCheck = async props =&gt; {
     props.onSaveState({
       commonRepairModalParams: {
         visible: true,
-        title: "品管审核备注",
+        title: "Quality Control Audit Notes",
         tableName: "slave0",
         config: slave0Config,
         record: { ...slave0Data[0], bSubmit: 0 },
@@ -1714,7 +1714,7 @@ const handleConfirmSubmit = async props =&gt; {
   if (tFirstCompleteTime) {
     // 完工时间需小于清场时间
     if (moment(tFirstCompleteTime).isAfter(moment(tFirstClearanceTime))) {
-      message.error("完工时间需小于清场时间", 3);
+      message.error("Completion time must be less than clearance time", 3);
       return;
     }
   }
@@ -1722,7 +1722,7 @@ const handleConfirmSubmit = async props =&gt; {
   if (tSecondStartTime) {
     // 清场时间需小于第二单开单时间
     if (moment(tFirstClearanceTime).isAfter(moment(tSecondStartTime))) {
-      message.error("清场时间需小于第二单开单时间", 3);
+      message.error("The clearing time must be less than the second order opening time", 3);
       return;
     }
   }
@@ -1731,7 +1731,7 @@ const handleConfirmSubmit = async props =&gt; {
     const confirmResult = await new Promise(resolve => {
       Modal.confirm({
         title: "温馨提示：",
-        content: "工单完工时间或者第二单开工时间未填写是否继续提交？",
+        content: "Should I continue submitting the work order if the completion time of the work order or the start time of the second work order is not filled in?",
         closable: true,
         maskClosable: true,
         wrapClassName: "mesCommonModal",