Commit b8022c9498a36fcb239df2916e4a62d428d7d8ec
1 parent
38aa9276
1.修复checkbill的多语言翻译
Showing
1 changed file
with
7 additions
and
1 deletions
src/components/Common/CommonCheckBill/index.js
| @@ -1985,6 +1985,12 @@ const BillComponent = Form.create({ | @@ -1985,6 +1985,12 @@ const BillComponent = Form.create({ | ||
| 1985 | // 匹配数字 | 1985 | // 匹配数字 |
| 1986 | // eslint-disable-next-line no-unused-vars | 1986 | // eslint-disable-next-line no-unused-vars |
| 1987 | const num = item.replace(/[^\d]/g, ' '); | 1987 | const num = item.replace(/[^\d]/g, ' '); |
| 1988 | + let tabName = item.replace(/\d+/g,''); | ||
| 1989 | + /* 从主表配置 找到控件名=tabName,否则取他的showName */ | ||
| 1990 | + const tableConfigArr = masterConfig?.gdsconfigformslave.filter(row => row.sControlName === item.trim()); | ||
| 1991 | + if(commonUtils.isNotEmptyArr(tableConfigArr)) { | ||
| 1992 | + tabName=tableConfigArr[0].showName; | ||
| 1993 | + } | ||
| 1988 | return ( | 1994 | return ( |
| 1989 | <div className="flexArea"> | 1995 | <div className="flexArea"> |
| 1990 | <Divider orientation="left">{item}</Divider> | 1996 | <Divider orientation="left">{item}</Divider> |
| @@ -1992,7 +1998,7 @@ const BillComponent = Form.create({ | @@ -1992,7 +1998,7 @@ const BillComponent = Form.create({ | ||
| 1992 | {...props} | 1998 | {...props} |
| 1993 | // 使高度和从表高度一直 | 1999 | // 使高度和从表高度一直 |
| 1994 | isAutoHeight="ture" | 2000 | isAutoHeight="ture" |
| 1995 | - tableConfigType={item} | 2001 | + tableConfigType={tabName} |
| 1996 | tableConfigTypeArr={diliverConfigTypeArr} | 2002 | tableConfigTypeArr={diliverConfigTypeArr} |
| 1997 | /> | 2003 | /> |
| 1998 | </div> | 2004 | </div> |