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

陈鑫涛
2 parents 003ed0c7 b0be4f74
Showing 47 changed files with 273 additions and 112 deletions
src/assets/hasCancel_english.png
src/assets/hasChecked.png
src/assets/hasChecked_big5.png
src/assets/hasChecked_english.png
src/assets/hasChecking_big5.png
src/assets/hasChecking_english.png
src/assets/haveCancel_big5.png
src/assets/haveCancel_english.png
src/assets/haveSubmit_english.png
src/assets/haveSubmit_english1.png
src/assets/haveSubmit_sBig5.png
src/components/AuditInformation/AuditInformation.js
src/components/Common/CommonBillDeliverEvent.js
src/components/Common/CommonBillEvent.js
src/components/Common/CommonCheckBillEvent.js
src/components/Common/CommonComponent/index.js
src/components/Common/CommonElementEvent.js
src/components/Common/CommonGroupBillEvent.js
src/components/Common/CommonJurisdictionEvent.js
src/components/Common/CommonJurisdictionNewEvent.js
@@ -112,8 +112,8 @@ class AuditInformation extends Component {
     }
   };
   render() {
-    const { pageLoading, masterData } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { masterData, sModelsType, app } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
     return (
       <Spin spinning={pageLoading}>
         <WorkOrderComponent
@@ -5135,8 +5135,8 @@ export default (ChildComponent) =&gt; {
     };
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -9979,8 +9979,8 @@ export default (ChildComponent) =&gt; {
       }
     };
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -5541,8 +5541,8 @@ export default (ChildComponent) =&gt; {
     }
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
 import moment from 'moment';
 import React, { Component, createRef } from 'react';
 import reactComponentDebounce from '@/components/Common/ReactDebounce';
+import * as commonFunc from '@/components/Common//commonFunc';/* 通用单据方法 */ /* 通用单据方法 */
 // import '@ant-design/compatible/assets/index.css';
 import {
   InputNumber,
@@ -1010,10 +1011,14 @@ export default class CommonComponent extends Component {
   };
  
   getSearchProps = () => {
+    let chooseTitle = '选择';
+    if(commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) {
+      chooseTitle = commonFunc.showMessage(this.props.app.commonConst, 'choose') ;
+    }
     const obj = {
       onKeyDown: this.onKeyDown,
       onChange: e => this.handleSelectOptionEvent(e.target.value), /*   数据改变回带到父组件   */
-      value: commonUtils.isUndefined(this.state.dataValue) ? '选择' : commonUtils.strUndefinedToEmpty(this.state.dataValue), /*   数据值   */
+      value: commonUtils.isUndefined(this.state.dataValue) ? chooseTitle : commonUtils.strUndefinedToEmpty(this.state.dataValue), /*   数据值   */
     };
     return obj;
   }
@@ -1113,6 +1118,10 @@ export default class CommonComponent extends Component {
     const {
       sTableTitleSql, iVisCount, sName, sDateFormat,
     } = this.props.showConfig;
+    let chooseTitle = '选择';
+    if(commonUtils.isNotEmptyObject(this.props.app) && commonUtils.isNotEmptyObject(this.props.app.commonConst)) {
+      chooseTitle = commonFunc.showMessage(this.props.app.commonConst, 'choose') ;
+    }
     if (commonUtils.isNotEmptyStr(sTableTitleSql) && iVisCount > 1) {
       return <Select ref={(ref) => { this.selectTableRef = ref; }} {...this.getSelectTableProps()}>{this.getSelectTableOption()}</Select>;
     }
@@ -1251,7 +1260,7 @@ export default class CommonComponent extends Component {
         return <Select {...this.getSelectProps()} >{this.getSelectOption()}</Select>;
       }
     } else if (this.state.enabled && commonUtils.isNotEmptyObject(this.props.showConfig.sName) && this.props.showConfig.sDropDownType === 'popup') { /* 通用弹窗 */
-      return (<Search placeholder="选择" defaultValue="选择" {...this.getSearchProps()} onSearch={this.onFieldPopupModal.bind(this, this.props.showConfig, this.props.name)} />);
+      return (<Search placeholder={chooseTitle} defaultValue={chooseTitle}  {...this.getSearchProps()} onSearch={this.onFieldPopupModal.bind(this, this.props.showConfig, this.props.name)} />);
     } else if (this.firstDataIndex === 'i' || this.firstDataIndex === 'd') { /*   数字输入框(整形i和浮点型d)   */
       return innerInputProps.readOnly ? <span onKeyDown={this.onKeyDown} suppressContentEditableWarning contentEditable="true"><InputNumberA {...innerInputProps} /></span> :
         location.pathname.includes('quotationPackTableTree') && this.props.name === 'control' && this.props.showConfig.sName === 'dSinglePQty' ? <span style={{ position: 'relative' }}><InputNumberA {...innerInputProps} /><span onClick={this.handleViewClick} style={{ position: 'absolute', right: '2px' }}><EyeOutlined /></span></span> : <InputNumberA {...innerInputProps} style={{ width: '100%' }} />;
@@ -391,7 +391,18 @@ export default (ChildComponent) =&gt; {
           customizeParamConfig = customizeParamConfigNew;
         }
  
+        /* 自定义参数 */
+        let selfParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizevariable')) ?
+          formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
+        let selfParamColumn = [];
+        if(commonUtils.isNotEmptyArr(selfParamConfig)) {
+          selfParamColumn = commonFunc.getHeaderConfig(selfParamConfig);
+        }
+        console.log('systemParamColumn', selfParamConfig, selfParamColumn);
+
+
         this.handleGetSlaveData('Set', 'param', paramConfig);
+        this.handleGetSlaveData('Set', 'selfParam', selfParamConfig);
         let addState = {};
         let addStateMaster = {};
  
@@ -411,6 +422,7 @@ export default (ChildComponent) =&gt; {
           config.masterConfig = masterConfig;
           config.paramConfig = paramConfig;
           config.customizeParamConfig = customizeParamConfig;
+          config.selfParamConfig = selfParamConfig;
           addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true);
         } else {
           addStateMaster = await this.handleGetSlaveData('One', undefined, masterConfig);
@@ -468,6 +480,9 @@ export default (ChildComponent) =&gt; {
           if (commonUtils.isNotEmptyObject(customizeParamConfig)) {
             this.handleGetSlaveData('customizeParam', 'customizeParam', customizeParamConfig);
           }
+          if (commonUtils.isNotEmptyObject(selfParamConfig)) {
+            this.handleGetSlaveData('Set', 'selfParam', selfParamConfig);
+          }
         }
  
         let customizeParamColumn = [];
@@ -529,6 +544,8 @@ export default (ChildComponent) =&gt; {
           systemFunctionData,
           bussinessFunctionData,
           bReceived,
+          selfParamConfig,
+          selfParamColumn,
           pageLoading: false,
           ...addState,
           ...addState1,
@@ -1895,7 +1912,7 @@ export default (ChildComponent) =&gt; {
       const {
         sModelsType, masterConfig, slaveConfig, iPlcNoConfig, siscommonstyleproductclassifyConfig, contactConfig, addressConfig, machineConfig, assortConfig, outsideConfig, processstyleConfig, processApsRuleConfig, dynamicParamConfig, supplyConfig,
         stockConfig, customerInfoConfig, picFileConfig, eleemployeeConfig, elemachineConfig, jurgroupConfig, customergroupConfig, supplygroupConfig,
-        persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig,
+        persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, selfParamConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig,
         sisproductclassifyProcessClassifyConfig, sysmsguserConfig, eleknifemouldproductConfig, eleknifemouldfileConfig, eleteststandarditemConfig, formData, approveGroupConfig,
         brandgroupConfig, slave0Config, memoDataList,
       } = this.props;
@@ -1934,6 +1951,7 @@ export default (ChildComponent) =&gt; {
         this.handleGetSlaveData('One', null, masterConfig, bEditClick);
       } else if (sModelsType === 'system/sisformulaInfo') {
         this.handleGetSlaveData('Set', 'param', paramConfig, bEditClick);
+        this.handleGetSlaveData('Set', 'selfParam', selfParamConfig, bEditClick);
         this.handleGetSlaveData('One', undefined, masterConfig, bEditClick);
         let customizeParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')) ? formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
         /* 获取主表自定义列名为自定义变量配置 */
@@ -2351,6 +2369,7 @@ export default (ChildComponent) =&gt; {
             userDelData, phaseDelData, conditionDelData, sisproductclassifyProcessClassifyData, sisproductclassifyProcessClassifyDelData,
             siscommonstyleproductclassifyConfig, siscommonstyleproductclassifyData, siscommonstyleproductclassifyDelData, customerInfoData,
             customerInfoDelData, sysmsguserConfig, customergroupOldData, customergroupOldDelData, supplygroupOldData, supplygroupOldDelData,
+            selfParamConfig, selfParamData,selfParamDelData,
             processgroupOldData, processgroupOldDelData, jurgroupOldData, jurgroupOldDelData, persongroupOldData, persongroupOldDelData, drivergroupOldData, drivergroupOldDelData,
             eleknifemouldproductData, eleknifemouldproductDelData, eleknifemouldfileData, eleknifemouldfileDelData, eleteststandarditemData, eleteststandarditemDelData,
             customizeParamConfig, customizeParamData, customizeParamDelData, dynamicParamData, dynamicParamDelData, departgroupOldData, departgroupOldDelData, customizeParamName,
@@ -2766,6 +2785,9 @@ export default (ChildComponent) =&gt; {
             } else if (commonUtils.isNotEmptyObject(customizeParamConfig)) {
               data.push(commonBusiness.mergeData('customizeParam', customizeParamConfig.sTbName, customizeParamData, customizeParamDelData));
             }
+            if (commonUtils.isNotEmptyObject(selfParamConfig)) {
+              data.push(commonBusiness.mergeData('selfParam', selfParamConfig.sTbName, selfParamData, selfParamDelData));
+            }
           } else if (sModelsType === 'smg/sendMailMsg') {
             masterData.sContent = masterData.sContentMemo;
             masterData.sType = '1';
@@ -4709,8 +4731,8 @@ export default (ChildComponent) =&gt; {
       this.props.onSaveState({ slavePagination });
     };
     render() {
-      const { masterData, sModelsType } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType);
+      const { masterData, sModelsType, app  } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
       return (
         <ChildComponent
           {...this.props}
@@ -4421,8 +4421,8 @@ export default (ChildComponent) =&gt; {
     }
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -522,8 +522,8 @@ export default (ChildComponent) =&gt; {
       this.props.onSaveState({ [`${name}${optionName}Keys`]: value });
     }
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -776,8 +776,8 @@ export default (ChildComponent) =&gt; {
     };
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -627,7 +627,8 @@ const CommonListComponent = Form.create({
       enabled: true,
     };
   }
-
+  const BtnSure =commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';
+  const BtnCancel  =commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';
   if (commonUtils.isNotEmptyObject(app.currentPane) && commonUtils.isNotEmptyObject(app.currentPane.name) && app.currentPane.bEdit) {
     tableFilterProps = {
       ...tableFilterProps,
@@ -747,8 +748,8 @@ const CommonListComponent = Form.create({
               width: '50%', textAlign: 'right', marginRight: '9px', marginBottom: '9px',
             }}
             >
-              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-              <Button type="primary" onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}> {BtnCancel}</Button>
+              <Button type="primary" onClick={props.onSelect}> {BtnSure}</Button>
             </div>
           </div>
         </Layout>
@@ -534,7 +534,10 @@ const CommonListComponent = Form.create({
       rowSelection: props.rowSelection,
     };
   }
-
+  
+  const BtnSure =commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';
+  const BtnCancel  =commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';
+  
   const realizeHeight = commonUtils.isNotEmptyNumber(props.realizeHeight) ? props.realizeHeight : 0;
   const btnClick = (btn) => {
     const { sControlName } = btn;
@@ -566,7 +569,7 @@ const CommonListComponent = Form.create({
   };
  
   return (
-    <Form >
+    <Form>
       <Layout>
         <Layout>
           <div id="modalTreeChooseProcess">
@@ -609,8 +612,8 @@ const CommonListComponent = Form.create({
               }
             </div>
             <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
-              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>取消</Button>
-              <Button type="primary" onClick={props.onSelect}>确认</Button>
+              <Button key="back" style={{ marginRight: '8px' }} onClick={props.onCancel}>{BtnCancel}</Button>
+              <Button type="primary" onClick={props.onSelect}>     {BtnSure}</Button>
             </div>
           </div> : ''
         }
@@ -5841,8 +5841,8 @@ export default (ChildComponent) =&gt; {
     }
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -6981,9 +6981,8 @@ export default (ChildComponent) =&gt; {
     }
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
-      const imgPersonSrc = commonBusiness.handleCheckIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -1017,8 +1017,8 @@ export default (ChildComponent) =&gt; {
       this.props.onSaveState({ [modelVisible]: false });
     };
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app  } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
       return (
         <ChildComponent
           {...this.props}
@@ -903,8 +903,8 @@ export default (ChildComponent) =&gt; {
       }
     }
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app  } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
       return (
         <ChildComponent
           {...this.props}
@@ -6839,8 +6839,8 @@ export default (ChildComponent) =&gt; {
     };
  
     render() {
-      const { masterData } = this.props;
-      const imgSrc = commonBusiness.handleAddIcon(masterData);
+      const { masterData, sModelsType, app } = this.props;
+      const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
       return (
         <ChildComponent
           {...this.props}
@@ -9,6 +9,7 @@ import ShowType from &#39;@/components/Common/CommonComponent&#39;;
 import AntdDraggableModal from '@/components/Common/AntdDraggableModal';
 import CommonListSelectTree from '@/components/Common/CommonListSelectTree';
 import * as commonUtils from '@/utils/utils';/* 通用方法 */
+import * as commonFunc from '@/components/Common/commonFunc';/* 单据业务功能 */
  
 const FormItem = Form.Item;
 // const EachInputHeight = 32;
@@ -291,6 +292,8 @@ export default class CommonView extends Component {
         expanded: true,
       });
     }
+    const afterSave = commonFunc.showMessage(this.props.app.commonConst, 'afterSave') ||
+    '保存后自动生成';/* 保存后自动生成 */
  
     return (
       <Tooltip title="master" placement="topLeft" visible={this.props.showTableName}>
@@ -475,7 +478,7 @@ export default class CommonView extends Component {
                       ].includes(child.sName)
                     ) ?
                       <Col style={{ display: enabled ? 'block' : 'none' }} className="speacialNote" key={child.sId} span="12">
-                        {sModelsType !== 'smg/sendMailMsg' ? '保存后自动生成' : '发送消息无需生成单据号'}
+                        {sModelsType !== 'smg/sendMailMsg' ? afterSave : afterSave}
                       </Col> : '' }
                   </Col>
                 );
@@ -862,6 +862,8 @@ const PersonCenterOnlineUser = Form.create({
     app,
   } = props;
   const { userinfo } = app;
+  const BtnSure =commonFunc.showMessage(app.commonConst, 'BtnSure') || '确认';
+  const BtnCancel  =commonFunc.showMessage(app.commonConst, 'BtnCancel') || '取消';
   const OnlineUsers = commonFunc.showMessage(props.app.commonConst, 'OnlineUsers');/* 在线用户 */
  
   const Website = commonFunc.showMessage(props.app.commonConst, 'Website');/* 站点数 */
@@ -937,39 +939,36 @@ const PersonCenterOnlineUser = Form.create({
   const title = `${OnlineUserName}${commonUtils.isNotEmptyObject(onlineUserDataNew) ? `【 ${Website}：${onlineUserDataNew.consumerCount}\xa0\xa0\xa0\xa0\xa0${ExpirationDate}：${onlineUserDataNew.afterTime}` : ''} 】`;
   return (
     <div>
-      {
-        onlineUserVisible ?
-          <AntdDraggableModal
-            title={title}
-            width="80%"
-            visible={onlineUserVisible}
-            onCancel={handleCancel}
-            afterClose={handleCancel}
-            footer={null}
+      {onlineUserVisible ? (
+        <AntdDraggableModal title={title} width="80%" visible={onlineUserVisible} onCancel={handleCancel} afterClose={handleCancel} footer={null}>
+          <div
+            style={{ width: "100%", height: tableHeight + "px" }}
+            ref={ref => {
+              if (ref) {
+                ref.querySelector(".ant-table-container").style.height = tableHeight + "px";
+                ref.querySelector(".ant-table-body").style.height = tableHeight - 30 + "px";
+                // ref.querySelectorAll('.ant-table-cell-fix-right').forEach(item => {
+                //   if (item.previousSibling) {
+                //     item.previousSibling.style.display = 'none';
+                //   }
+                // });
+              }
+            }}
           >
-            <div
-              style={{ width: '100%', height: tableHeight + 'px' }}
-              ref={(ref) => {
-                if (ref) {
-                  ref.querySelector('.ant-table-container').style.height = tableHeight + 'px';
-                  ref.querySelector('.ant-table-body').style.height = tableHeight - 30 + 'px';
-                  // ref.querySelectorAll('.ant-table-cell-fix-right').forEach(item => {
-                  //   if (item.previousSibling) {
-                  //     item.previousSibling.style.display = 'none';
-                  //   }
-                  // });
-                }
-              }}
-            >
-              <StaticEditTable {...onlineUserProps} setOpterationColumn="Y" noVlist />
-            </div>
-            <div className='ant-modal-footer' style={{ padding: '8px 0 0 0' }}>
-              <Button key="back" onClick={handleCancel}>取消</Button>
-              <Button key="submit" type="primary" onClick={handleCancel}>确认</Button>
-            </div>
-          </AntdDraggableModal>
-          : ''
-      }
+            <StaticEditTable {...onlineUserProps} setOpterationColumn="Y" noVlist />
+          </div>
+          <div className="ant-modal-footer" style={{ padding: "8px 0 0 0" }}>
+            <Button key="back" onClick={handleCancel}>
+              {BtnCancel}
+            </Button>
+            <Button key="submit" type="primary" onClick={handleCancel}>
+              {BtnSure}
+            </Button>
+          </div>
+        </AntdDraggableModal>
+      ) : (
+        ""
+      )}
     </div>
   );
 });
@@ -716,7 +716,7 @@ export default class SearchComponent extends Component {
   handleFields = (searchColumns) => {
     /* 默认快捷过滤 */
     if (commonUtils.isEmptyArr(searchColumns)) { return; }
-    const { masterData, searchRowKeys } = this.props;
+    const { masterData, searchRowKeys, app } = this.props;
     const children = searchRowKeys.map((key) => {
       const { [`sFirst-${key}`]: sFirstValue, [`sSecond-${key}`]: sSecondValue, [`${key}disabled`]: disabled } = masterData;
       const firstDataIndex = commonUtils.isEmpty(sFirstValue) ? 's' :
@@ -750,8 +750,11 @@ export default class SearchComponent extends Component {
         sDropDownType: 'sql',
         bNotEmpty: true,
         iVisCount: 1,
-        dropDownData: sSecondConditionPro && DropDownType === 'sql' ? commonConfig.seaJudge.s_proDropDown : sSecondConditionPro ? commonConfig.seaJudge.s_pro : commonConfig.seaJudge[firstDataIndex],
-        bCanInput: false,
+        dropDownData: this.getTranslatedSeaJudge(
+          sSecondConditionPro && DropDownType === 'sql' ? 's_proDropDown' :
+            sSecondConditionPro ? 's_pro' : firstDataIndex,
+          app?.userinfo?.sLanguage
+        ),        bCanInput: false,
       };
       const showThirdConfig = {
         sId,
@@ -1235,6 +1238,71 @@ export default class SearchComponent extends Component {
       sGroupByList,
     });
   };
+  /* 在类中添加一个方法用于处理多语言转换*/
+ getTranslatedSeaJudge = (type, sLanguage) => {
+  const { seaJudge } = commonConfig;
+  const judgeMap = seaJudge[type] || [];
+  
+  // 定义翻译映射
+  const translations = {
+    sEnglish: {
+      '包含': 'Contains',
+      '不包含': 'Not Contains',
+      '等于': 'Equal',
+      '大于': 'Greater Than',
+      '小于': 'Less Than',
+      '大于等于': 'Greater Than or Equal',
+      '小于等于': 'Less Than or Equal',
+      '区间': 'Between',
+      '区间(默认今天)': 'Between (Default Today)',
+      '区间(默认昨天)': 'Between (Default Yesterday)',
+      '区间时间': 'Between Time',
+      '今日': 'Today',
+      '今日未清': 'Unfinished Today',
+      '今天之前': 'Before Today',
+      '明天之前': 'Before Tomorrow',
+      '后天之前': 'Before Day After Tomorrow',
+      '本月': 'This Month',
+      '上月': 'Last Month',
+      '本周': 'This Week',
+      '上周': 'Last Week',
+      '本期间': 'This Period'
+    },
+    sBig5: {
+      '包含': '包含',
+      '不包含': '不包含',
+      '等于': '等於',
+      '大于': '大於',
+      '小于': '小於',
+      '大于等于': '大於等於',
+      '小于等于': '小於等於',
+      '区间': '區間',
+      '区间(默认今天)': '區間(默認今天)',
+      '区间(默认昨天)': '區間(默認昨天)',
+      '区间时间': '區間時間',
+      '今日': '今日',
+      '今日未清': '今日未清',
+      '今天之前': '今天之前',
+      '明天之前': '明天之前',
+      '后天之前': '後天之前',
+      '本月': '本月',
+      '上月': '上月',
+      '本周': '本周',
+      '上周': '上周',
+      '本期间': '本期間'
+    }
+  };
+
+  if (sLanguage === 'sEnglish' || sLanguage === 'sBig5') {
+    return judgeMap.map(item => ({
+      ...item,
+      value: translations[sLanguage][item.value] || item.value
+    }));
+  }
+  
+  return judgeMap;
+};
+
   render() {
     const {
       searchSolution, searchColumns, expand, activeTagId, sType, modalVisible, modalSolutionNameVisible, confirmLoading, masterData, columnSettingVisible, app,
@@ -12,10 +12,19 @@ import * as commonFunc from &#39;./commonFunc&#39;; /* 通用单据方法 */
 import commonConfig from '../../utils/config';
 import * as commonServices from '../../services/services';
 import imgCheck from '../../assets/hasChecked.svg'; /* 已审核ICON */
+import imgCheckBig5 from '../../assets/hasChecked_big5.png'; /* 已审核ICON-繁体 */
+import imgCheckEnglish from '../../assets/hasChecked_english.png'; /* 已审核ICON-英文 */
 import imgInvalid from '../../assets/haveCancel.png'; /* 已作废ICON */
+import imgInvalidBig5 from '../../assets/haveCancel_big5.png'; /* 已作废ICON */
+import imgInvalidEnglish from '../../assets/haveCancel_english.png'; /* 已作废ICON */
 import imgChecking from '../../assets/haveChecking.svg'; /* 审核中 */
+import imgCheckingBig5 from '../../assets/hasChecking_big5.png'; /* 审核中-繁体 */
+import imgCheckingEnglish from '../../assets/hasChecking_english.png'; /* 审核中-英文 */
+
 import imgCheckPerson from '../../assets/personChecked1.png'; /* 审核中 */
 import imgSubmit from '../../assets/haveSubmited.svg'; /* 已提交 */
+import imgSubmitBig5 from '../../assets/haveSubmit_sBig5.png'; /* 审核中-繁体 */
+import imgSubmitEnglish from '../../assets/haveSubmit_english.png'; /* 审核中-英文 */
 import { cloneDeep } from 'lodash';
  
 // -----------------------------------------------------------------------
@@ -138,8 +147,13 @@ export function validateField(values, props) {
 }
 /** 添加审核或者作废图标 */
 // eslint-disable-next-line no-unused-vars
-export function handleAddIcon(masterData, sModelsType) {
+export function handleAddIcon(masterData, sModelsType, app = {}) {
   let imgSrc = '';
+    // 从app中获取用户语言设置
+  const userLanguage = app?.userinfo?.sLanguage || 'sChinese'; // 默认简体中文
+  const isTraditionalChinese = userLanguage === 'sBig5';
+  const isEnglish =  userLanguage === 'sEnglish';
+
   if (commonUtils.isNotEmptyObject(masterData)) {
     const {
       bInvalid,
@@ -148,21 +162,21 @@ export function handleAddIcon(masterData, sModelsType) {
       bSubmit,
     } = masterData;
     if (bInvalid) {
-      imgSrc = imgInvalid;
+      imgSrc = isEnglish ? imgInvalidEnglish : (isTraditionalChinese ? imgInvalidBig5 : imgInvalid);
     } else if (bCheck) {
       if (commonUtils.isNotEmptyStr(sModelsType) && sModelsType.includes('element/')) {
         if (sModelsType.includes('element/customerInfo')) {
-          imgSrc = imgCheck;
+          imgSrc = isEnglish ? imgCheckEnglish : (isTraditionalChinese ? imgCheckBig5 : imgCheck);
         } else {
           imgSrc = '';
         }
       } else {
-        imgSrc = imgCheck;
+        imgSrc = isEnglish ? imgCheckEnglish : (isTraditionalChinese ? imgCheckBig5 : imgCheck);
       }
     } else if (sStatus === '2') {
-      imgSrc = imgChecking;
+      imgSrc = isEnglish ? imgCheckingEnglish : (isTraditionalChinese ? imgCheckingBig5 : imgChecking);
     } else if (bSubmit) {
-      imgSrc = imgSubmit;
+      imgSrc = isEnglish ? imgSubmitEnglish : (isTraditionalChinese ? imgSubmitBig5 : imgSubmit);
     }
   }
   return imgSrc;
@@ -114,6 +114,8 @@ const SisformulaComponent = Form.create({
   const tabCalculationParameter = commonFunc.showMessage(app.commonConst, 'tabCalculationParameter');/* 计算参数 */
   const tabSystemFunction = commonFunc.showMessage(app.commonConst, 'tabSystemFunction');/* 系统函数 */
   const tabBusinessFunction = commonFunc.showMessage(app.commonConst, 'tabBusinessFunction');/* 业务函数 */
+  const tabBusinessParameters = commonFunc.showMessage(app.commonConst, 'tabBusinessParameters');/* 自定义参数 */
+
   const showTypeProps = {
     record: masterData,
     name: 'master',
@@ -146,6 +148,16 @@ const SisformulaComponent = Form.create({
     rowSelection: null,
   };
  
+  /* 自定义参数 */
+  const selfParamPropsType = {
+    ...commonBusiness.getTableTypes('selfParam', props),
+    tableProps: {
+      AutoTableHeight: 255,
+    },
+    // bNaturalWidth: true, /* 原始宽度 不进行最后一列计算 */
+    rowSelection: null,
+  };
+
   const customizeParamPropsTypeArr = [];
   if (commonUtils.isNotEmptyArr(props.customizeParamName)) {
     props.customizeParamName.forEach((paramName) => {
@@ -263,6 +275,9 @@ const SisformulaComponent = Form.create({
                       <TabPane tab={tabBusinessFunction} key={5}>
                         <TabParam {...commonBusiness.getShowTableSelectTypes('bussinessFunction', props, 'value')} />
                       </TabPane>
+                      <TabPane tab={tabBusinessParameters} key={6}>
+                        { commonUtils.isNotEmptyObject(selfParamPropsType) ? <StaticEditTable {...selfParamPropsType} setOpterationColumn="Y" footer="hidden" /> : ''}
+                      </TabPane>
                     </Tabs>
                     {/* <div style={{ height: '1px', backgroundColor: '#d9d9d9', width: '100%' }} /> */}
                     <TabCounter {...props} />
@@ -2927,8 +2927,8 @@ class ProcessCard extends Component {
   }
  
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
     return (
       <Spin spinning={pageLoading}>
         <ProcessCardComponent
@@ -4515,8 +4515,8 @@ class ProcessCardPack extends Component {
     });
   }
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     return (
       <Spin spinning={pageLoading}>
         <ProcessCardComponent
@@ -6717,8 +6717,8 @@ class ProcessCardPackTableTree extends Component {
     });
   }
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     return (
       <Spin spinning={pageLoading}>
         <ProcessCardComponent
@@ -3581,8 +3581,8 @@ const ToolBarComponent = props =&gt; {
  
 // 审核状态
 const AvatarComponent = props => {
-  const { masterData } = props;
-  const imgSrc = commonBusiness.handleAddIcon(masterData);
+  const { masterData, sModelsType, app } = props;
+  const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
   if (!imgSrc) return "";
   return (
     <div className={styles.avatar}>
@@ -3707,8 +3707,8 @@ class WorkOrder extends Component {
   }
  
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     return (
       <Spin spinning={pageLoading}>
         <WorkOrderComponent
@@ -5451,8 +5451,8 @@ class WorkOrderPack extends Component {
   }
  
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     return (
       <Spin spinning={pageLoading}>
         <WorkOrderComponent
@@ -7288,8 +7288,8 @@ class WorkOrderPack extends Component {
   }
  
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     const addState = {};
     const { processConfig = {} } = this.props;
     const { gdsconfigformslave = [] } = processConfig;
@@ -6774,8 +6774,8 @@ class WorkOrderPack extends Component {
   }
  
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     const addState = {};
     const { processConfig = {} } = this.props;
     const { gdsconfigformslave = [] } = processConfig;
@@ -4048,8 +4048,8 @@ const ToolBarComponent = props =&gt; {
  
 // 审核状态
 const AvatarComponent = props => {
-  const { masterData } = props;
-  const imgSrc = commonBusiness.handleAddIcon(masterData);
+  const { masterData, sModelsType, app } = props;
+  const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
   if (!imgSrc) return "";
   return (
     <div className={styles.avatar}>
@@ -1118,7 +1118,7 @@ class ProductionReport extends Component {
  
   render() {
     const {
-      pageLoading, masterData, visible, checkConditions, checkPersonData, app,
+      pageLoading, masterData, visible, checkConditions, checkPersonData, app, sModelsType,
     } = this.props;
     const checkCondition = commonFunc.showMessage(app.commonConst, 'checkCondition');/* 审核条件 */
     const checkSmemo = commonFunc.showMessage(app.commonConst, 'checkSmemo');/* 备注 */
@@ -1131,7 +1131,7 @@ class ProductionReport extends Component {
       dataIndex: 'sMemo',
       key: 'sMemo',
     }];
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
     const btnSure = commonFunc.showMessage(app.commonConst, 'btnSure');/* 确认 */
     const check = commonFunc.showMessage(app.commonConst, 'check');/* 审核 */
     const BtnClose = commonFunc.showMessage(app.commonConst, 'BtnClose');/* 关闭 */
@@ -3705,8 +3705,8 @@ class Quotation extends Component {
   }
  
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
     return (
       <Spin spinning={pageLoading}>
         <QuotationComponent
@@ -5315,8 +5315,8 @@ class QuotationPack extends Component {
     }
   }
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app  } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app );
     return (
       <Spin spinning={pageLoading}>
         <QuotationComponent
@@ -7915,8 +7915,8 @@ class QuotationPackTableTree extends Component {
     }
   }
   render() {
-    const { pageLoading, masterData, fastOrderModalVisible } = this.props;
-    const imgSrc = commonBusiness.handleAddIcon(masterData);
+    const { pageLoading, masterData, fastOrderModalVisible, sModelsType, app } = this.props;
+    const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
     return (
       <Spin spinning={pageLoading}>
         <QuotationComponent
@@ -2,6 +2,8 @@ import { useEffect, useState } from &#39;react&#39;;
 import { connect } from 'umi';
 import { ConfigProvider, Layout } from 'antd-v4';
 import zhCN from 'antd-v4/lib/locale-provider/zh_CN';
+import enUS from 'antd-v4/lib/locale-provider/en_US';
+import zhTW from 'antd-v4/lib/locale-provider/zh_TW'; // 导入繁体中文语言包
 // import Search from '../components/Common/Search';
 import PersonCenter from './personCenter/personCenter';
 import Feedback from './feedback/feedback';
@@ -11,8 +13,9 @@ import styles from &#39;./indexPage.less&#39;;
  
 const { Header, Content } = Layout;
  
-function IndexPage() {
+function IndexPage({ app }) {
   const [key, setKey] = useState(0);
+  const currentLanguage = app?.userinfo?.sLanguage || 'zhCN'; // 默认为中文
  
   useEffect(() => {
     window.xlyReload = () => {
@@ -20,8 +23,20 @@ function IndexPage() {
     };
   }, []);
  
+    // 根据用户语言选择对应的语言包
+  const getLocale = () => {
+    switch(currentLanguage) {
+      case 'sEnglish':
+        return enUS;
+      case 'sBig5':
+        return zhTW;
+      default:
+        return zhCN;
+    }
+  };
+
   return (
-    <ConfigProvider locale={zhCN}>
+    <ConfigProvider locale={getLocale()}>
       <Layout key={key}>
         <Header className={styles.header}>
           <div className={styles.headerRight}>
@@ -48,4 +63,4 @@ function IndexPage() {
  
 IndexPage.propTypes = {};
  
-export default connect()(IndexPage);
+export default connect(({ app }) => ({ app }))(IndexPage);
 /* eslint-disable */
 import { Modal, message as antdMessage } from 'antd-v4';
 import { Modal as mobileModal } from 'antd-mobile-v2';
+import commonConfig from '../config';
  
 const { warning } = Modal;
 const antdMobileAlert = mobileModal.alert;
@@ -24,15 +25,22 @@ const openConfirm = (config) =&gt; {
   };
  
   const fn = () => {
+    const userinfo = JSON.parse(localStorage.getItem(`${commonConfig.prefix}userinfo`)) || {};
+    const language = userinfo.sLanguage || 'sChinese'; // 默认简体中文
+    const isEnglish = language === 'sEnglish';
+
+    // 使用语言设置
+    const sTitle = isEnglish ? 'Reminder' :  language === 'sBig5' ? '溫馨提示' :  '温馨提示';
+    const okText =  language === 'sEnglish' ? 'Confirm' :  language === 'sBig5' ? '確認': '确认';
     if (location.pathname.toLocaleLowerCase().includes('mobile')) {
-      antdMobileAlert('温馨提示', secondContent || '出错了', [
+      antdMobileAlert(sTitle, secondContent || '出错了', [
         { text: '确认', },
       ])
     } else {
       warning({
-        title: '温馨提示',
+        title: sTitle,
         content: <div style={{ maxHeight: '50vh', overflowY: 'auto' }} >{secondContent || '出错了'}</div>,
-        okText: '确认',
+        okText: okText,
         zIndex: 1000,
         width,
         ...rest,
@@ -52,6 +60,11 @@ const openConfirm = (config) =&gt; {
 export const message = {
   ...antdMessage,
   error: (content, ...rest) => {
-    openConfirm({ message: content, ...rest });
+    const userinfo = JSON.parse(localStorage.getItem(`${commonConfig.prefix}userinfo`)) || {};
+    const language = userinfo.sLanguage || 'sChinese'; // 默认简体中文
+    const requiredText = language === 'sEnglish' ? 'is Required' :
+      (language === 'sBig5' ? '為必填項' : '为必填项');
+    const sContent = content?.replace('为必填项', requiredText);
+    openConfirm({ message: sContent, ...rest });
   },
 };