1.处理MES生产执行英文版界面展示

Min
1 parent d3524137
Showing 10 changed files with 95 additions and 55 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/components/Common/CommonTable/index.js
src/mes/common/buttonComponent/index.js
src/mes/common/commonOperationBarComponent/index.js
src/mes/common/inputMultiModalComponent/index.js
src/mes/login/index.js
src/mes/operationGuide/index.less
src/mes/productionExec/productionExecMain/index.js
src/mes/scheduledTasks/machineTasks/index.js
src/mes/teamInfo/index.js
@@ -1950,7 +1950,9 @@ const useCommonBase = props =&gt; {
     } = params;
     const currentState = nextProps || state;
-
+    const FriendlyReminder = commonFunc.showLocalMessage(props, 'FriendlyReminder', '温馨提示');
+    const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确认');
+    const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '确认');
     // 加入mes通用参数
     const { app } = props;
     const { tableNameCompareJson = {} } = currentState;
@@ -2129,10 +2131,10 @@ const useCommonBase = props =&gt; {
       onSuccess && onSuccess(true);
     } else if (code === -7) {
       Modal.confirm({
-        title: "温馨提示:",
+        title: FriendlyReminder,
         content: <div>{handleGetMsg(msg)}</div>,
-        okText: "确认",
-        cancelText: "取消",
+        okText: BtnSure,
+        cancelText: BtnCancel,
         onOk() {
           handleProcedureCall(params, 1);
         },
@@ -11878,6 +11878,11 @@ const useCommonTableEvent = props =&gt; {
     );
     return decimalPlaces;
   }
+  const TotalReported = commonFunc.showLocalMessage(props, 'TotalReported', '已报合计');
+  const Trayproduction = commonFunc.showLocalMessage(props, 'Trayproduction', '托盘产量');
+  const Outputproduction = commonFunc.showLocalMessage(props, 'Outputproduction', '报工产量');
+  const Workinghours = commonFunc.showLocalMessage(props, 'Workinghours', '计时工时');
+  const pieceworkHours = commonFunc.showLocalMessage(props, 'pieceworkHours', '计件工时');
   if (
     (["12710101117087404588200", "12710101117260270570210"].includes(
@@ -11912,14 +11917,14 @@ const useCommonTableEvent = props =&gt; {
       );
       return (
         <div className={styles.totalDiv}>
-          <div className="total">已报合计</div>
-          <div className="totalName">计件工时:</div>
+          <div className="total">{TotalReported}</div>
+          <div className="totalName">{pieceworkHours}:</div>
           <div className="totalValue">{dWageHour}</div>
-          <div className="totalName">计时工时:</div>
+          <div className="totalName">{Workinghours}:</div>
           <div className="totalValue">{dTimeHour}</div>
-          <div className="totalName">报工产量:</div>
+          <div className="totalName">{Outputproduction}:</div>
           <div className="totalValue">{dProcessQty}</div>
-          <div className="totalName">托盘产量:</div>
+          <div className="totalName">{Trayproduction}</div>
           <div className="totalValue">{dReportQtySum}</div>
         </div>
       );
@@ -20,11 +20,11 @@ const ButtonComponent = props =&gt; {
   if ([3, 4, 5, 6].includes(iTeamType)) {
     const scheduledTasks = managementData.find(
-      item => item.sMenuName === "计划任务"
+      item => (item.sMenuName === "计划任务" || item.sMenuName?.trim() === "Scheduled Tasks")
     );
     if (scheduledTasks && scheduledTasks.children) {
       const iIndex = scheduledTasks.children.findIndex(
-        child => child.sMenuName === "生产返工"
+        child => (child.sMenuName === "生产返工" || child.sMenuName?.trim() === "Production Rework")
       );
       if (iIndex !== -1) {
         scheduledTasks.children.splice(iIndex, 1);
@@ -32,23 +32,35 @@ const ButtonComponent = props =&gt; {
     }
     const restArr = [];
-    if (iTeamType === 3) {
-      restArr.push("研发工艺参数");
-    } else if ([4, 5].includes(iTeamType)) {
-      restArr.push("研发工艺参数(烫金)");
-      restArr.push("研发工艺参数(模切)");
-    } else if (iTeamType === 6) {
-      restArr.push("研发工艺参数(丝印)");
+    if(userinfo?.sLanguage ==='sEnglish') {
+      if (iTeamType === 3) {
+        restArr.push("研发工艺参数");
+      } else if ([4, 5].includes(iTeamType)) {
+        restArr.push("研发工艺参数(烫金)");
+        restArr.push("研发工艺参数(模切)");
+      } else if (iTeamType === 6) {
+        restArr.push("研发工艺参数(丝印)");
+      }
+    } else{
+      if (iTeamType === 3) {
+        restArr.push("R&D Process Parameters");
+      } else if ([4, 5].includes(iTeamType)) {
+        restArr.push("R&D Process Parameters (Hot Stampinging)");
+        restArr.push("R&D Process Parameters (Die-Cutting)");
+      } else if (iTeamType === 6) {
+        restArr.push("R&D Process Parameters (Screen Printing)");
+      }
     }
     const productionExecMain = managementData.find(
-      item => item.sMenuName === "生产执行"
+      item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution")
     );
-    if (productionExecMain && productionExecMain.children) {
+    console.log('productionExecMain', productionExecMain);
+    if ( productionExecMain && productionExecMain.children) {
       const forLength = productionExecMain.children.length;
       for (let i = 0; i < forLength; i++) {
         const iIndex = productionExecMain.children.findIndex(
           child =>
-            !["生产执行", "质量巡检", "研发改版记录", ...restArr].includes(
+            !["生产执行", "质量巡检", "研发改版记录", "Production Execution", "Quality Inspection", "R&D Revision Records", ...restArr].includes(
               child.sMenuName
             )
         );
@@ -59,12 +71,12 @@ const ButtonComponent = props =&gt; {
     }
   } else {
     const productionExecMain = managementData.find(
-      item => item.sMenuName === "生产执行"
+      item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution")
     );
     if (productionExecMain && productionExecMain.children) {
       for (let i = 0; i < 4; i++) {
         const iIndex = productionExecMain.children.findIndex(child =>
-          child.sMenuName.includes("研发工艺参数")
+          child.sMenuName.includes("研发工艺参数") ||  child.sMenuName.includes("R&D Process Parameters")
         );
         if (iIndex !== -1) {
           productionExecMain.children.splice(iIndex, 1);
@@ -75,12 +87,12 @@ const ButtonComponent = props =&gt; {
   if (sWorkshopId !== "20240511102738376607209385783909") {
     const productionExecMain = managementData.find(
-      item => item.sMenuName === "生产执行"
+      item => (item.sMenuName === "生产执行" || item.sMenuName === "Production Execution")
     );
     if (productionExecMain && productionExecMain.children) {
       const iIndex = productionExecMain.children.findIndex(child =>
-        child.sMenuName.includes("研发改版记录")
-      );
+        (child.sMenuName.includes("研发改版记录") ||  child.sMenuName.includes("R&D Revision Records"))
+    );
       if (iIndex !== -1) {
         productionExecMain.children.splice(iIndex, 1);
       }
@@ -257,7 +269,7 @@ const ButtonComponent = props =&gt; {
     }
     menuList.push(result);
   });
-
+  console.log('menuList:', menuList);
   dataList.forEach(item => {
     if (!menuList.some(item1 => item1.name === item.name)) {
       const iIndex = menuList.findIndex(item1 => !item1);
@@ -265,6 +277,8 @@ const ButtonComponent = props =&gt; {
     }
   });
+  console.log('dataList:', dataList);
+
   // 点击
   const itemClick = e => {
     const { id, disabled, sName } = e;
@@ -1275,11 +1275,11 @@ const BarcodeComponent = props =&gt; {
       document.body.removeEventListener("keypress", keypressEvent);
     };
   }, []);
-
+  const clickScan = commonFunc.showLocalMessage(props, 'clickScan', '请鼠标点击后扫码');
   return (
     <div className={styles.barcode}>
       <Input
-        placeholder="请鼠标点击后扫码"
+        placeholder={clickScan}
         value={value}
         onChange={event => {
           if (value && scanEventTime.current === -1) {
@@ -13,12 +13,14 @@ const InputMultiModalComponent = props =&gt; {
     sId: commonUtils.createSid(),
     sMemo: value.replace(/；/g, ",")
   });
+  const dpSelect = commonFunc.showLocalMessage(props, 'dpSelect', '下拉选择');
+  const content = commonFunc.showLocalMessage(props, 'content', '内容');
   const viewConfigs = [
     {
       sId: showConfig.sId + "1",
       sName: "sMemo",
-      showName: "内容",
+      showName: content,
       sControlName: "",
       iRowValue: 6,
       iColValue: 24
@@ -26,7 +28,7 @@ const InputMultiModalComponent = props =&gt; {
     {
       ...showConfig,
       sName: "sSelect",
-      showName: "下拉选择",
+      showName: dpSelect,
       bCanInput: true,
       iColValue: 24
     }
@@ -261,6 +261,9 @@ const useLoginEvent = props =&gt; {
       bDelayedOvertime
     } = dataReturn.dataset.rows[0];
+
+    console.log('vvvv', managementData);
+
     gdslogininfo.bDelayedOvertime = bDelayedOvertime;
     const userinfo = { ...teamInfo, ...gdslogininfo };
     const {
@@ -55,7 +55,7 @@
         }
         .cellBox {
-          height: 40px;
+          height: 52px;
         }
         .colExpire {
@@ -75,7 +75,7 @@
           text-align: center;
           // color: #fff;
           font-size: 16px;
-          line-height: 1.4;
+          line-height: 1;
         }
         &.front .hasShow {
@@ -245,4 +245,4 @@
       }
     }
   }
-}
 \ No newline at end of file
+}
@@ -536,7 +536,8 @@ const ProductionExecContentByType = props =&gt; {
     setPagesLoading,
     refreshCount = 0
   } = props;
-
+  const PRrevisionEnd = commonFunc.showLocalMessage(props, 'Proofreading/revisionEnd', '装校版结束');
+  const PRrevisionStart = commonFunc.showLocalMessage(props, 'Proofreading/revisionStart', '装校版开始');
   /**
    * 设备状态值
    */
@@ -556,7 +557,7 @@ const ProductionExecContentByType = props =&gt; {
       const showValue = {
         stop: {
-          showName: "装校版结束",
+          showName: PRrevisionEnd,
           onClick: config =>
             operationFetch(props, config, undefined, () => {
               props.onSaveState({
@@ -566,7 +567,7 @@ const ProductionExecContentByType = props =&gt; {
             })
         },
         again: {
-          showName: "装校版开始",
+          showName: PRrevisionStart,
           onClick: config =>
             operationFetch(props, config, "again", () => {
               props.onSaveState({
@@ -758,7 +759,13 @@ const ProductionExecContent = props =&gt; {
     if (!oNavList) return;
     oNavList.childNodes[index].click();
   };
-
+  const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记');
+  const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记');
+  const Blanking = commonFunc.showLocalMessage(props, 'finishConstruction', '下料');
+  const product1 = commonFunc.showLocalMessage(props, 'product1', '产量①');
+  const product2 = commonFunc.showLocalMessage(props, 'product2', '产品②');
+  const revoke = commonFunc.showLocalMessage(props, 'revoke', '撤销');
+  const abnormal3 = commonFunc.showLocalMessage(props, 'abnormal3', '异常③');
   return (
     <div className={styles.type1}>
       <div className="topPart">
@@ -775,7 +782,7 @@ const ProductionExecContent = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnEventBlanking")}
                   >
-                    下料
+                    {Blanking}
                   </Button>
                 </Space>
                 <Space>
@@ -783,13 +790,13 @@ const ProductionExecContent = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnPrint1")}
                   >
-                    产量①
+                    {product1}
                   </Button>
                   <Button
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnPrint2")}
                   >
-                    产品②
+                    {product2}
                   </Button>
                   {/* <Button {...btnProps}>产品②</Button> */}
                 </Space>
@@ -802,7 +809,7 @@ const ProductionExecContent = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnCancel")}
                   >
-                    撤销
+                    {revoke}
                   </Button>
                 </Space>
                 <Space className="rightPart">
@@ -810,7 +817,7 @@ const ProductionExecContent = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnPrint3")}
                   >
-                    异常③
+                    {abnormal3}
                   </Button>
                   {/* <Button {...btnProps}>撤销</Button> */}
                 </Space>
@@ -862,14 +869,14 @@ const ProductionExecContent = props =&gt; {
               size="large"
               onClick={changeTab.bind(this, 0)}
             >
-              物料消耗登记
+              {MCR}
             </Button>
             <Button
               type="primary"
               size="large"
               onClick={changeTab.bind(this, 2)}
             >
-              版材消耗登记
+              {PMCR}
             </Button>
           </Space>
         </div>
@@ -1014,6 +1021,13 @@ const ProductionExecContent0 = props =&gt; {
     },
     noGetData: !selectedRowKeys.length
   };
+  const Blanking = commonFunc.showLocalMessage(props, 'finishConstruction', '下料');
+  const product1 = commonFunc.showLocalMessage(props, 'product1', '产量①');
+  const product2 = commonFunc.showLocalMessage(props, 'product2', '产品②');
+  const Revoke = commonFunc.showLocalMessage(props, 'revoke', ' 撤销');
+  const abnormal3 = commonFunc.showLocalMessage(props, 'abnormal3', '异常③');
+  const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记');
+  const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记');
   const tabRef = useRef();
   const changeTab = index => {
@@ -1039,7 +1053,7 @@ const ProductionExecContent0 = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnEventBlanking")}
                   >
-                    下料
+                    {Blanking}
                   </Button>
                 </Space>
                 <Space>
@@ -1047,13 +1061,13 @@ const ProductionExecContent0 = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnPrint1")}
                   >
-                    产量①
+                    {product1}
                   </Button>
                   <Button
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnPrint2")}
                   >
-                    产品②
+                    {product2}
                   </Button>
                   {/* <Button {...btnProps}>产品②</Button> */}
                 </Space>
@@ -1066,7 +1080,7 @@ const ProductionExecContent0 = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnCancel")}
                   >
-                    撤销
+                    {Revoke}
                   </Button>
                 </Space>
                 <Space className="rightPart">
@@ -1074,7 +1088,7 @@ const ProductionExecContent0 = props =&gt; {
                     {...btnProps}
                     {...getBtnConfigByControlName("BtnPrint3")}
                   >
-                    异常③
+                    {abnormal3}
                   </Button>
                   {/* <Button {...btnProps}>撤销</Button> */}
                 </Space>
@@ -1126,14 +1140,14 @@ const ProductionExecContent0 = props =&gt; {
               size="large"
               onClick={changeTab.bind(this, 0)}
             >
-              物料消耗登记
+              {MCR}
             </Button>
             <Button
               type="primary"
               size="large"
               onClick={changeTab.bind(this, 2)}
             >
-              版材消耗登记
+              {PMCR}
             </Button>
           </Space>
         </div>
@@ -560,7 +560,7 @@
           return [
             { showName, btnBgColor, sDefault, startWorkConfig, pauseWorkConfig },
-            { showName: "完工", btnBgColor: "#1890FF", sDefault }
+            { showName: finishConstruction, btnBgColor: "#1890FF", sDefault }
           ];
           // return [
@@ -555,8 +555,8 @@ const TeamInfo = baseProps =&gt; {
   const classGroup = commonFunc.showLocalMessage(props, 'classGroup', '班组');
   const foreman = commonFunc.showLocalMessage(props, 'foreman', '领班');
-  console.log('2222', teamInformation);
+  const ClearOut = commonFunc.showLocalMessage(props, 'ClearOut', '清空');
   return (
     <div className={styles.teamInfo}>
@@ -622,7 +622,7 @@ const TeamInfo = baseProps =&gt; {
             </ul>
             <div style={{ 'position': 'relative' }}>
                 <CommonViewTable  {...viewProps} className="temporaryIpqc"></CommonViewTable>
-                <Button style={{    'position': 'absolute' , 'top': '20%' ,'right': '2%'}} type="primary" onClick={() => { clearTempIpqc() }} > 清空 </Button>
+                {/*<Button style={{    'position': 'absolute' , 'top': '20%' ,'right': '2%'}} type="primary" onClick={() => { clearTempIpqc() }} > {ClearOut} </Button>*/}
             </div>
           </div>