diff --git a/pc4mobx/organization/components/department/departmentExtend.js b/pc4mobx/organization/components/department/departmentExtend.js index 1100485..7cd4525 100644 --- a/pc4mobx/organization/components/department/departmentExtend.js +++ b/pc4mobx/organization/components/department/departmentExtend.js @@ -29,8 +29,6 @@ import '../../style/common.less'; export default class DepartmentExtendStore extends React.Component { componentDidMount() { - const params = useParams(); - console.log(toJS(params)); this.handleHashChange(); window.addEventListener('hashchange', this.handleHashChange); } diff --git a/pc4mobx/organization/components/newImport/stepContent.js b/pc4mobx/organization/components/newImport/stepContent.js index c8ae746..d9d1a82 100644 --- a/pc4mobx/organization/components/newImport/stepContent.js +++ b/pc4mobx/organization/components/newImport/stepContent.js @@ -239,7 +239,7 @@ export default class StepDialog extends React.Component { { current == 0 &&
-

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

+

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

this.handleSave()} onCancel={() => sequence.setVisible(false)} /> + {importVisible && }
) } diff --git a/pc4mobx/organization/stores/departmentextend.js b/pc4mobx/organization/stores/departmentextend.js index ffacc2e..0a11802 100644 --- a/pc4mobx/organization/stores/departmentextend.js +++ b/pc4mobx/organization/stores/departmentextend.js @@ -152,7 +152,17 @@ export class DepartmentExtendStore { //this.tableInfo = this.handleTable(res.data.result.tables); this.getTabInfo(); res.data.result.buttons && this.setButtons(res.data.result.buttons); - res.data.result.tabInfo && this.setTopTab(res.data.result.tabInfo); + // const topTab = [ + // ...res.data.result.tabInfo, + // { + // "color": "#000000", + // "groupId": "-10000", + // "showcount": false, + // "title": "人力资源", + // "viewCondition": "-10000" + // } + // ] + this.setTopTab(res.data.result.tabInfo); this.isEditor && this.getSelectedRows(); this.setLoading(false);