1.去掉工艺巡检

2.去掉生产返工

1.去掉工艺巡检
2.去掉生产返工
Min
1 parent 28480e2b
Showing 1 changed file with 17 additions and 8 deletions
src/mes/common/buttonComponent/index.js
@@ -158,7 +158,7 @@ const ButtonComponent = props =&gt; {
     ["Process Work Instructions", 4, 'Label Reprint'],
     ["Related Documents", 5, 'Label Reprint'],
     ["Historical Tasks", 6, 'Label Reprint'],
-    ["Production Rework", 2, 'Label Reprint'],
+    // ["Production Rework", 2, 'Label Reprint'],
     // null,
     // null,
     // ["工单物料信息", 7],
@@ -178,7 +178,7 @@ const ButtonComponent = props =&gt; {
     ["工艺作业指导书", 4],
     ["相关文档", 5],
     ["历史任务", 6],
-    ["生产返工", 2],
+    // ["生产返工", 2],
     // null,
     // null,
     // ["工单物料信息", 7],
@@ -202,10 +202,10 @@ const ButtonComponent = props =&gt; {
     // ["班组交接", 18],
     ["工单变更信息", 19],
  
-    ["班组报工", 16],
+    ["班组报工", 16]
     // null,
     // null,
-    ["工艺巡检", 20]
+    // ["工艺巡检", 20]
   ];
  
   const menuOrderListEnglish2 = [
@@ -221,10 +221,10 @@ const ButtonComponent = props =&gt; {
     ["Sign-off/Completion", 17],
     // ["Team Handover", 18],
     ["Work Order Change Information", 19],
-    ["Team Production Reporting", 16],
+    ["Team Production Reporting", 16]
     // null,
     // null,
-    ["Process Inspection", 20]
+    // ["Process Inspection", 20]
   ];
  
   const menuOrderList3 = [
@@ -282,9 +282,18 @@ const ButtonComponent = props =&gt; {
   });
  
   dataList.forEach(item => {
-    if (!menuList.some(item1 => item1.name === item.name)) {
+    // 增加一个条件：item.name 不能是那两个值
+    if (item.name !== 'Production Rework' &&
+      item.name !== 'Process Patrol Inspection' &&
+      !menuList.some(item1 => item1.name === item.name)) {
       const iIndex = menuList.findIndex(item1 => !item1);
-      menuList[iIndex] = item;
+      // 检查是否找到了可替换的位置
+      if (iIndex !== -1) {
+        menuList[iIndex] = item;
+      } else {
+        // 如果 menuList 中没有空位了，可以选择 push 到末尾或者做其他处理
+        // menuList.push(item);
+      }
     }
   });