diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index f1386a0..600598b 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -1309,10 +1309,7 @@ class CommonTableRc extends React.Component { }) } - this.props.onCostomColums?.([ - ...tableColumn, - ...subTableColumn - ]); + this.props.onCostomColums?.([...tableColumn, ...subTableColumn]); // 判断工序状态 if (commonUtils.isNotEmptyArr(sPartNameStatus) && commonUtils.isNotEmptyArr(dataSource)) { @@ -1322,12 +1319,14 @@ class CommonTableRc extends React.Component { sPartNameStatus[0].render = (itemStr) => { if (commonUtils.isJSON(itemStr)) { const sPartItem = JSON.parse(itemStr); + return ( //