diff --git a/src/components/Common/CommonCheckBill/index.js b/src/components/Common/CommonCheckBill/index.js index 4e7ace0..a8bcace 100644 --- a/src/components/Common/CommonCheckBill/index.js +++ b/src/components/Common/CommonCheckBill/index.js @@ -1985,6 +1985,12 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars const num = item.replace(/[^\d]/g, ' '); + let tabName = item.replace(/\d+/g,''); + /* 从主表配置 找到控件名=tabName,否则取他的showName */ + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return (
{item} @@ -1992,7 +1998,7 @@ const BillComponent = Form.create({ {...props} // 使高度和从表高度一直 isAutoHeight="ture" - tableConfigType={item} + tableConfigType={tabName} tableConfigTypeArr={diliverConfigTypeArr} />
diff --git a/src/components/CommonElementEvent/ElemachineInfo.js b/src/components/CommonElementEvent/ElemachineInfo.js index 851bae1..227db2d 100644 --- a/src/components/CommonElementEvent/ElemachineInfo.js +++ b/src/components/CommonElementEvent/ElemachineInfo.js @@ -171,8 +171,14 @@ const EleMachineInfoComponent = Form.create({ tableConfigTypeArr.map((item) => { // 匹配数字 const num = item.replace(/[^\d]/g, ' '); + let tabName = item.replace(/\d+/g,''); + /* 从主表配置 找到控件名=tabName,否则取他的showName */ + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); + if(commonUtils.isNotEmptyArr(tableConfigArr)) { + tabName=tableConfigArr[0].showName; + } return ( - +