diff --git a/src/components/IndexCenter/IndexCenter.js b/src/components/IndexCenter/IndexCenter.js index d6ae3e4..b6c88ac 100644 --- a/src/components/IndexCenter/IndexCenter.js +++ b/src/components/IndexCenter/IndexCenter.js @@ -389,18 +389,91 @@ class IndexCenter extends Component { } const count = Number(item.dToDayNum); if (!Object.keys(flowJson).includes(sChildFlow)) { - const columnsNew = lodash.cloneDeep(columns); - columnsNew[columnsNew.length - 1].render = (text, record, index) => { - const { sChildDetailFlow, sId } = record; - const textNew = sChildDetailFlow; - const obj = { - children: textNew !== null ?
{textNew}
: '', - props: {}, - }; - obj.props.rowSpan = this.mergeCells1(textNew, tableData, 'sChildDetailFlow', sId, record); - return obj; + // 为第二级菜单创建正确的 columns + const columnsNew = [ + { + title: columnDepartment, + dataIndex: 'sDepart', + width: '14%', + render: text => ( +
+ {text} +
+ ), + }, { + title: columnWorkMatters, + dataIndex: 'sMenuUnMemo', + width: '30%', + render: (text, record) =>
{ + this.handleDoubleClick(record); + }} + style={{ color: '#006d75' }} + >{text}
, + }, { + title: columnContent, + dataIndex: 'sMenuWorkFruit', + width: '30%', + render: (text, record) => { + const { sResultModelId } = record; + if (commonUtils.isNotEmptyArr(sResultModelId)) { + return
{ + this.handleJumpToResultModel(record); + }} + style={{ color: '#2f54eb' }} + >{text}
+ } else { + return
{text}
+ } + }, + }, { + title: TodayAffair, + dataIndex: 'dToDayNum', + width: '7%', + render: text =>
{text}
, + }, { + title: unclearedTotal, + dataIndex: 'dTobeDone', + width: '6%', + render: text =>
{text}
, + }, { + title: '子流程', + dataIndex: 'sChildDetailFlow', + width: '10%', + render: (text, record, index) => { + const textNew = text || ''; + const obj = { + children:
{textNew}
, + props: {} + }; + // 为第二级菜单使用 mergeCells 函数计算合并单元格 + // 使用当前行所在的数据数组作为数据源 + if (record.parentData) { + obj.props.rowSpan = this.mergeCells(textNew, record.parentData, 'sChildDetailFlow', index); + } else if (this.state.tableData) { + obj.props.rowSpan = this.mergeCells(textNew, this.state.tableData, 'sChildDetailFlow', index); + } else { + obj.props.rowSpan = 1; + } + return obj; + } + } + ]; + if (sNotShowChildFlow) { + columnsNew.pop(); } - // columnsNew.pop(); flowJson[sChildFlow] = { showName: sChildFlow, sId: `tableTreeData_1_${flowIndex}`,