From 3f49020ad441eebda25f5912ddaed8a051fe2fe5 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Wed, 29 Oct 2025 11:10:57 +0800
Subject: [PATCH] 1.修复subbill导入数据 不展示问题

---
 src/components/Common/CommonSubBill.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/Common/CommonSubBill.js b/src/components/Common/CommonSubBill.js
index 9da4738..9e40fdd 100644
--- a/src/components/Common/CommonSubBill.js
+++ b/src/components/Common/CommonSubBill.js
@@ -140,7 +140,7 @@ class CommonSubBill extends Component {
   handleUploadChangeFile = async (info) => {
     const { file } = info;
     const {
-      masterData, sModelsId, app, token, sModelsType, masterConfig, formData = [],
+      masterData, sModelsId, app, token, sModelsType, masterConfig, formData = [], slaveData, slaveSelectedRowKeys,
     } = this.props;
     if (file.response) {
       if (file.response.code === 1) {
@@ -192,6 +192,23 @@ class CommonSubBill extends Component {
             iCount += 1;
             tableDataRow.iOrder = iCount;
           }
+          if(temp === 'slaveChild') {
+            let slaveRow = {};
+            if(commonUtils.isNotEmptyArr(slaveData)) {
+              if(commonUtils.isNotEmptyArr(slaveSelectedRowKeys)) {
+                const iSIndex =  slaveData.findIndex(item =>slaveSelectedRowKeys.includes(item.sId));
+                if(iSIndex > -1) {
+                  slaveRow =  slaveData[iSIndex];
+                }
+              } else {
+                slaveRow =  slaveData[0];
+              }
+              if(commonUtils.isNotEmptyObject(slaveRow)){
+                tableDataRow.sSqlConditionId = slaveRow.sSqlConditionId;
+              }
+
+            }
+          }
           for (const child of Object.keys(tableDataRow)) {
             const index = child.indexOf('_sRealValue_');
             if (index > -1) {
--
libgit2 0.22.2