Commit 80a81cb6fca62d4366987dbe53c730d901ebf4fc
1 parent
c7315d91
1.EBC版本都有这个问题,选择第三个查询方案”全部机台计划”,界面就一片灰色
Showing
1 changed file
with
5 additions
and
11 deletions
src/components/Common/CommonList.js
| 1 | import React, { Component, useMemo, useState } from 'react'; | 1 | import React, { Component, useMemo, useState } from 'react'; |
| 2 | import { Form } from '@ant-design/compatible'; | 2 | import { Form } from '@ant-design/compatible'; |
| 3 | -// import '@ant-design/compatible/assets/index.css'; | 3 | +import '@ant-design/compatible/assets/index.css'; |
| 4 | import { Layout, Spin, Slider, Button } from 'antd-v4'; | 4 | import { Layout, Spin, Slider, Button } from 'antd-v4'; |
| 5 | import { MessageOutlined, MinusOutlined } from '@ant-design/icons'; | 5 | import { MessageOutlined, MinusOutlined } from '@ant-design/icons'; |
| 6 | import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ | 6 | import CommonListEvent from '@/components/Common/CommonListEvent';/* 继承销售模块业务功能 */ |
| 7 | import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ | 7 | import * as commonFunc from '@/components/Common/commonFunc';/* 通用单据方法 */ /* 通用单据方法 */ |
| 8 | import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; | 8 | import Toolbar from '@/components/Common/ToolBar/ToolBarNew'; |
| 9 | import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */ | 9 | import StaticEditTable from '@/components/Common/CommonTable';/* 可编辑表格 */ |
| 10 | +import StaticEditTableNew from '@/components/Common/CommonTable';/* 可编辑表格 */ | ||
| 10 | import styles from '@/index.less'; | 11 | import styles from '@/index.less'; |
| 11 | import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */ | 12 | import CommonBase from '@/components/Common/CommonBase';/* 获取配置及数据 */ |
| 12 | import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */ | 13 | import * as commonBusiness from '@/components/Common/commonBusiness';/* 单据业务功能 */ |
| @@ -417,7 +418,7 @@ const TreeTableComponent = (props) => { | @@ -417,7 +418,7 @@ const TreeTableComponent = (props) => { | ||
| 417 | }; | 418 | }; |
| 418 | 419 | ||
| 419 | let slaveTreeData = slaveData; | 420 | let slaveTreeData = slaveData; |
| 420 | - const bTree = slaveConfig?.sTableType === 'single' && slaveData?.some(item => !!item.sFatherSlaveId || !!item.sParentId); | 421 | + const bTree = slaveConfig?.sTableType === 'single' && slaveData?.some(item => !!item.sFatherSlaveId); |
| 421 | if (bTree) { | 422 | if (bTree) { |
| 422 | let keyField = 'sId'; | 423 | let keyField = 'sId'; |
| 423 | let keyParentField = 'sParentId'; | 424 | let keyParentField = 'sParentId'; |
| @@ -426,14 +427,6 @@ const TreeTableComponent = (props) => { | @@ -426,14 +427,6 @@ const TreeTableComponent = (props) => { | ||
| 426 | if (commonUtils.isNotEmptyArr(formData)) { | 427 | if (commonUtils.isNotEmptyArr(formData)) { |
| 427 | // eslint-disable-next-line prefer-destructuring | 428 | // eslint-disable-next-line prefer-destructuring |
| 428 | sSqlCondition = formData[0].sSqlCondition; | 429 | sSqlCondition = formData[0].sSqlCondition; |
| 429 | - if (commonUtils.isEmptyObject(sSqlCondition)) { | ||
| 430 | - const bParentId = slaveConfig?.sTableType === 'single' && slaveData?.some(item => !!item.sParentId); | ||
| 431 | - if (bParentId) { | ||
| 432 | - sSqlCondition = 'slave.sId.sParentId'; | ||
| 433 | - } else { | ||
| 434 | - sSqlCondition = 'slave.sId.sFatherSlaveId'; | ||
| 435 | - } | ||
| 436 | - } | ||
| 437 | const parts = sSqlCondition.split('.'); | 430 | const parts = sSqlCondition.split('.'); |
| 438 | if (commonUtils.isNotEmptyObject(sSqlCondition) && commonUtils.isNotEmptyArr(parts) && parts.length > 2) { | 431 | if (commonUtils.isNotEmptyObject(sSqlCondition) && commonUtils.isNotEmptyArr(parts) && parts.length > 2) { |
| 439 | // eslint-disable-next-line prefer-destructuring | 432 | // eslint-disable-next-line prefer-destructuring |
| @@ -470,7 +463,8 @@ const TreeTableComponent = (props) => { | @@ -470,7 +463,8 @@ const TreeTableComponent = (props) => { | ||
| 470 | height: '100%', | 463 | height: '100%', |
| 471 | }} | 464 | }} |
| 472 | > | 465 | > |
| 473 | - <StaticEditTable {...tableProps} tableBelone="list" /> | 466 | + {/* <StaticEditTable {...tableProps} tableBelone="list" /> */} |
| 467 | + <StaticEditTableNew {...tableProps} /> | ||
| 474 | </div> | 468 | </div> |
| 475 | ); | 469 | ); |
| 476 | }; | 470 | }; |