Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents 8a6c4959 b8022c94
Showing 4 changed files with 16 additions and 4 deletions
src/components/Common/CommonCheckBill/index.js
src/components/CommonElementEvent/ElemachineInfo.js
src/components/CommonElementEvent/SisformulaInfo.js
src/components/FaceDetect/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 (
                       <div className="flexArea">
                         <Divider orientation="left">{item}</Divider>
@@ -1992,7 +1998,7 @@ const BillComponent = Form.create({
                           {...props}
                             // 使高度和从表高度一直
                           isAutoHeight="ture"
-                          tableConfigType={item}
+                          tableConfigType={tabName}
                           tableConfigTypeArr={diliverConfigTypeArr}
                         />
                       </div>
@@ -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 (
-                        <TabPane tab={item} key={num} className="xly-bill-list" style={{ height: AutoTableHeight }}>
+                        <TabPane tab={tabName} key={num} className="xly-bill-list" style={{ height: AutoTableHeight }}>
                           <div>
                             <CommonView
                               {...props}
@@ -168,7 +168,7 @@ const SisformulaComponent = Form.create({
   const selfParamPropsType = {
     ...commonBusiness.getTableTypes('selfParam', props),
     tableProps: {
-      AutoTableHeight: 255,
+      AutoTableHeight: 150,
     },
     // bNaturalWidth: true, /* 原始宽度 不进行最后一列计算 */
     rowSelection: null,
@@ -408,7 +408,7 @@ class FaceDetect extends Component {
   render() {
     const enable = ((this.props.enabled && this.user_id !== '' )|| this.props.actionType === 'identifyFace');
-    const faceCollection = commonFunc.showMessage(this.props.app.commonConst, 'faceCollection') || '人脸采集';/* 人脸采集 */
+    const faceCollection = commonFunc.showLocalMessage(this.props, 'faceCollection', '人脸采集');
     return (
       <>
         <div className="face-recognition-container">