From 80a81cb6fca62d4366987dbe53c730d901ebf4fc Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Thu, 23 Oct 2025 11:11:29 +0800
Subject: [PATCH] 1.EBC版本都有这个问题，选择第三个查询方案”全部机台计划”，界面就一片灰色

---
 src/components/Common/CommonList.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/components/Common/CommonList.js b/src/components/Common/CommonList.js
index 3e76b2f..710ef68 100644
--- a/src/components/Common/CommonList.js
+++ b/src/components/Common/CommonList.js
@@ -1,12 +1,13 @@
 import React, { Component, useMemo, useState } from 'react';
 import { Form } from '@ant-design/compatible';
-// import '@ant-design/compatible/assets/index.css';
+import '@ant-design/compatible/assets/index.css';
 import { Layout, Spin, Slider, Button } from 'antd-v4';
 import { MessageOutlined, MinusOutlined } from '@ant-design/icons';
 import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */
 import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 import Toolbar from '@/components/Common/ToolBar/ToolBarNew';
 import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */
+import StaticEditTableNew from '@/components/Common/CommonTable';/* 可编辑表格 */
 import styles from '@/index.less';
 import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */
 import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */
@@ -417,7 +418,7 @@ const TreeTableComponent = (props) => {
   };
 
   let slaveTreeData = slaveData;
-  const bTree = slaveConfig?.sTableType === 'single' && slaveData?.some(item => !!item.sFatherSlaveId || !!item.sParentId);
+  const bTree = slaveConfig?.sTableType === 'single' && slaveData?.some(item => !!item.sFatherSlaveId);
   if (bTree) {
     let keyField = 'sId';
     let keyParentField = 'sParentId';
@@ -426,14 +427,6 @@ const TreeTableComponent = (props) => {
     if (commonUtils.isNotEmptyArr(formData)) {
       // eslint-disable-next-line prefer-destructuring
       sSqlCondition = formData[0].sSqlCondition;
-      if (commonUtils.isEmptyObject(sSqlCondition)) {
-        const bParentId = slaveConfig?.sTableType === 'single' && slaveData?.some(item => !!item.sParentId);
-        if (bParentId) {
-          sSqlCondition = 'slave.sId.sParentId';
-        } else {
-          sSqlCondition = 'slave.sId.sFatherSlaveId';
-        }
-      }
       const parts = sSqlCondition.split('.');
       if (commonUtils.isNotEmptyObject(sSqlCondition) && commonUtils.isNotEmptyArr(parts) && parts.length > 2) {
         // eslint-disable-next-line prefer-destructuring
@@ -470,7 +463,8 @@ const TreeTableComponent = (props) => {
         height: '100%',
       }}
     >
-      <StaticEditTable {...tableProps} tableBelone="list" />
+      {/* <StaticEditTable {...tableProps} tableBelone="list" /> */}
+      <StaticEditTableNew {...tableProps} />
     </div>
   );
 };
--
libgit2 0.22.2