Commit be66bbc74974231716c1cfe044d158623882f9a4

Authored by Min
1 parent 5d50f4fd

1.commonBill页签主表如有分页页签,并且单独配置了控件名,则取这个控件名的配置

src/components/Common/CommonNewBill.js
@@ -2541,7 +2541,12 @@ const BillComponent = Form.create({ @@ -2541,7 +2541,12 @@ const BillComponent = Form.create({
2541 // 匹配数字 2541 // 匹配数字
2542 // eslint-disable-next-line no-unused-vars 2542 // eslint-disable-next-line no-unused-vars
2543 let num = item.replace(/[^\d]/g, '').trim(); 2543 let num = item.replace(/[^\d]/g, '').trim();
2544 - const tabName = item.replace(/\d+/g,''); 2544 + let tabName = item.replace(/\d+/g,'');
  2545 + /* 从主表配置 找到控件名=tabName,否则取他的showName */
  2546 + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim());
  2547 + if(commonUtils.isNotEmptyArr(tableConfigArr)) {
  2548 + tabName=tableConfigArr[0].showName;
  2549 + }
2545 return ( 2550 return (
2546 <TabPane tab={tabName} key={num} className="xly-bill-list"> 2551 <TabPane tab={tabName} key={num} className="xly-bill-list">
2547 <div> 2552 <div>