From da399e85abbe77f2312d3af506eff9d5dd893be8 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Mon, 2 Feb 2026 17:11:23 +0800
Subject: [PATCH] 1.处理从表的主体内容展示根据sControlName自定义,主表表单可以根据配置 展示Tab页签

---
 src/components/Common/CommonBill/index.js | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+), 0 deletions(-)

diff --git a/src/components/Common/CommonBill/index.js b/src/components/Common/CommonBill/index.js
index 46797ca..3980adb 100644
--- a/src/components/Common/CommonBill/index.js
+++ b/src/components/Common/CommonBill/index.js
@@ -2445,6 +2445,58 @@ const BillComponent = Form.create({
   let CheckInfo = commonFunc.showMessage(app.commonConst, 'CheckInfo');/* 审批信息 */
   const BtnimportData = commonFunc.showMessage(app.commonConst, 'importData');/* 导入数据 */
   const ImportData = commonUtils.isNotEmptyObject(masterConfig) ? masterConfig.gdsconfigformslave.filter(item => item.sControlName.includes('ImportData') && item.bVisible) : '';/* 后台是否配置导入 */
+  const masterConfigOld = { ...masterConfig };
+  /* 取 masterConfig中有多少个Tab页签配置 */
+  const masterShowConfig = commonUtils.isNotEmptyObject(masterConfigOld)
+    ? masterConfigOld.gdsconfigformslave.filter(item => item.bVisible && item.sName !== "")
+    : [];
+
+  const diliverConfigTypeArr = []; /* 有Tab的配置 */
+  masterShowConfig.forEach(child => {
+    if (child.sControlName.indexOf("_") > -1) {
+      const tableType = child.sControlName.split("_")[1];
+      const isIndex = diliverConfigTypeArr.findIndex(item => item === tableType);
+      if (isIndex === -1) {
+        diliverConfigTypeArr.push(tableType);
+      }
+    }
+  });
+
+
+  /* 主表页签+表格页签排序规则，表格页签以10位一个间隔，10,20,30,40,50,60，如果想进行排序 则页签顺序介入其间即可 */
+  /* 找到各个主表页签Tab所处的区间 */
+  let diliverConfigTypeArr1 = [];
+  let diliverConfigTypeArr2 = [];
+  let diliverConfigTypeArr3 = [];
+  let diliverConfigTypeArr4 = [];
+  let diliverConfigTypeArr5 = [];
+  let diliverConfigTypeArr6 = [];
+  for (const item of diliverConfigTypeArr) {
+    let numStr = item.replace(/[^\d]/g, "").trim();
+    let num = Number(numStr);
+    if (!commonUtils.isEmpty(num)) {
+      if (num < 10) {
+        /* 0- 10 */
+        diliverConfigTypeArr1.push(item);
+      } else if (num < 20) {
+        /* 10- 20 */
+        diliverConfigTypeArr2.push(item);
+      } else if (num < 30) {
+        /* 20- 30 */
+        diliverConfigTypeArr3.push(item);
+      } else if (num < 40) {
+        /* 30- 40 */
+        diliverConfigTypeArr4.push(item);
+      } else if (num < 50) {
+        /* 40- 50 */
+        diliverConfigTypeArr5.push(item);
+      } else if (num < 60) {
+        /* 50- 60 */
+        diliverConfigTypeArr6.push(item);
+      }
+    }
+  }
+
 
 
   if (false && commonUtils.isNotEmptyObject(masterConfig)) {
@@ -2613,11 +2665,63 @@ const BillComponent = Form.create({
                   <Avatar src={props.imgSrc} />
                 </div>
                 <Tabs className={styles.slaveTabs} style={{ overflowY: 'unset' }} tabBarStyle={{ margin: '0 10px' }} >
+                  {commonUtils.isNotEmptyArr(diliverConfigTypeArr1)
+                    ? diliverConfigTypeArr1.map(item => {
+                      // 匹配数字
+                      // eslint-disable-next-line no-unused-vars
+                      let num = item.replace(/[^\d]/g, "").trim();
+                      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 (
+                        <TabPane tab={tabName} key={num} className="xly-bill-list">
+                          <div>
+                            <CommonView
+                              {...props}
+                              // 使高度和从表高度一直
+                              // isAutoHeight="ture"
+                              tableConfigType={item}
+                              tableConfigTypeArr={diliverConfigTypeArr}
+                            />
+                          </div>
+                        </TabPane>
+                      );
+                    })
+                    : ""}
                   <TabPane tab={MainContent} key={10} className="xly-bill-list">
                     <div className="TabPaneStyle">
                       <StaticEditTable {...slaveTableProps} setOpterationColumn={props.sModelsType !== 'cost/cosexpenseshare' ? 'Y' : ''} />
                     </div>
                   </TabPane>
+                  {commonUtils.isNotEmptyArr(diliverConfigTypeArr2)
+                    ? diliverConfigTypeArr2.map(item => {
+                      // 匹配数字
+                      // eslint-disable-next-line no-unused-vars
+                      let num = item.replace(/[^\d]/g, "").trim();
+                      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 (
+                        <TabPane tab={tabName} key={num} className="xly-bill-list">
+                          <div>
+                            <CommonView
+                              {...props}
+                              // 使高度和从表高度一直
+                              // isAutoHeight="ture"
+                              tableConfigType={item}
+                              tableConfigTypeArr={diliverConfigTypeArr2}
+                            />
+                          </div>
+                        </TabPane>
+                      );
+                    })
+                    : ""}
                   {getTabPaneExtra('slave')}
                   {
                     slaveInfoList?.map((item, index) => {
--
libgit2 0.22.2