{this.getForm()}
}
- 启用组织管理分权:
+ {i18n.label.enableDetach()}:
this.doDetachSwitch(checked)} />
- {getLabel(387588, "内容自定义条件")}
+ {getLabel(547379, "内容自定义条件")}
, dataIndex: "condition", key: "condition", width: "40%",
com: [{ label: '', type: 'SCOP', key: 'condition', viewAttr: 3 }]
},
{
- title: getLabel(88, "顺序"), dataIndex: "orderid", key: "orderid", width: "20%",
+ title: getLabel(547631, "顺序"), dataIndex: "orderid", key: "orderid", width: "20%",
com: [{ label: '', type: 'INPUTNUMBER', key: 'orderid', viewAttr: 2, otherParams: { max: 999, step: 1 } }]
}
];
diff --git a/pc4mobx/organization/components/fieldDefinedSet/QuickSearchTableEdit.js b/pc4mobx/organization/components/fieldDefinedSet/QuickSearchTableEdit.js
index 914d31b..e4e4754 100644
--- a/pc4mobx/organization/components/fieldDefinedSet/QuickSearchTableEdit.js
+++ b/pc4mobx/organization/components/fieldDefinedSet/QuickSearchTableEdit.js
@@ -24,30 +24,30 @@ export default class QuickSearchTableEdit extends React.Component {
getColumns = () => {
let columnArray = [
{
- title: getLabel(261, "字段"), dataIndex: "fieldid", key: "fieldid", width: "18%",
+ title: getLabel(547376, "字段"), dataIndex: "fieldid", key: "fieldid", width: "18%",
com: [{ label: '', type: 'SELECT', isLink: true, key: 'fieldid', options: [] }]
},
{
- title: getLabel(195, "名称"), dataIndex: "customname", key: "customname", width: "18%",
+ title: getLabel(547517, "名称"), dataIndex: "customname", key: "customname", width: "18%",
com: [{
label: '', type: 'INPUT', key: 'customname', viewAttr: 2, otherParams: { isBase64: true, inputType: "multilang" }
}]
},
{
- title: getLabel(389518, "查询范围"), dataIndex: "range", key: "range", width: "8%",
+ title: getLabel(547378, "查询范围"), dataIndex: "range", key: "range", width: "8%",
com: [{ label: '', type: 'INPUT', key: 'range', viewAttr: 1 }]
},
{
- title: getLabel(387588, "内容自定义条件"), dataIndex: "condition", key: "condition", width: "15%",
+ title: getLabel(547379, "内容自定义条件"), dataIndex: "condition", key: "condition", width: "15%",
com: [{ label: '', type: 'BUTTON', key: 'condition', viewAttr: 1 }]
}, {
- title: getLabel(21657, "显示模式"), dataIndex: "showmodel", key: "showmodel", width: "15%",
+ title: getLabel(547380, "显示模式"), dataIndex: "showmodel", key: "showmodel", width: "15%",
com: [{
label: '',
type: 'SELECT',
key: 'showmodel',
viewAttr: 1,
- options: [ { key: '0', showname: getLabel(19852, '平铺') },]
+ options: [ { key: '0', showname: getLabel(547637, '平铺') },]
}]
}
];
@@ -73,8 +73,8 @@ export default class QuickSearchTableEdit extends React.Component {
} else {
const { key, isLink = false, viewAttr = 2, type = 'INPUT', width, otherParams = {}, detailtype = 1, options = [] } = c;
const _type = type.toUpperCase();
- record.range = record.type == '1' ? getLabel('387636', "内容自定义") : getLabel('387637', "字段本身值");
- record.condition = record.type == '1' ? getLabel('68', "设置") : '';
+ record.range = record.type == '1' ? getLabel('547623', "内容自定义") : getLabel('547624', "字段本身值");
+ record.condition = record.type == '1' ? getLabel('547625', "设置") : '';
if (_type === 'INPUT') {
_com.push(原始参数查看
+ {i18n.label.voParameters()}
setMouseStatus(index, true)} onMouseLeave={() => setMouseStatus(index, false)}>
@@ -129,9 +169,7 @@ export default class newImport extends React.Component {
} = this.props, {
visible,
hasRight
- } = newImport, {
- title,
- } = this.state;
+ } = newImport;
if (hasRight === false) {
return renderNoright();
@@ -139,7 +177,7 @@ export default class newImport extends React.Component {
return (
hasRight &&
: ''
}
@@ -288,7 +290,7 @@ export default class ResourceCard extends React.Component {
}}>
resourceCard.changeVersion(val)}/> : resourceCard.changeVersion(val)}/> :
store.customTemplateName = v} />
@@ -60,9 +62,9 @@ export default class SearchCustomDialog extends React.Component {
searchTemplateName
} = store;
const buttons = [
- ,
- ,
-
+ ,
+ ,
+
]
@@ -72,7 +74,7 @@ export default class SearchCustomDialog extends React.Component {
{...searchDialog}
buttons={search ? buttons.slice(0, 1) : buttons}
initLoadCss
- title={search ? '常用条件定制':'列定制'}
+ title={search ? getLabel(547549,'常用条件定制') : getLabel(547136,'显示列定制')}
>
diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index 2b49705..28a6ab9 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -14,7 +14,8 @@ import {
WeaOrgTree,
WeaDropdown,
WeaSelect,
- WeaSearchGroup
+ WeaSearchGroup,
+ WeaLocaleProvider
} from 'ecCom'
import {
Row,
@@ -47,6 +48,7 @@ const toJS = mobx.toJS;
const confirm = Modal.confirm;
const WeaTable = WeaTableNew.WeaTable;
const { ButtonSelect } = WeaDropdown;
+const getLabel = WeaLocaleProvider.getLabel;
@inject('resource')
@inject('datasImport')
@@ -181,11 +183,11 @@ export default class Resource extends React.Component {
const datas = [
{
- key: "1", show: (全部导出), text: "全部导出", selected: true
+ key: "1", show: ({i18n.button.allExport()}), text: `${i18n.button.allExport()}`, selected: true
},
{
- key: "2", show: (批量导出), text: "批量导出"
+ key: "2", show: ({i18n.button.batchExport()}), text: `${i18n.button.batchExport()}`
}
];
btns.push( 0 ? resource.export() : message.error("请选择需要导出的数据")
+ tableStore.selectedRowKeysAllPages.length > 0 ? resource.export() : message.error(`${i18n.message.checkExport()}`)
}
}}
menuOnClick={(key, e) => key == '1' ? tableStore.selectedRowKeysAllPages = [] : ''}
@@ -237,15 +239,15 @@ export default class Resource extends React.Component {
window.open("/spa/hrm/index_mobx.html#/main/hrm/add", "_blank")
}
- import() {
- const {
- datasImport
- } = this.props;
- datasImport.visible = true;
- datasImport.title = i18n.button.importResource();
- datasImport.importType = 'resource';
- datasImport.getImportForm();
- }
+ // import() {
+ // const {
+ // datasImport
+ // } = this.props;
+ // datasImport.visible = true;
+ // datasImport.title = i18n.button.importResource();
+ // datasImport.importType = 'resource';
+ // datasImport.getImportForm();
+ // }
getDropMenuDatas() {
const {
@@ -300,10 +302,10 @@ export default class Resource extends React.Component {
} = resource;
confirm({
- title: "存为模板",
+ title: getLabel(547548,'存为模板'),
content:
resource.searchTemplateName = v} />
@@ -441,7 +443,7 @@ export default class Resource extends React.Component {
arr.push(
-
)
isFormInit && defaultCondition.map((c, i) => {
@@ -533,17 +535,19 @@ export default class Resource extends React.Component {
searchType={['base', 'advanced']}
showSearchAd={isPanelShow}
searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? lastName : form2.getFormParams().lastName}
- searchsBasePlaceHolder='请输入姓名'
+ searchsBasePlaceHolder=''
setShowSearchAd={bool => store.setPanelStatus(bool)}
hideSearchAd={() => store.setPanelStatus(false)}
searchsAd={isPanelShow ? this.getPanelComponents() : }
advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
hasMask={false}
buttonsAd={this.getTabBtn()}
- onSearch={() => {store.hideRadioGroup();store.getTableInfo();}}
+ onSearch={() => {
+ store.hideRadioGroup();store.getTableInfo();
+ }}
onSearchChange={val => this.onSearchChange(val)}
/>
- {`编制数：${record.staff_num} / 在编数：${record.permanent_num} / 冻结数：${record.freeze_num}/ 状态：${record.lack_statusspan}`}
+ return {`${getLabel(547345,'编制数')}: ${record.staff_num} / ${getLabel(547346,'在编数')}: ${record.permanent_num} / ${getLabel(547347,'冻结数')}: ${record.freeze_num}/ ${getLabel(547240,'状态')} :${record.lack_statusspan}`}
}
};
})
diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index f0eb2f7..05c7669 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -2,6 +2,7 @@ import React from "react";
import Route from "react-router/lib/Route";
import { message } from "antd";
import { WeaLocaleProvider } from "ecCom";
+import { Provider } from 'mobx-react';
import Home from "./components/Home";
import RankScheme from "./components/postionrank/RankScheme";
import JobLevel from "./components/postionrank/JobLevel";
diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js
index e721341..b5fd7dc 100644
--- a/pc4mobx/organization/public/i18n.js
+++ b/pc4mobx/organization/public/i18n.js
@@ -2,7 +2,7 @@ import {
WeaLocaleProvider
} from 'ecCom';
const getLabel = WeaLocaleProvider.getLabel;
-//gai
+
export const i18n = {
module: {
elseSetting: () => getLabel(20824, '其他设置'),
@@ -123,55 +123,78 @@ export const i18n = {
sequenceName: () => getLabel(547147, '岗位序列'),
newSequence: () => getLabel(547148, '新建岗位序列'),
editSequence: () => getLabel(547149, '编辑岗位序列'),
- groupInfo: () => getLabel(385936, '总部'),
- editGroup: () => getLabel(386247, '编辑总部'),
- officeName: () => getLabel(385936, '职务管理'),
+ groupInfo: () => getLabel(547169, '总部'),
+ editGroup: () => getLabel(547170, '编辑总部'),
+
+ //页面未使用
+ officeName: () => getLabel(547527, '职务管理'),
newOfficeName: () => getLabel(386246, '新建职务信息'),
editOfficeName: () => getLabel(386247, '编辑职务信息'),
newOfficeClassifyName: () => getLabel(386246, '新建职务分类'),
editOfficeClassifyName: () => getLabel(386246, '编辑职务分类'),
- branchNumSetting: () => getLabel(386246, '分部编号设置'),
- deptNumSetting: () => getLabel(386246, '部门编号设置'),
- postNumSetting: () => getLabel(386246, '岗位编号设置'),
- userNumSetting: () => getLabel(386246, '人员编号设置'),
- companyName: () => getLabel(385937, '分部'),
- newCompany: () => getLabel(385937, '新增分部'),
- viewCompany: () => getLabel(385937, '分部信息'),
- updateCompany: () => getLabel(385937, '修改分部信息'),
- staffSchemeName: () => getLabel(385936, '编制方案'),
- newStaffScheme: () => getLabel(386246, '新建编制方案'),
- ediStaffScheme: () => getLabel(386247, '编辑编制方案'),
- staffName: () => getLabel(385936, '编制上报'),
- newStaff: () => getLabel(386246, '新建编制'),
- editStaff: () => getLabel(386247, '编辑编制'),
- changeStaff: () => getLabel(386247, '编制变更'),
- jobName: () => getLabel(385936, '岗位'),
- newJob: () => getLabel(386246, '新增岗位'),
- editJobInfo: () => getLabel(386247, '修改岗位信息'),
- jobsInfo: () => getLabel(386247, '岗位信息'),
+
+ branchNumSetting: () => getLabel(538759, '分部编号设置'),
+ deptNumSetting: () => getLabel(538762, '部门编号设置'),
+ postNumSetting: () => getLabel(538763, '岗位编号设置'),
+ userNumSetting: () => getLabel(538764, '人员编号设置'),
+ companyName: () => getLabel(547178, '分部管理'),
+ newCompany: () => getLabel(547179, '新增分部'),
+ viewCompany: () => getLabel(547180, '分部信息'),
+ updateCompany: () => getLabel(547527, '修改分部信息'),
+ staffSchemeName: () => getLabel(547459, '编制方案'),
+ newStaffScheme: () => getLabel(547528, '新建编制方案'),
+ ediStaffScheme: () => getLabel(547529, '编辑编制方案'),
+ staffName: () => getLabel(547342, '编制上报'),
+ newStaff: () => getLabel(547530, '新建编制信息'),
+ editStaff: () => getLabel(547531, '编辑编制信息'),
+ changeStaff: () => getLabel(547532, '编制信息变更'),
+ jobName: () => getLabel(547198, '岗位管理'),
+ newJob: () => getLabel(547199, '新增岗位'),
+ editJobInfo: () => getLabel(547200, '修改岗位信息'),
+ jobsInfo: () => getLabel(547201, '岗位信息'),
deptManage: () => getLabel(547116, '部门管理'),
- newDept: () => getLabel(386246, '新增部门'),
- mergeDept:()=> getLabel(386246, '合并部门'),
- transferDept:()=> getLabel(386246, '转移部门'),
- selectDept:()=> getLabel(386246, '联查部门'),
- editDept:()=> getLabel(386246, '修改部门信息'),
- typeName: () => getLabel(129927, '类型名称'),
- ResourceName: () => getLabel(385936, '人员'),
- newPeople: () => getLabel(386246, '新建人员'),
- resourceMange: () => getLabel(386246, '花名册'),
- resourceBasicInfo: () => getLabel(386246, '人员信息'),
- newResourceBasicInfo: () => getLabel(386246, '新建人员资料'),
- newResourceBasicType: () => getLabel(386246, '新建人员资料类型'),
- editResourceBasicInfo: () => getLabel(386246, '编辑人员资料'),
- editResourceBasicType: () => getLabel(386246, '编辑人员资料类型'),
- forbidden: () => getLabel(531114, '已封存'),
- mangerDetachName: () => getLabel(385936, '模块管理分权'),
- newManagerDetach: () => getLabel(386246, '新建模块管理分权'),
- editManagerDetach: () => getLabel(386247, '编辑模块管理分权'),
- columnPermission:() => getLabel(386247, '栏目权限管理'),
- columnCustom:() => getLabel(386247, '栏目功能定义'),
- cardColumnSet:() => getLabel(386247, '人员卡片栏目设置'),
- personnelResume:() => getLabel(386247, '人员简历'),
+ newDept: () => getLabel(547533, '新增部门'),
+ mergeDept:()=> getLabel(547534, '合并部门'),
+ transferDept:()=> getLabel(547535, '转移部门'),
+ selectDept:()=> getLabel(547536, '联查部门'),
+ editDept:()=> getLabel(547537, '修改部门信息'),
+ typeName: () => getLabel(547372, '类型名称'),
+ ResourceName: () => getLabel(547205, '人员'),
+ newPeople: () => getLabel(547443, '新建人员'),
+ resourceMange: () => getLabel(547538, '花名册'),
+ resourceBasicInfo: () => getLabel(547539, '人员信息'),
+ newResourceBasicInfo: () => getLabel(547540, '新建人员资料'),
+ newResourceBasicType: () => getLabel(547541, '新建人员资料类型'),
+ editResourceBasicInfo: () => getLabel(547542, '编辑人员资料'),
+ editResourceBasicType: () => getLabel(547543, '编辑人员资料类型'),
+ forbidden: () => getLabel(547489, '已封存'),
+ mangerDetachName: () => getLabel(547402, '模块管理分权'),
+ newManagerDetach: () => getLabel(547404, '新建模块管理分权'),
+ editManagerDetach: () => getLabel(547544, '编辑模块管理分权'),
+ columnPermission:() => getLabel(547384, '栏目权限管理'),
+ columnCustom:() => getLabel(547385, '栏目功能定义'),
+ cardColumnSet:() => getLabel(547381, '人员卡片栏目设置'),
+ personnelResume:() => getLabel(547238, '人员简历'),
+ logView:() => getLabel(547576, '日志查看'),
+ view:() => getLabel(547490, '查看'),
+ voParameters:() => getLabel(547577, '原始参数查看'),
+ dataImport:() => getLabel(547215, '数据导入'),
+ importResult:() => getLabel(547221, '导入结果'),
+ startImport:() => getLabel(547583, '开始导入'),
+ importProgress:() => getLabel(547222, '导入进度'),
+ previousStep:() => getLabel(547218, '上一步'),
+ uploadFiles:() => getLabel(547227, '上传文件'),
+ importTip1:() => getLabel(547229, '点击或将文件拖拽到此区域上传'),
+ importTip2:() => getLabel(547230, '支持单个或批量上传，严禁上传公司内部资料及其他违禁文件'),
+ total:() => getLabel(547523, '共'),
+ items:() => getLabel(547524, '条'),
+ addjob:() => getLabel(547610, '添加岗位'),
+ enableDetach:() => getLabel(547403, '启用组织管理分权'),
+ quickSearchCustom:() => getLabel(547373, '快捷搜索自定义'),
+ quickSearch:() => getLabel(547374, '快捷搜索条件'),
+
+
+
authorizationGroup: () => getLabel(492, '权限组'),
allAuthorization: () => getLabel(33363, '全部权限'),
@@ -258,7 +281,6 @@ export const i18n = {
modifyMatrix: () => getLabel(383963, '编辑矩阵'),
matrixMaintenance: () => getLabel(383964, '矩阵维护者'),
orderId: () => getLabel(15486, '序号'),
- total: () => getLabel(18609, '共'),
dataSourceCount: () => getLabel(30690, '条数据'),
screen: () => getLabel(126129, '筛选'),
screenInfo: () => getLabel(385323, '筛选此列数据'),
@@ -655,7 +677,7 @@ export const i18n = {
duties: () => getLabel(15855, "所属职务"),
postAbbreviation: () => getLabel(382413, "岗位简称"),
viewRefs: () => getLabel('33364', "查看引用"),
- view: () => getLabel('33564', "查看"),
+
addRoleRefs: () => getLabel('387114', "添加角色引用"),
multiDeleteRefs: () => getLabel('387113', "批量删除引用"),
newSysadmin: () => getLabel(387059, '新建管理员'),
@@ -868,13 +890,25 @@ export const i18n = {
'531692': () => getLabel('531692', '说明：总部节点的人员编号设置主要用于新建分部时将总部的编号设置自动复制给新分部，不用于全局的开关控制，实际根据各分部的开关独立控制。'),
},
button: {
- back: () => getLabel(1290, '返回'),
- createType: () => getLabel(30131, '新建类型'),
- editTypeInfo: () => getLabel(32732, '编辑类型'),
- nextStep:() => getLabel(30131, '下一步'),
- version:() => getLabel(30131, '查看历史版本'),
- saveTemplate:() => getLabel(30131, '存为模板'),
- conditionSet:() => getLabel(30131, '常用条件定制'),
+ back: () => getLabel(547545, '返回'),
+ createType: () => getLabel(547367, '新建类型'),
+ editTypeInfo: () => getLabel(547369, '编辑类型'),
+ nextStep:() => getLabel(547219, '下一步'),
+ version:() => getLabel(547546, '查看历史版本'),
+ saveTemplate:() => getLabel(547548, '存为模板'),
+ conditionSet:() => getLabel(547549, '常用条件定制'),
+ delete: () => getLabel(547492, '删除'),
+ joinDept: () => getLabel(547536, '联查部门'),
+ view: () => getLabel(547490, '查看'),
+ transfer: () => getLabel(547594, '转移'),
+ merge: () => getLabel(547194, '合并'),
+ associateJob: () => getLabel(547496, '联查岗位'),
+ copy:() => getLabel(547196, '复制'),
+ joinPerson:() => getLabel(547609, '联查人员'),
+ allExport:() => getLabel(547187, '全部导出'),
+ batchExport:() => getLabel(547611, '批量导出'),
+ ssoLogin:() => getLabel(547396, '单点登录'),
+
batchOpen: () => getLabel(534249, '批量解锁'),
collect: () => getLabel(28111, '收藏'),
@@ -886,9 +920,7 @@ export const i18n = {
cancel: () => getLabel(32694, '取消'),
create: () => getLabel(365, '新建'),
remove: () => getLabel(20230, '移除'),
- delete: () => getLabel(131966, '删除'),
modify: () => getLabel(93, '编辑'),
- transfer: () => getLabel(80, '转移'),
multiRemove: () => getLabel(383696, '批量移除'),
multiDelete: () => getLabel(32136, '批量删除'),
save: () => getLabel(30986, '保存'),
@@ -901,7 +933,6 @@ export const i18n = {
childInfoMaintain: () => getLabel(384280, '子信息维护'),
editChildInfo: () => getLabel(32732, '编辑子信息'),
add: () => getLabel(131201, '添加'),
- copy: () => getLabel(77, '复制'),
log: () => getLabel(83, '日志'),
replace: () => getLabel(84563, '替换'),
columnVisibleSetting: () => getLabel(32535, '显示列定制'),
@@ -969,9 +1000,9 @@ export const i18n = {
deleteImg: () => getLabel('16075', "删除图片")
},
confirm: {
- forbiddenTag: () => getLabel(-131329, '确定禁用该记录吗'),
- enableTag: () => getLabel(-131328, '确定启用该记录吗'),
- recoverConfirm: () => getLabel(-131310, '确定恢复该记录吗'),
+ forbiddenTag: () => getLabel(547193, '确定禁用该记录吗'),
+ enableTag: () => getLabel(547550, '确定启用该记录吗'),
+ recoverConfirm: () => getLabel(547551, '确定恢复该记录吗'),
defaultTitle: () => getLabel(131329, '信息确认'),
removeGroupInfo: () => getLabel(383053, '删除分组，该分组下的字段将显示到“基本信息”分组中，确定要删除吗？'),
@@ -1025,6 +1056,16 @@ export const i18n = {
moveFieldConfirm: () => getLabel('388100', "确定要移动所选择的记录到分组{params}吗？")
},
message: {
+
+ checkFile: () => getLabel(547587, '请上传需要导入的文件!'),
+ checkFileContent: () => getLabel(547588, '文件导入失败，请检查Excel文件内容是否正确!'),
+ checkCopyDept: () => getLabel(547263, '请指定需要复制的公司/分部'),
+ checkExport: () => getLabel(547612, '请选择需要导出的数据'),
+ checkOnDetach: () => getLabel(547620, '确定启用组织管理分权吗'),
+ checkOffDetach: () => getLabel(547621, '确定取消组织管理分权吗'),
+ checkResume: () => getLabel(547657, '简历模板加载失败'),
+
+
authFailed: () => getLabel(2012, '对不起，您暂时没有权限！'),
actionError: () => getLabel(132200, '操作失败！'),
opSuccess: () => getLabel(30700, '操作成功'),
diff --git a/pc4mobx/organization/stores/columnSetting.js b/pc4mobx/organization/stores/columnSetting.js
index c9ce74f..2154699 100644
--- a/pc4mobx/organization/stores/columnSetting.js
+++ b/pc4mobx/organization/stores/columnSetting.js
@@ -3,13 +3,15 @@ import { action, computed, extendObservable, observable } from "mobx";
import HrmBaseStore from "./baseStore";
import { WeaTableNew } from "comsMobx";
import { message } from "antd";
-import { WeaHelpfulTip, WeaInputLocale } from "ecCom";
+import { WeaHelpfulTip, WeaInputLocale,WeaLocaleProvider } from "ecCom";
import { cloneDeep, has, indexOf, isEmpty, remove, uniq } from "lodash";
import { i18n } from "../public/i18n";
import * as Api from "../apis/columnSetting";
import { validDBKeys } from "../util";
import { saveFieldDefinedInfo } from "../apis/columnSetting";
+const getLabel = WeaLocaleProvider.getLabel;
+
const getCurrentLabel = WeaInputLocale.getCurrentLabel;
const { TableStore } = WeaTableNew;
@@ -115,10 +117,10 @@ export class ColumnSetting {
- newImport.pvisable = false}
visible={pvisable}
style={{ width: 300, height: 50 }}
diff --git a/pc4mobx/organization/components/newImport/stepDialog.js b/pc4mobx/organization/components/newImport/stepDialog.js
index f006cf4..449af7b 100644
--- a/pc4mobx/organization/components/newImport/stepDialog.js
+++ b/pc4mobx/organization/components/newImport/stepDialog.js
@@ -2,7 +2,8 @@ import {
WeaNewScroll,
WeaSearchGroup,
WeaMoreButton,
- WeaDialog
+ WeaDialog,
+ WeaLocaleProvider
} from 'ecCom'
import {
inject,
@@ -27,6 +28,7 @@ import {
const Step = Steps.Step;
import StepContent from './stepContent';
import "../../style/common.less";
+const getLabel = WeaLocaleProvider.getLabel;
@inject("newImport")
@observer
@@ -36,7 +38,7 @@ export default class StepDialog extends React.Component {
this.state = {
width: 800,
height: 600,
- title: '数据导入',
+ title: i18n.label.dataImport(),
}
}
@@ -72,10 +74,17 @@ export default class StepDialog extends React.Component {
height,
title
} = this.state;
+
const buttons = [
- ((current === 0 || current === steps.length - 1) ? '' : ),
- (),
+ ((current === 0 || current === steps.length - 1) ? '' : ),
+ (),
];
+
+ const labelSteps = [
+ { title: `${getLabel(547216,'设置导入字段')}`},
+ { title: `${getLabel(547217,'获取导入模板')}`},
+ { title: `${getLabel(547221,'导入结果')}`}
+ ];
return (
- {steps.map((s, i) =>
@@ -274,7 +276,7 @@ export default class ResourceCard extends React.Component {
{
data.buttons.length > 3 ? 注意:右侧列表默认加载的为必填字段!
+{getLabel(547646,'注意:右侧列表默认加载的为必填字段!')}
diff --git a/pc4mobx/organization/components/postionrank/JobGrade.js b/pc4mobx/organization/components/postionrank/JobGrade.js
index 996009c..456ba39 100644
--- a/pc4mobx/organization/components/postionrank/JobGrade.js
+++ b/pc4mobx/organization/components/postionrank/JobGrade.js
@@ -401,7 +401,7 @@ export default class JobGrade extends React.Component {
const treeCom = (
hasRight && setDomRef(dom, 'tab')}>
diff --git a/pc4mobx/organization/components/resource/PersonnelResume.js b/pc4mobx/organization/components/resource/PersonnelResume.js
index 31a1d9c..28b81f1 100644
--- a/pc4mobx/organization/components/resource/PersonnelResume.js
+++ b/pc4mobx/organization/components/resource/PersonnelResume.js
@@ -10,7 +10,8 @@ import {
WeaFormItem,
WeaRightMenu,
WeaLeftRightLayout,
- WeaOrgTree
+ WeaOrgTree,
+ WeaLocaleProvider
} from 'ecCom'
import {
Row,
@@ -35,11 +36,13 @@ import SearchPanelDialog from '../SearchPanelDialog';
import { renderNoright } from '../../util';
import { exportWord } from '../mhtmlToWord'
+const Option = Select.Option;
+
const toJS = mobx.toJS;
const confirm = Modal.confirm;
-
+const getLabel = WeaLocaleProvider.getLabel;
@inject('personnelResume')
@observer
@@ -165,15 +168,15 @@ export default class PersonnelResume extends React.Component {
btns.push()
topMenu.map((item, i) => {
@@ -255,7 +258,7 @@ export default class PersonnelResume extends React.Component {
resumeList
} = personnelResume;
exportWord({
- filename:`人员简历-${resumeList.lastName}`,
+ filename:`${getLabel(547238,'人员简历')}-${resumeList.lastName}`,
selector:"#personnel-resume",
style:`.title {
font-size: 18px;
diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js
index e9b13b4..c1fef92 100644
--- a/pc4mobx/organization/components/resource/ResourceCard.js
+++ b/pc4mobx/organization/components/resource/ResourceCard.js
@@ -11,7 +11,8 @@ import {
WeaRightMenu,
WeaAlertPage,
WeaNewScrollPagination,
- WeaSlideModal
+ WeaSlideModal,
+ WeaLocaleProvider
} from 'ecCom'
import {
Row,
@@ -43,6 +44,7 @@ import isEmpty from 'lodash/isEmpty'
const toJS = mobx.toJS;
const confirm = Modal.confirm;
+const getLabel = WeaLocaleProvider.getLabel;
@inject('resourceCard')
@observer
@@ -253,9 +255,9 @@ export default class ResourceCard extends React.Component {
{data.user.phone}
- 账号类型:
+ {getLabel(547239,'账号类型')}:
{data.user.accountType}
- 状态:
+ {getLabel(547240,'状态')}:
{data.user.status}
-
@@ -297,7 +299,7 @@ export default class ResourceCard extends React.Component {
}}>
流程总数
+{getLabel(547241,'流程总数')}
{data.statistical.workflowCount}
-
@@ -306,7 +308,7 @@ export default class ResourceCard extends React.Component {
}}>
文档总数
+{getLabel(547243,'文档总数')}
{data.statistical.docCount}
-
@@ -315,7 +317,7 @@ export default class ResourceCard extends React.Component {
}}>
我的客户
+{getLabel(547244,'我的客户')}
{data.statistical.cusCount}
-
@@ -324,7 +326,7 @@ export default class ResourceCard extends React.Component {
}}>
我的协作
+{getLabel(547245,'我的协作')}
{data.statistical.collaborationCount}
-
@@ -361,7 +363,7 @@ export default class ResourceCard extends React.Component {
height={100}
direction={'right'}
measure={'%'}
- content={!isEmpty(versionList) ? 微博总数
+{getLabel(547246,'我的协作')}
{data.statistical.weiboCount}
暂无历史版本
}
+ content={!isEmpty(versionList) ? {getLabel(547659,'暂无历史版本')}
}
onClose={this.onClose}
onAnimationEnd={() => console.log('onAnimationEnd')} />
diff --git a/pc4mobx/organization/components/resource/SearchCustomDialog.js b/pc4mobx/organization/components/resource/SearchCustomDialog.js
index eead673..6974bdb 100644
--- a/pc4mobx/organization/components/resource/SearchCustomDialog.js
+++ b/pc4mobx/organization/components/resource/SearchCustomDialog.js
@@ -4,7 +4,8 @@ import {
import {
WeaDialog,
WeaFormItem,
- WeaInput
+ WeaInput,
+ WeaLocaleProvider
} from 'ecCom';
import Customization from './Customization';
import {
@@ -15,6 +16,7 @@ import {
i18n
} from '../../public/i18n';
const confirm = Modal.confirm;
+const getLabel = WeaLocaleProvider.getLabel;
@observer
export default class SearchCustomDialog extends React.Component {
@@ -31,10 +33,10 @@ export default class SearchCustomDialog extends React.Component {
} = store;
confirm({
- title: "存为模板",
+ title: getLabel(547548,'存为模板'),
content:
- 待选
+ {getLabel(547648,'待选')}
- 已选
+ {getLabel(547649,'已选')}
this.updateCustomTemplate()}>保存]
+ buttons: []
}
@computed get editTableParams() {
@@ -662,7 +667,7 @@ export class ResourceStore {
Api.updateCustomTemplate(params).then(res => {
let { code, msg } = res;
if (code === 200) {
- message.success(msg || "操作成功");
+ message.success(msg || getLabel(30700,'操作成功'));
this.getEditTable();
this.customization();
} else {
diff --git a/pc4mobx/organization/stores/resourceCard.js b/pc4mobx/organization/stores/resourceCard.js
index a1d8b14..764e0fc 100644
--- a/pc4mobx/organization/stores/resourceCard.js
+++ b/pc4mobx/organization/stores/resourceCard.js
@@ -90,164 +90,6 @@ export class ResourceCardStore {
setVersionList(obj) {
this.versionList = obj;
}
- /************** json数据*****************/
- // @observable data = {
- // buttons:[
- // {
- // name:'编辑卡片',
- // url:'http://www.com/${id}?userid=${id}',
- // sysDefault:0
- // },
- // ]
- // user: {
- // id:23,
- // image: "",
- // name: "萧言",
- // sex:"0",
- // email: "1546584672@qq.com",
- // phone: "18822349878",
- // belongTo: "主账号",
- // status: "正式"
- // },
- // statistical: {
- // workflowCount:190,
- // docCount:134,
- // cusCount:28,
- // collaborationCount:28,
- // weiboCount:166
- // },
- // formItems:[
- // {
- // id:'userInfo',
- // title:'员工信息',
- // items:[
- // {
- // fieldId:'姓名',
- // fieldValue:'萧言'
- // },{
- // fieldId:'性别',
- // fieldValue:'男'
- // },{
- // fieldId:'出生日期',
- // fieldValue:'1987年9月1日'
- // },{
- // fieldId:'个人邮箱',
- // fieldValue:'1546875925@qq.com'
- // },{
- // fieldId:'电话号码',
- // fieldValue:'18925689752'
- // },{
- // fieldId:'岗位级别',
- // fieldValue:'-'
- // },{
- // fieldId:'职务信息',
- // fieldValue:'产品运营'
- // }
- // ]
- // },
- // {
- // id:'workInfo',
- // title:'工作信息',
- // items:[
- // {
- // fieldId:'姓名',
- // fieldValue:'萧言'
- // },{
- // fieldId:'性别',
- // fieldValue:'男'
- // },{
- // fieldId:'出生日期',
- // fieldValue:'1987年9月1日'
- // },{
- // fieldId:'个人邮箱',
- // fieldValue:'1546875925@qq.com'
- // },{
- // fieldId:'姓名',
- // fieldValue:'萧言'
- // },{
- // fieldId:'性别',
- // fieldValue:'男'
- // },{
- // fieldId:'出生日期',
- // fieldValue:'1987年9月1日'
- // },{
- // fieldId:'个人邮箱',
- // fieldValue:'1546875925@qq.com'
- // },{
- // fieldId:'姓名',
- // fieldValue:'萧言'
- // },{
- // fieldId:'性别',
- // fieldValue:'男'
- // },{
- // fieldId:'出生日期',
- // fieldValue:'1987年9月1日'
- // },{
- // fieldId:'个人邮箱',
- // fieldValue:'1546875925@qq.com'
- // }
- // ]
- // },
- // {
- // id:'educationInfo',
- // title:'教育经历',
- // items:[
- // {
- // fieldId:'本科',
- // fieldValue:'南京大学'
- // },{
- // fieldId:'研究生',
- // fieldValue:'北京大学'
- // },{
- // fieldId:'毕业时间',
- // fieldValue:'1987-09-21'
- // },{
- // fieldId:'获得奖项',
- // fieldValue:'优秀毕业生'
- // },{
- // fieldId:'备注',
- // fieldValue:'无'
- // }
- // ]
- // }
- // ],
- // anchorList:[
- // {
- // id:'userInfo',
- // title:'员工信息'
- // },
- // {
- // id:'workInfo',
- // title:'工作信息'
- // },
- // {
- // id:'educationInfo',
- // title:'教育经历'
- // },
- // {
- // id:'comp',
- // title:'分部扩展页'
- // },
- // {
- // id:'dept',
- // title:'部门扩展页'
- // }
-
-
- // ],
- // iframeList: [
- // {
- // id:"comp",
- // title:"分部管理",
- // url:'/spa/organization/static/index.html#/main/organization/companyExtend/7'
- // },
- // {
- // id:"dept",
- // title:"部门管理",
- // url:'/spa/organization/static/index.html#/main/organization/company'
- // },
- // ]
-
- // }
+
}
diff --git a/pc4mobx/organization/style/common.less b/pc4mobx/organization/style/common.less
index ec578eb..2c61578 100644
--- a/pc4mobx/organization/style/common.less
+++ b/pc4mobx/organization/style/common.less
@@ -88,6 +88,9 @@
.new-edit-wrapper{
.wea-select, .ant-select{
width: 100%;
+ };
+ .wea-new-scroll {
+ padding-bottom: 30px;
}
}