liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '其它导入' (#17) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/17
This commit is contained in:
liang.cheng 2022-11-10 16:13:21 +08:00
parent 6b3f35374c 3dbcad0bd0
commit 5b091c5e82
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pc4mobx/organization/components/newImport/index.js
View File

@ -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;

16
pc4mobx/organization/components/office/officeManage.js
View File

@ -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}