diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index 9551ef3..3fc2fd8 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -6884,7 +6884,7 @@ export default (ChildComponent) => { /* 要把数据以表格的形式显示出来 */ const sParamJsonObj = JSON.parse(paramType); for (const key of Object.keys(sParamJsonObj)) { - if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default')) { + if (key.includes('sParam') && !key.includes('DropDown') && !key.includes('Default') && !key.includes('FieldName')) { const obj = {}; obj.sId = commonUtils.createSid(); obj.sParamKey = key; diff --git a/src/components/Common/CommonJurisdictionNewEvent.js b/src/components/Common/CommonJurisdictionNewEvent.js index 499c52b..4ca92ed 100644 --- a/src/components/Common/CommonJurisdictionNewEvent.js +++ b/src/components/Common/CommonJurisdictionNewEvent.js @@ -348,6 +348,8 @@ export default (ChildComponent) => { } // 模拟config的 gdsconfigformslave 配置 imitateTableConfig = (title, dataIndex, width) => { + console.log('222app',this.props.app); + const {userinfo} = this.props.app; return { bCanInput: false, bFilter: false, @@ -370,8 +372,8 @@ export default (ChildComponent) => { sId: commonUtils.createSid(), sParentId: '11811781131121915102156308120', sSubsidiaryId: '1111111111', - showName: title, - sName: dataIndex, + showName: dataIndex, + sName: userinfo.sLanguage === 'sEnglish' ? dataIndex : title, }; } // 根据模拟列,模拟列配置 @@ -636,6 +638,8 @@ export default (ChildComponent) => { } /** 按钮操作事件 */ handleButtonClick = (name, isFresh) => { + const selectUserPermission = commonFunc.showLocalMessage(this.props, 'selectUserPermission', '选择用户权限'); + const selectGroupPerssion = commonFunc.showLocalMessage(this.props, 'selectGroupPerssion', '选择组权限'); if (name.includes('BtnRepairGroup')) { const { sJurisdictionClassifyId } = this.props; if (commonUtils.isNotEmptyArr(sJurisdictionClassifyId)) { @@ -651,7 +655,7 @@ export default (ChildComponent) => { } } } else { - message.error('请选择组权限'); + message.error(selectGroupPerssion); } } else if (name.includes('BtnRepairUser')) { const { userViewSelectedRowKeys } = this.props; @@ -668,7 +672,7 @@ export default (ChildComponent) => { } } } else { - message.error('请选择用户权限'); + message.error(selectUserPermission); } } else if (name === 'BtnOut') { this.handleOut(); diff --git a/src/components/Common/Tree/StaticTree.js b/src/components/Common/Tree/StaticTree.js index 72df452..24c8225 100644 --- a/src/components/Common/Tree/StaticTree.js +++ b/src/components/Common/Tree/StaticTree.js @@ -12,6 +12,7 @@ import StaticEditTable from '../CommonTable';/* 可编辑表格 */ import * as commonUtils from '../../../utils/utils'; import styles from './Tree.css'; import AntdDraggableModal from '../AntdDraggableModal'; +import * as commonFunc from "@/components/Common/commonFunc"; const SearchModule = Input.Search; @@ -324,13 +325,15 @@ class TreeComponent extends Component { }; render() { const treeProps = this.getTreeProps(); + const PermissionContent = commonFunc.showLocalMessage(this.props, 'PermissionContent', '权限内容'); + const pleaseInputKeyWord = commonFunc.showLocalMessage(this.props, "pleaseInputKeyWord", "请输入你想要搜索的关键字"); return (
{ this.treeRef = ref; }}> {this.props.isSearch ? -
this.handleButtonClick(e,e.target.checked ? 'checkedAll' : 'unChecked')} /> 权限内容
+
this.handleButtonClick(e,e.target.checked ? 'checkedAll' : 'unChecked')} /> {PermissionContent}