diff --git a/src/components/Common/CommonNewBill.js b/src/components/Common/CommonNewBill.js index ca96a3c..386d768 100644 --- a/src/components/Common/CommonNewBill.js +++ b/src/components/Common/CommonNewBill.js @@ -2622,7 +2622,12 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = 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 (
@@ -2699,7 +2704,12 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = 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 (
@@ -2784,7 +2794,12 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = 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 (
@@ -2830,7 +2845,12 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = 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 (
@@ -2876,7 +2896,12 @@ const BillComponent = Form.create({ // 匹配数字 // eslint-disable-next-line no-unused-vars let num = item.replace(/[^\d]/g, '').trim(); - const tabName = 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 (