diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js index 055a99f..8d4f201 100644 --- a/pc4mobx/organization/components/department/department.js +++ b/pc4mobx/organization/components/department/department.js @@ -21,7 +21,8 @@ import { WeaLeftRightLayout, WeaOrgTree, WeaDialog, - WeaPopoverHrm + WeaPopoverHrm, + WeaLocaleProvider } from 'ecCom' import { Row, @@ -48,6 +49,7 @@ import NewAndEditDialog from '../NewAndEditDialog'; import NewTableDialog from '../NewTableDialog'; import NewPopconfirm from './NewPopconfirm' +const getLabel = WeaLocaleProvider.getLabel; const toJS = mobx.toJS; const confirm = Modal.confirm; diff --git a/pc4mobx/organization/components/postionrank/RankScheme.js b/pc4mobx/organization/components/postionrank/RankScheme.js index 88f4a2c..09294c6 100644 --- a/pc4mobx/organization/components/postionrank/RankScheme.js +++ b/pc4mobx/organization/components/postionrank/RankScheme.js @@ -432,7 +432,7 @@ export default class RankScheme extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={200} + height={250} conditionLen={1} save={() => this.handleSave()} onCancel={() => rankScheme.setVisible(false)} diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js index f970c57..f0eb2f7 100644 --- a/pc4mobx/organization/index.js +++ b/pc4mobx/organization/index.js @@ -48,13 +48,9 @@ message.config({ // 读取系统多语言配置 let getLocaleLabel = WeaLocaleProvider.getLocaleLabel.bind( this, - "organization" + "HRM" ); -// 不需要读取系统多语言 -// getLocaleLabel = function (nextState, replace, callback) { -// callback(); -// }; @@ -112,18 +108,8 @@ const Routes = ( ); -const OutSignAppSettingProvider = (props) => ( - - - -); + +const { getLocaleLabelByCode } = WeaLocaleProvider; class NetworkStrategy extends React.Component { constructor(props) { @@ -146,14 +132,6 @@ class NetworkStrategy extends React.Component { {...stores}> - ); @@ -163,8 +141,7 @@ module.exports = { Route: Routes, store: stores, com: { - OutSignAppSettingProvider: OutSignAppSettingProvider, - NetworkStrategy, + NetworkStrategy }, }; diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js index 49f7e74..e721341 100644 --- a/pc4mobx/organization/public/i18n.js +++ b/pc4mobx/organization/public/i18n.js @@ -111,18 +111,18 @@ export const i18n = { }, label: { //新增 - schemeName: () => getLabel(385936, '等级方案'), - newRankScheme: () => getLabel(386246, '新建等级方案'), - editRankScheme: () => getLabel(386247, '编辑等级方案'), - levelName: () => getLabel(385936, '职等'), - newJobLevel: () => getLabel(386246, '新建职等'), - editJobLevel: () => getLabel(386247, '编辑职等'), - gradeName: () => getLabel(385936, '职级'), - newJobGrade: () => getLabel(386246, '新建职级'), - editJobGrade: () => getLabel(386247, '编辑职级'), - sequenceName: () => getLabel(385936, '岗位序列'), - newSequence: () => getLabel(386246, '新建岗位序列'), - editSequence: () => getLabel(386247, '编辑岗位序列'), + schemeName: () => getLabel(547124, '等级方案'), + newRankScheme: () => getLabel(547133, '新建等级方案'), + editRankScheme: () => getLabel(547134, '编辑等级方案'), + levelName: () => getLabel(547139, '职等'), + newJobLevel: () => getLabel(547143, '新建职等'), + editJobLevel: () => getLabel(547144, '编辑职等'), + gradeName: () => getLabel(547152, '职级'), + newJobGrade: () => getLabel(547145, '新建职级'), + editJobGrade: () => getLabel(547146, '编辑职级'), + sequenceName: () => getLabel(547147, '岗位序列'), + newSequence: () => getLabel(547148, '新建岗位序列'), + editSequence: () => getLabel(547149, '编辑岗位序列'), groupInfo: () => getLabel(385936, '总部'), editGroup: () => getLabel(386247, '编辑总部'), officeName: () => getLabel(385936, '职务管理'), @@ -149,7 +149,7 @@ export const i18n = { newJob: () => getLabel(386246, '新增岗位'), editJobInfo: () => getLabel(386247, '修改岗位信息'), jobsInfo: () => getLabel(386247, '岗位信息'), - deptManage: () => getLabel(385936, '部门管理'), + deptManage: () => getLabel(547116, '部门管理'), newDept: () => getLabel(386246, '新增部门'), mergeDept:()=> getLabel(386246, '合并部门'), transferDept:()=> getLabel(386246, '转移部门'), @@ -173,8 +173,6 @@ export const i18n = { cardColumnSet:() => getLabel(386247, '人员卡片栏目设置'), personnelResume:() => getLabel(386247, '人员简历'), - - authorizationGroup: () => getLabel(492, '权限组'), allAuthorization: () => getLabel(33363, '全部权限'), authorizationGroupInfo: () => getLabel(383045, '权限组信息'),