From 8926399f3444dcb5e24a02a420d8c1d880d71fa0 Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Mon, 22 Dec 2025 11:00:44 +0800
Subject: [PATCH] 控件根据bVisible展示

---
 src/components/Common/CommonHooks/useCommonBase.js       |  2 +-
 src/components/Common/CommonTable/index.js               |  4 +++-
 src/default.less                                         | 19 +++++++++++++++++--
 src/mes/common/commonModelComponent/index.js             |  4 ++--
 src/mes/common/commonOperationBarComponent/MesToolbar.js |  8 ++++++--
 src/mes/scheduledTasks/machineTasks/index.js             |  2 +-
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index f509fa2..b4542d2 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -1669,7 +1669,7 @@ const useCommonBase = props => {
                   tbName,
                   sConfigName
                 } = sRulesObj;
-                console.log("tbName:", tbName);
+                console.log("tbName:", tbName,);
                 /* 主表单表字段根据条件控制 其他字段的显示与隐藏 */
                 if (commonUtils.isEmptyObject(tbName)) {
                   if (commonUtils.isNotEmptyArr(condition)) {
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 0e592cd..5bf28ba 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -4795,6 +4795,8 @@ class CommonTableRc extends React.Component {
               }}
             />
           }
+          console.log(props?.parentProps?.sModelType, props, 'messsss');
+          
 
           if (this.isPopupShow) {
             const enabled = this.getTableBtnState('BtnPopup', record);
@@ -5058,7 +5060,7 @@ class CommonTableRc extends React.Component {
               ) : (
                 ""
               )}
-              {props.mesAdd
+              {props.mesAdd && props?.parentProps?.sModelType !== '/indexPage/commonList'
                 ? props.mesAdd({
                   tableName: props.name,
                   tableClassName: this.state.tableClassName
diff --git a/src/default.less b/src/default.less
index 332c04e..d3aaa19 100644
--- a/src/default.less
+++ b/src/default.less
@@ -228,7 +228,14 @@
       padding: @td_padding_sub;
     }
   }
-
+  .readonlyStyle{
+    .ant-form-item-control-input-content {
+      input[disabled] {
+      background: #f1f2f8 !important;
+     }
+    }
+     
+  }
   input[disabled] {
     color: #000 !important;
     background: #fff !important;
@@ -364,8 +371,9 @@
       margin-left: 6px;
       margin-top: 6px;
     }
+   
   }
-
+  
   .ant-modal {
     max-width: unset;
   }
@@ -1012,4 +1020,11 @@
       display: none;
     }
   }
+  .readonlyStyle {
+    background: #f1f2f8 !important;
+
+    .sActiveIdStyle {
+      background: #f1f2f8 !important;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index d8c6ba1..06ef866 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -1596,7 +1596,7 @@ const CommonViewTableComponent = props => {
       return gdsconfigformslave.filter(
         item =>
           item.sName &&
-          item.bControl &&
+          item.bVisible &&
           item.sControlName.indexOf("Btn") === -1 &&
           item.sControlName.indexOf("_") === -1
       );
@@ -1609,7 +1609,7 @@ const CommonViewTableComponent = props => {
       );
     }
   });
-
+  
   const operationBarProps = {
     ...props,
     sName,
diff --git a/src/mes/common/commonOperationBarComponent/MesToolbar.js b/src/mes/common/commonOperationBarComponent/MesToolbar.js
index 0597593..9412d12 100644
--- a/src/mes/common/commonOperationBarComponent/MesToolbar.js
+++ b/src/mes/common/commonOperationBarComponent/MesToolbar.js
@@ -1,7 +1,7 @@
 /* eslint-disable */
 import { message } from "antd";
 import * as commonUtils from "@/utils/utils";
-
+import * as commonFunc from "@/components/Common/commonFunc";
 const ToolbarFun = (props) => {
   const { btnConfig, bMesBill } = props;
   const currentMesPane = commonUtils.getAppData("currentMesPane");
@@ -131,10 +131,14 @@ const handleScanFace = (props) => {
         faceData: { sFaceParentId: faceData[0].sParentId, sFaceEmployeeNo: faceData[0].sEmployeeNo },
         onSuccess: (_, dataset) => {
           const { proData = [] } = dataset.rows[0].dataSet;
-          const { [`${addData}Data`]: tableData = [] } = props;
+          const { [`${addData}Data`]: tableData = [], [`${addData}Config`]: config = {} } = props;
+          const { btnConfig = {}, copyToConfig = [], record = {} } = props?.parentProps || {}
+          const copyConfig = config?.gdsconfigformslave?.find(item => item.sControlName.toLowerCase().includes('btnscanface'))
           proData.forEach(item => {
+          const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item)
             tableData.push({
               ...item,
+              ...data,
               sId: commonUtils.createSid(),
               handleType: "add",
               sParentId: props.masterData.sId,
diff --git a/src/mes/scheduledTasks/machineTasks/index.js b/src/mes/scheduledTasks/machineTasks/index.js
index 540380f..d1c0f64 100644
--- a/src/mes/scheduledTasks/machineTasks/index.js
+++ b/src/mes/scheduledTasks/machineTasks/index.js
@@ -578,7 +578,7 @@ const MachineTasks = baseProps => {
     onTableBtnClick: item => {
       props.onTableBtnClick(item);
     },
-    tableBtnsWidth: "280px",
+    tableBtnsWidth: "200px",
     fixedHeight: "335px",
     onCopyTo: handleCopyTo
   };
--
libgit2 0.22.2