From a808ce54acc09aa651774b9e76ff43c20bdbc12d Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Fri, 12 Jun 2026 16:27:54 +0800
Subject: [PATCH] 弹窗报错

---
 src/components/Common/CommonBillEvent.js           |  2 --
 src/components/Common/CommonHooks/useCommonBase.js | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js
index af313df..84a3874 100644
--- a/src/components/Common/CommonBillEvent.js
+++ b/src/components/Common/CommonBillEvent.js
@@ -7435,7 +7435,6 @@ export default (ChildComponent) => {
               materials0Data.push(tableDataRowAdd);
             });
           }
-          console.log('222', materials0Data, copyToAssignField);
 
           if (commonUtils.isNotEmptyArr(materials0Data) && location.pathname.includes('processCardPackTableTree')) {
             /* 根据配置过滤数据 */
@@ -7649,7 +7648,6 @@ export default (ChildComponent) => {
 
 
           });
-          console.log('放大镜确认数据：', tbName, tableData, materials0Data)
           this.props.onSaveState({ materials0Data });
         }
       } else if (selectConfig.sControlName && selectConfig.sControlName.includes('BtnPopupMaterials')) { /* 报价单工序表放大镜 选择材料 */
diff --git a/src/components/Common/CommonHooks/useCommonBase.js b/src/components/Common/CommonHooks/useCommonBase.js
index 816262d..a86c52a 100644
--- a/src/components/Common/CommonHooks/useCommonBase.js
+++ b/src/components/Common/CommonHooks/useCommonBase.js
@@ -326,7 +326,7 @@ const useCommonBase = props => {
         }
       }
     }
-    if ( isPagination ) {
+    if (isPagination) {
       condition.pageSize = condition.pageSize || 10; /* 前台传入页数或者默认页数 */
       condition.pageNum = condition.pageNum || 1; /* 前台传入页数或者默认页数 */
     }
@@ -387,14 +387,15 @@ const useCommonBase = props => {
     }
     if (name.includes('slave') && pageRoute.includes('indexPage/commonBill')) {
       delete condition.sId
-      // condition.sSqlCondition = {
-      //   sParentId: sId
-      // }
+      condition.sSqlCondition = {
+        sParentId: condition.sSqlCondition.sParentId
+      }
     }
     // 只有弹窗没有不查询
-    if (name === 'master' && sId === '' && props.parentProps && pageRoute.includes('indexPage/commonBill')) return
+    if (name === 'master' && (sId === '' || !sId) && props.parentProps && pageRoute.includes('indexPage/commonBill')) return
     const dataUrl = `${commonConfig.server_host
       }business/getBusinessDataByFormcustomId/${configDataId}?sModelsId=${sModelsId}&sName=${formSrcRoute}`;
+
     const dataReturn = (await commonServices.postValueService(
       token,
       condition,
--
libgit2 0.22.2