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/JobGrade.js b/pc4mobx/organization/components/postionrank/JobGrade.js
index e695d49..996009c 100644
--- a/pc4mobx/organization/components/postionrank/JobGrade.js
+++ b/pc4mobx/organization/components/postionrank/JobGrade.js
@@ -140,7 +140,7 @@ export default class JobGrade extends React.Component {
tableStore
} = jobGrade;
- let keys = toJS(tableStore.selectedRowKeys).toString();
+ let keys = toJS(tableStore.selectedRowKeysAllPages).toString();
jobGrade.setIds(keys);
this.showConfirm('batchDel');
}
diff --git a/pc4mobx/organization/components/postionrank/JobLevel.js b/pc4mobx/organization/components/postionrank/JobLevel.js
index baf0c35..bfaa1e0 100644
--- a/pc4mobx/organization/components/postionrank/JobLevel.js
+++ b/pc4mobx/organization/components/postionrank/JobLevel.js
@@ -125,7 +125,7 @@ export default class JobLevel extends React.Component {
tableStore
} = jobLevel;
- let keys = toJS(tableStore.selectedRowKeys).toString();
+ let keys = toJS(tableStore.selectedRowKeysAllPages).toString();
jobLevel.setIds(keys);
this.showConfirm('batchDel');
}
diff --git a/pc4mobx/organization/components/postionrank/RankScheme.js b/pc4mobx/organization/components/postionrank/RankScheme.js
index 2c13a40..09294c6 100644
--- a/pc4mobx/organization/components/postionrank/RankScheme.js
+++ b/pc4mobx/organization/components/postionrank/RankScheme.js
@@ -129,7 +129,7 @@ export default class RankScheme extends React.Component {
tableStore
} = rankScheme;
- let keys = toJS(tableStore.selectedRowKeys).toString();
+ let keys = toJS(tableStore.selectedRowKeysAllPages).toString();
rankScheme.setIds(keys);
this.showConfirm('batchDel');
}
@@ -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/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index e20dff3..2b49705 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -174,7 +174,7 @@ export default class Resource extends React.Component {
if (item.menuFun !== 'batchDelete') {
btns.push();
} else {
- btns.push();
+ btns.push();
}
});
@@ -192,13 +192,14 @@ export default class Resource extends React.Component {
datas={datas}
btnOnClick={key => {
if (key == "1") {
+ tableStore.selectedRowKeysAllPages = [];
resource.export();
}
if (key == "2") {
- tableStore.selectedRowKeys.length > 0 ? resource.export() : message.error("请选择需要导出的数据")
+ tableStore.selectedRowKeysAllPages.length > 0 ? resource.export() : message.error("请选择需要导出的数据")
}
}}
- menuOnClick={(key, e) => key == '1' ? tableStore.selectedRowKeys = [] : ''}
+ menuOnClick={(key, e) => key == '1' ? tableStore.selectedRowKeysAllPages = [] : ''}
/>)
return btns;
diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js
index 1c9ced1..567e52a 100644
--- a/pc4mobx/organization/components/sequence/Sequence.js
+++ b/pc4mobx/organization/components/sequence/Sequence.js
@@ -126,7 +126,7 @@ export default class Sequence extends React.Component {
tableStore
} = sequence;
- let keys = toJS(tableStore.selectedRowKeys).toString();
+ let keys = toJS(tableStore.selectedRowKeysAllPages).toString();
sequence.setIds(keys);
this.showConfirm('batchDel');
}
diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js
index 5988595..ee8c9d3 100644
--- a/pc4mobx/organization/components/staff/Staff.js
+++ b/pc4mobx/organization/components/staff/Staff.js
@@ -145,7 +145,7 @@ export default class Staff extends React.Component {
tableStore
} = staff;
- let keys = toJS(tableStore.selectedRowKeys).toString();
+ let keys = toJS(tableStore.selectedRowKeysAllPages).toString();
staff.setIds(keys);
this.showConfirm('batchDel');
}
diff --git a/pc4mobx/organization/components/staff/StaffScheme.js b/pc4mobx/organization/components/staff/StaffScheme.js
index ab931b8..33c1e04 100644
--- a/pc4mobx/organization/components/staff/StaffScheme.js
+++ b/pc4mobx/organization/components/staff/StaffScheme.js
@@ -124,7 +124,7 @@ export default class StaffScheme extends React.Component {
tableStore
} = staffScheme;
- let keys = toJS(tableStore.selectedRowKeys).toString();
+ let keys = toJS(tableStore.selectedRowKeysAllPages).toString();
staffScheme.setIds(keys);
this.showConfirm('batchDel');
}
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, '权限组信息'),
diff --git a/pc4mobx/organization/stores/resource.js b/pc4mobx/organization/stores/resource.js
index 93ed693..918f73c 100644
--- a/pc4mobx/organization/stores/resource.js
+++ b/pc4mobx/organization/stores/resource.js
@@ -252,7 +252,7 @@ export class ResourceStore {
...this.form.getFormParams()
}
this.exSpinning = true;
- await Api.exportResource(toJS(this.tableStore.selectedRowKeys).toString());
+ await Api.exportResource(toJS(this.tableStore.selectedRowKeysAllPages).toString());
this.exSpinning = false;
this.tableStore.selectedRowKeys = [];