角标数字根据id来

chenxt
1 parent 45ebf8e3
Showing 2 changed files with 6 additions and 3 deletions
src/components/Common/CommonHooks/useCommonBase.js
src/mes/common/buttonComponent/index.js
@@ -4096,7 +4096,7 @@ const useLoadSubscriptNum = props =&gt; {
           const { table0 = 0, table1 = 0, table2 = 0, table3 = 0 } = counterRow;
           props.dispatch({
             type: "app/setCounter",
-            payload: { table0, table1, table2, table3 }
+            payload: { table0, table1, table2, table3 , counterRow}
           });
         }
       });
@@ -15,7 +15,7 @@ const getNavIcon = (bActive, iconName = 2) =&gt; {
 const ButtonComponent = props => {
   const { app, sModelsId, currentContent, menuMap } = props;
   const { managementData, userinfo = {} } = app;
-  const { iTeamType, bManual = false  } = userinfo;
+  const { iTeamType, bManual = false } = userinfo;
   const [expand, setExpand] = useState(true);
   const [dataList, setDataList] = useState([]);
@@ -114,7 +114,7 @@ const ButtonComponent = props =&gt; {
   };
   const counterInfo = props.app.counterInfo || {};
-  const { table0 = 0, table1 = 0, table2 = 0, table3 = 0 } = counterInfo;
+  const { table0 = 0, table1 = 0, table2 = 0, table3 = 0, counterRow = {} } = counterInfo;
   // 每个item
   const renderItem = (e, index) => {
     // （取消）延迟加班按钮
@@ -158,7 +158,10 @@ const ButtonComponent = props =&gt; {
       count = table2;
     } else if (e.name === "其它机台日报") {
       count = table3;
+    } else {
+      count = counterRow[e.id] ? Number(counterRow[e.id]): 0
     }
+
     const workFirst = commonFunc.showLocalMessage(props, 'workFirst！', '请先上班后再操作');
     return (