From 7311902305df8e097a325a501448e415985880d8 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Mon, 22 Dec 2025 15:42:01 +0800
Subject: [PATCH] 1.当设备是手工的时候，刷脸上班按钮展示，其他都不展示

---
 src/mes/common/commonOperationBarComponent/index.js | 12 ++++++++----
 src/mes/teamInfo/index.js                           | 14 +++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js
index 3b0dca6..3eeb6af 100644
--- a/src/mes/common/commonOperationBarComponent/index.js
+++ b/src/mes/common/commonOperationBarComponent/index.js
@@ -782,7 +782,7 @@ const CommonOperationBarComponent = basProps => {
     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 => {
     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 "";
 
diff --git a/src/mes/teamInfo/index.js b/src/mes/teamInfo/index.js
index e85a10b..734b8a5 100644
--- a/src/mes/teamInfo/index.js
+++ b/src/mes/teamInfo/index.js
@@ -482,8 +482,12 @@ const TeamInfo = baseProps => {
     }
   };
 
-  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 => {
 
   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 => {
 };
 
 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 => {
--
libgit2 0.22.2