diff --git a/pc4mobx/organization/components/newImport/stepContent.js b/pc4mobx/organization/components/newImport/stepContent.js index 61301f6..072975f 100644 --- a/pc4mobx/organization/components/newImport/stepContent.js +++ b/pc4mobx/organization/components/newImport/stepContent.js @@ -233,14 +233,18 @@ export default class StepDialog extends React.Component { return (
{ - current == 0 && { - newImport.setSelectedKeys(keys); - newImport.setSelectData(datas); - }} - /> + current == 0 && +
+

注意:右侧列表默认加载的为必填字段!!!

+ { + newImport.setSelectedKeys(keys); + newImport.setSelectData(datas); + }} + /> +
} { current == 1 && diff --git a/pc4mobx/organization/stores/adareaset.js b/pc4mobx/organization/stores/adareaset.js deleted file mode 100644 index e69de29..0000000 diff --git a/pc4mobx/organization/stores/managerDetach.js b/pc4mobx/organization/stores/managerDetach.js index 6f3e7a4..3af8f26 100644 --- a/pc4mobx/organization/stores/managerDetach.js +++ b/pc4mobx/organization/stores/managerDetach.js @@ -61,8 +61,10 @@ export class ManagerDetachStore { Api.getSearchList(params).then(res => { if (res.code === 200) { this.setHasRight(res.data.hasRight); - this.isDetach = res.data.isDetach; - isOnChange ? this.tableStore.getDatas(res.data.datas, current) : this.tableStore.getDatas(res.data.datas,1); + if(res.data.hasRight) { + this.isDetach = res.data.isDetach; + isOnChange ? this.tableStore.getDatas(res.data.datas, current) : this.tableStore.getDatas(res.data.datas,1); + } } else { message.warning(res.msg); } diff --git a/pc4mobx/organization/stores/newImport.js b/pc4mobx/organization/stores/newImport.js index 6c40f26..20a3cde 100644 --- a/pc4mobx/organization/stores/newImport.js +++ b/pc4mobx/organization/stores/newImport.js @@ -85,8 +85,16 @@ export class NewImportStore { "icon": "icon-coms-crm", "title": "人员", "linkName": "人员导入", - "url": "/spa/hrm/engine.html#/hrmengine/organization" - } + "url": "/spa/organization/static/index.html#/main/organization/resource" + }, + { + "subTitle": "等级设置", + "bgColor": "rgb(230, 168, 69)", + "icon": "icon-portal-kpi-o", + "title": "职等职级", + "linkName": "职等职级导入", + "url": "/spa/organization/static/index.html#/main/organization/rankscheme" + }, ] @observable isMouseOver = false;