qiangmj / ebc-Mes

Commit 2aa81ad35447888e59fc5529b9db1eadea640c6b

Authored by chenxt
2 parents c2f90aeb 73119023

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

…s into release/customer/2025/五彩
Inline Side-by-side
Showing 2 changed files with 19 additions and 7 deletions
src/mes/common/commonOperationBarComponent/index.js
  View file @2aa81ad
... ... @@ -782,7 +782,7 @@ const CommonOperationBarComponent = basProps => {
782 782 item => item.bVisible && item.sControlName.includes("BtnLeft.")
783 783 );
784 784 console.log(btnLeftConfig,gdsconfigformslave, 'btnLeftConfig');
785   -
  785 +
786 786 // 将扫码上料放到最后
787 787 const scanCodeToLoadMaterialsIndex = btnLeftConfig.findIndex(
788 788 item => item.showName === "扫码上料"
... ... @@ -815,9 +815,13 @@ const CommonOperationBarComponent = basProps => {
815 815 btnLeftConfig[0].btnBgColor = "red";
816 816 }
817 817  
818   - const btnRightConfig = gdsconfigformslave.filter(
819   - item => item.bVisible && item.sControlName.includes("BtnRight.")
820   - );
  818 + const bManual = props.bManual;
  819 + const btnRightConfig = gdsconfigformslave.filter(item => {
  820 + // 排除条件：sControlName是BtnRight.BtnEnventInsertWork且bManual=1的项
  821 + const isExcludeItem = item.sControlName === 'BtnRight.BtnEnventInsertWork' && !bManual;
  822 + // 保留条件：不是排除项，且满足原有过滤规则
  823 + return !isExcludeItem && item.bVisible && item.sControlName.includes('BtnRight.');
  824 + });
821 825  
822 826 if (!searchField && !btnRightConfig.length) return "";
823 827  
... ...
src/mes/teamInfo/index.js
  View file @2aa81ad
... ... @@ -482,8 +482,12 @@ const TeamInfo = baseProps => {
482 482 }
483 483 };
484 484  
485   - const { bManual, sForemanName = "", sIpqcName = "", sEmployeeName = "" } =
  485 + const { sForemanName = "", sIpqcName = "", sEmployeeName = "" } =
486 486 props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {};
  487 + const { app } = props;
  488 + const { userinfo }= app;
  489 + const bManual = userinfo?.bManual;
  490 +
487 491 const { sTeamEmployeeNo = "" } = props.slave0Data?.[0] || {};
488 492  
489 493 const foremanConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === 'sForemanName') || {};
... ... @@ -497,7 +501,8 @@ const TeamInfo = baseProps => {
497 501  
498 502 const operationBarProps = {
499 503 ...props,
500   - sName: "slave0"
  504 + sName: "slave0",
  505 + bManual
501 506 };
502 507 const tableHeight = bManual ? "calc(88vh - 80px)" : "calc(25vh - 80px)";
503 508 return (
... ... @@ -688,7 +693,10 @@ const FaceLoginModal = props => {
688 693 };
689 694  
690 695 const TeamJoinInfo = props => {
691   - const { slave1Config, slave1Data, bManual } = props;
  696 + const { slave1Config, slave1Data} = props;
  697 + const { app } = props;
  698 + const { userinfo }= app;
  699 + const bManual = userinfo?.bManual;
692 700  
693 701 const joinInfoData = commonUtils.filteredArr(
694 702 slave1Config?.gdsconfigformslave.map(e => {
... ...