1.处理MES 第一单，第二单中文版本能展示，英文版不展示bug

Min
1 parent f5d10617
Showing 4 changed files with 35 additions and 14 deletions
src/mes/common/RunningStatus/index.js
src/mes/common/buttonComponent/index.js
src/mes/common/commonModelComponent/index.js
src/mes/scheduledTasks/abnormalEventReporting/index.js
@@ -13,7 +13,7 @@ import ShowType from &quot;@/components/Common/CommonComponent&quot;;
 import styles from "./index.less";
 import { cloneDeep } from "lodash";
-const sTypeJson = {
+const sTypeJson1 = {
   sType1: ["行车状态", "green", "greenTd"],
   sType2: ["正常待机", "cyan", "cyanTd"],
   sType3: ["不正常待机(材料异常)", "red", "redTd"],
@@ -26,6 +26,19 @@ const sTypeJson = {
   "": ["其它", "blue", "blueTd"]
 };
+const sTypeJson = {
+  sType1: ["Vehicle Status", "green", "greenTd"],
+  sType2: ["Normal Standby", "cyan", "cyanTd"],
+  sType3: ["Abnormal Standby (Material Issue)", "red", "redTd"],
+  sType4: ["Abnormal Standby (Process Issue", "red", "redTd"],
+  sType5: ["Abnormal Standby (Production Issue)", "red", "redTd"],
+  sType6: ["Abnormal Standby (Other)", "red", "redTd"],
+  sType7: ["Abnormal Standby", "red", "redTd"],
+  sType8: ["Equipment Maintenance", "blue", "blueTd"],
+  sType9: ["Equipment Repair", "blue", "blueTd"],
+  "": ["其它", "blue", "blueTd"]
+};
+
 // 业务层
 const businessTier = props => {
   const { formData = [], copyTo = {} } = props;
@@ -199,7 +199,7 @@ const ButtonComponent = props =&gt; {
     ["Production Execution", 10],
     ["First Approval Sample Notice", 11],
     ["Exception/Assistance Reporting", 12],
-    ["Completion & Clearance", 13],
+    ["Post-Completion Clearance/Confirmation", 13],
     ["Plate Splitting/Combining", 14],
     null,
     null,
@@ -1258,6 +1258,8 @@ const CommonModelComponent = props =&gt; {
         bFirstComponent: level === 0 && index === -1
       };
+      console.log('222', sName, componentProps)
+
       const commonDivHeight = useComputedCommonDivHeight(componentProps);
       return (
         <div
@@ -1286,7 +1288,7 @@ const CommonModelComponent = props =&gt; {
             width = "100%",
             height = "100%"
           } = item;
-          console.log('ssconfigLists', configList);
+          console.log('ssconfigLists', configList, sEntireTabName );
           const sEntireTabNameNew = sLanguage === 'sEnglish' ? sEnglishEntireTabName + '1111' :
             sLanguage === 'sBig5EntireTabName' ? sBig5EntireTabName : sEntireTabName;
           const advancedStyle =
@@ -1465,8 +1467,9 @@ const TabTitleComponent = props =&gt; {
       return <div style={{ width: "100%", height: 10 }} />;
     }
   }
+  console.log('sTabNsme', sTabName);
-  if (sTabName.split("_")[0] === "空") return "";
+  if (sTabName.split("_")[0] === "空" || sTabName.split("_")[0] === "Empty" ) return "";
   const costomTitle =
     props.costomTitle && sTabName === "下料信息" ? props.costomTitle : "";
@@ -1502,7 +1505,7 @@ const CommonViewTableComponent = props =&gt; {
   if (selectedRowKeys.length) {
     viewRow = dataArr.find(item => item.sId === selectedRowKeys[0]);
   }
-
+  console.log('111111第', sTabName)
   if (sTabName?.startsWith("第") && sTabName?.endsWith("转")) {
     viewRow = data.filter(item => item.sRev === sTabName)[0];
   }
@@ -1510,7 +1513,7 @@ const CommonViewTableComponent = props =&gt; {
   if (commonUtils.isEmptyObject(viewRow)) {
     viewRow = Array.isArray(data) ? data[0] || {} : data;
   }
-
+  console.log('viewRow', viewRow)
   if (
     commonUtils.isNotEmptyObject(viewRow) &&
     !selectedRowKeys[0] &&
@@ -1556,12 +1559,9 @@ const CommonViewTableComponent = props =&gt; {
       });
     }
   }
+  const groupList = sTabName?.split(",") || [];
-  const sLanguage = props.app.userinfo?.sLanguage;
-
-  const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName  : sTabName;
-
-  const groupList = sTabLocalName?.split(",") || [];
+  console.log('groupList', groupList)
   const viewConfigsList = groupList.map((tabName, index) => {
     if (tabName === "隐藏") {
       return [];
@@ -1583,6 +1583,7 @@ const CommonViewTableComponent = props =&gt; {
       );
     }
   });
+  console.log('viewConfigsList', viewConfigsList);
   const operationBarProps = {
     ...props,
@@ -1599,6 +1600,11 @@ const CommonViewTableComponent = props =&gt; {
         setReportInfoVisible(!reportInfoVisible);
   };
+
+  const sLanguage = props.app.userinfo?.sLanguage;
+  const sTabLocalName = sLanguage === 'sEnglish' ? sEnglishTabName  : sTabName;
+  const groupListNew = sTabLocalName?.split(",") || [];
+
   return (
     <>
       {sName === "master" ? (
@@ -1630,7 +1636,7 @@ const CommonViewTableComponent = props =&gt; {
         return (
           <>
-            <TabTitleComponent {...props} sTabName={groupList[index]} />
+            <TabTitleComponent {...props} sTabName={groupListNew[index] } />
             <CommonViewTable {...viewProps} />
             <ReportInfo
                 reportInfoVisible={reportInfoVisible}
@@ -1861,6 +1867,8 @@ const CommonTableComponent = props =&gt; {
   };
   const stepName = sTabName?.split("_")[1] || "";
+
+  console.log('ssss', stepName);
   if (stepName.startsWith("第") && stepName.endsWith("转")) {
     tableProps.data = tableProps.data.filter(item => item.sRev === stepName);
   }
@@ -416,7 +416,7 @@ const RightPartComponent = props =&gt; {
       // );
     }
   };
-
+  const report = commonFunc.showLocalMessage(props, 'report', '提报');
   return (
     <div className={styles.rightPart}>
       <div className={styles.runningStatus}>
@@ -433,7 +433,7 @@ const RightPartComponent = props =&gt; {
         />
       </div>
       <div className={styles.runningBtn}>
-        <Button {...btnProps}>提报</Button>
+        <Button {...btnProps}>{report}</Button>
       </div>
     </div>
   );