Merge branch 'release/customer/2025/五彩' of http://git.xlyprint.cn/qiangmj/ebc-Me…

…s into release/customer/2025/五彩

Merge branch 'release/customer/2025/五彩' of http://git.xlyprint.cn/qiangmj/ebc-Me…
…s into release/customer/2025/五彩
chenxt
2 parents c2f90aeb 73119023
Showing 2 changed files with 19 additions and 7 deletions
src/mes/common/commonOperationBarComponent/index.js
src/mes/teamInfo/index.js
@@ -782,7 +782,7 @@ const CommonOperationBarComponent = basProps =&gt; {
     item => item.bVisible && item.sControlName.includes("BtnLeft.")
   );
   console.log(btnLeftConfig,gdsconfigformslave, 'btnLeftConfig');
-  
+
   // 将扫码上料放到最后
   const scanCodeToLoadMaterialsIndex = btnLeftConfig.findIndex(
     item => item.showName === "扫码上料"
@@ -815,9 +815,13 @@ const CommonOperationBarComponent = basProps =&gt; {
     btnLeftConfig[0].btnBgColor = "red";
   }
-  const btnRightConfig = gdsconfigformslave.filter(
-    item => item.bVisible && item.sControlName.includes("BtnRight.")
-  );
+  const bManual = props.bManual;
+  const btnRightConfig = gdsconfigformslave.filter(item => {
+    // 排除条件：sControlName是BtnRight.BtnEnventInsertWork且bManual=1的项
+    const isExcludeItem = item.sControlName === 'BtnRight.BtnEnventInsertWork' && !bManual;
+    // 保留条件：不是排除项，且满足原有过滤规则
+    return !isExcludeItem && item.bVisible && item.sControlName.includes('BtnRight.');
+  });
   if (!searchField && !btnRightConfig.length) return "";
@@ -482,8 +482,12 @@ const TeamInfo = baseProps =&gt; {
     }
   };
-  const { bManual, sForemanName = "", sIpqcName = "", sEmployeeName = "" } =
+  const { sForemanName = "", sIpqcName = "", sEmployeeName = "" } =
     props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {};
+  const { app } = props;
+  const { userinfo }= app;
+  const bManual = userinfo?.bManual;
+
   const { sTeamEmployeeNo = "" } = props.slave0Data?.[0] || {};
   const foremanConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === 'sForemanName') || {};
@@ -497,7 +501,8 @@ const TeamInfo = baseProps =&gt; {
   const operationBarProps = {
     ...props,
-    sName: "slave0"
+    sName: "slave0",
+    bManual
   };
   const tableHeight = bManual ? "calc(88vh - 80px)" : "calc(25vh - 80px)";
   return (
@@ -688,7 +693,10 @@ const FaceLoginModal = props =&gt; {
 };
 const TeamJoinInfo = props => {
-  const { slave1Config, slave1Data, bManual } = props;
+  const { slave1Config, slave1Data} = props;
+  const { app } = props;
+  const { userinfo }= app;
+  const bManual = userinfo?.bManual;
   const joinInfoData = commonUtils.filteredArr(
     slave1Config?.gdsconfigformslave.map(e => {