diff --git a/pc4mobx/organization/components/newImport/index.js b/pc4mobx/organization/components/newImport/index.js index 396402c..2614f77 100644 --- a/pc4mobx/organization/components/newImport/index.js +++ b/pc4mobx/organization/components/newImport/index.js @@ -110,6 +110,9 @@ export default class newImport extends React.Component { case 3: newImport.importType = 'resource'; break; + case 4: + newImport.importType = 'joblevel'; + break; } newImport.buttonTitle = i18n.button.nextStep(); newImport.current = 0; diff --git a/pc4mobx/organization/components/office/officeManage.js b/pc4mobx/organization/components/office/officeManage.js index a9de814..c80df47 100644 --- a/pc4mobx/organization/components/office/officeManage.js +++ b/pc4mobx/organization/components/office/officeManage.js @@ -13,6 +13,7 @@ import { renderNoright } from "../../util"; const confirm = Modal.confirm; const WeaTable = WeaTableNew.WeaTable; @inject("officeManageStore") +@inject('importDialog') @observer export default class OfficeManage extends Component { constructor(props) { @@ -62,7 +63,7 @@ export default class OfficeManage extends Component { }; handleMenuClick = key => { - const { officeManageStore } = this.props; + const { officeManageStore,importDialog } = this.props; const { isPanelShow, tableStore, officeClassifyId } = officeManageStore; isPanelShow && officeManageStore.setPanelStatus(false); switch (key) { @@ -78,6 +79,12 @@ export default class OfficeManage extends Component { tableStore.setColSetVisible(true); tableStore.tableColSet(true); break; + case "import": + importDialog.importVisible=true; + importDialog.importModule='postInfo'; + importDialog.current = 0; + importDialog.getImportForm(); + break; default: break; } @@ -133,7 +140,7 @@ export default class OfficeManage extends Component { } getTopMenuBtns = () => { - const { officeManageStore } = this.props; + const { officeManageStore,importDialog } = this.props; const { topMenu, tableStore, officeClassifyId } = officeManageStore; let btns = []; topMenu.map((item, i) => { @@ -161,6 +168,11 @@ export default class OfficeManage extends Component { bool: true, type: item.menuFun }); + }else if(item.menuFun == "import") { + importDialog.importVisible=true; + importDialog.importModule='postInfo'; + importDialog.current = 0; + importDialog.getImportForm(); } }}> {item.menuName}