diff --git a/pc4mobx/organization/apis/jobgrade.js b/pc4mobx/organization/apis/jobgrade.js
new file mode 100644
index 0000000..e69de29
diff --git a/pc4mobx/organization/apis/joblevel.js b/pc4mobx/organization/apis/joblevel.js
new file mode 100644
index 0000000..e69de29
diff --git a/pc4mobx/organization/apis/rankscheme.js b/pc4mobx/organization/apis/rankscheme.js
index e2c225a..7a1aee7 100644
--- a/pc4mobx/organization/apis/rankscheme.js
+++ b/pc4mobx/organization/apis/rankscheme.js
@@ -5,4 +5,58 @@ import {
export const getSearchList = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/scheme/getTable', 'GET', params);
+}
+
+export const deleteTableData = (params) => {
+ //return WeaTools.callApi('/api/bs/hrmorganization/scheme/deleteByIds', 'POST', params);
+ return fetch('/api/bs/hrmorganization/scheme/deleteByIds', {
+ method: 'POST',
+ mode: 'cors',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(params)
+ })
+}
+
+export const getAdvanceSearchCondition = (params) => {
+ return WeaTools.callApi('/api/bs/hrmorganization/scheme/getSearchCondition', 'GET', params);
+}
+
+export const add = (params) => {
+ //return WeaTools.callApi('/api/bs/hrmorganization/scheme/save', 'POST', params);
+ return fetch('/api/bs/hrmorganization/scheme/save', {
+ method: 'POST',
+ mode: 'cors',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(params)
+ })
+}
+
+export const edit = (params) => {
+ return fetch('/api/bs/hrmorganization/scheme/updateScheme', {
+ method: 'POST',
+ mode: 'cors',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(params)
+ })
+}
+
+export const updateForbiddenTag = (params) => {
+ return fetch('/api/bs/hrmorganization/scheme/updateForbiddenTagById', {
+ method: 'POST',
+ mode: 'cors',
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(params)
+ })
+}
+
+export const getSchemeForm = (params) => {
+ return WeaTools.callApi('/api/bs/hrmorganization/scheme/getSchemeForm', 'GET', params);
}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js
new file mode 100644
index 0000000..b447c5a
--- /dev/null
+++ b/pc4mobx/organization/components/NewAndEditDialog.js
@@ -0,0 +1,133 @@
+import {
+ WeaDialog,
+ WeaFormItem,
+ WeaNewScroll,
+ WeaSearchGroup,
+ WeaMoreButton,
+} from 'ecCom'
+
+import {
+ Spin,
+ Button,
+} from 'antd'
+
+import {
+ WeaSwitch
+} from 'comsMobx'
+
+import {
+ i18n
+} from '../public/i18n';
+
+export default class NewAndEditDialog extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ width: 700,
+ }
+ }
+
+
+ getForm() {
+ const {
+ condition,
+ form,
+ isFormInit,
+ } = this.props;
+
+ let arr = [];
+ isFormInit && condition.map(c => {
+ c.items.map((field, index) => {
+ arr.push(
+ {}
+ )
+ })
+ })
+ return {arr}
+ }
+
+ getSearchGroupForm() {
+ const {
+ condition,
+ form,
+ isFormInit,
+ domkey,
+ isEdit
+ } = this.props;
+
+ let arr = [];
+ isFormInit && condition.map((c, i) => {
+ let _arr = [];
+ c.items.map((field, index) => {
+ _arr.push({
+ com: (
+
+
+
+ ),
+ colSpan: 1
+ })
+ })
+ arr.push()
+ })
+
+ return arr;
+ }
+
+
+
+ render() {
+ const {
+ title,
+ visible,
+ save,
+ onCancel,
+ loading,
+ isEdit,
+ height,
+ conditionLen,
+ } = this.props, {
+ width,
+ } = this.state;
+
+ const buttons = [
+ (),
+ ()
+ ];
+
+ return (
+ onCancel() }
+ buttons={isEdit?buttons:buttons.slice(1,2)}
+ style={{width: width, height: height}}
+ >
+ {
+ loading ?
+
+
+ : 1 ? '' : 'hrm-dialog-form'}>
+ {conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()}
+
+ }
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/postionrank/JobGrade.js b/pc4mobx/organization/components/postionrank/JobGrade.js
new file mode 100644
index 0000000..8a3b279
--- /dev/null
+++ b/pc4mobx/organization/components/postionrank/JobGrade.js
@@ -0,0 +1,425 @@
+import React from 'react'
+import * as mobx from 'mobx'
+import {
+ inject,
+ observer,
+} from 'mobx-react'
+import {
+ WeaTop,
+ WeaTab,
+ WeaFormItem,
+ WeaRightMenu,
+} from 'ecCom'
+import {
+ Row,
+ Col,
+ Spin,
+ Modal,
+ Button,
+ message,
+ Switch
+} from 'antd'
+import {
+ WeaSwitch,
+ WeaTableNew
+} from 'comsMobx'
+import {
+ i18n
+} from '../../public/i18n';
+
+import '../../style/common.less';
+
+import NewAndEditDialog from '../NewAndEditDialog';
+
+
+
+const toJS = mobx.toJS;
+const confirm = Modal.confirm;
+const WeaTable = WeaTableNew.WeaTable;
+
+
+@inject('jobGrade')
+@observer
+export default class JobGrade extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ componentWillMount() {
+ }
+
+ componentDidMount() {
+ this.init();
+ }
+
+ componentWillReceiveProps(nextProps) {
+ const {
+ jobGrade
+ } = this.props;
+
+ if (this.props.location.key !== nextProps.location.key) {
+ this.init();
+ }
+ }
+
+ init() {
+ const {
+ jobGrade
+ } = this.props;
+ jobGrade.getTableInfo();
+ jobGrade.getHasRight();
+ }
+
+ getTopMenuBtns() {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ topMenu,
+ tableStore
+ } = jobGrade;
+
+ let btns = [];
+ topMenu.map((item, i) => {
+ if (item.menuFun !== 'batchDelete') {
+ btns.push();
+ } else {
+ btns.push();
+ }
+
+ });
+
+ return btns;
+ }
+
+ handleClick(item) {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ isPanelShow
+ } = jobGrade;
+
+ isPanelShow && jobGrade.setPanelStatus(false);
+ this[item.menuFun] && this[item.menuFun]();
+ }
+
+ new() {
+ const {
+ jobGrade
+ } = this.props;
+
+ jobGrade.setNeDialogTitle(i18n.label.newRankScheme());
+ jobGrade.setIsNew(true);
+ jobGrade.setVisible(true);
+ jobGrade.getForm();
+ }
+
+ batchDelete() {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ tableStore
+ } = jobGrade;
+
+ let keys = toJS(tableStore.selectedRowKeys).toString();
+ jobGrade.setIds(keys);
+ this.showConfirm('batchDel');
+ }
+ showConfirm(v) {
+ let _this = this;
+ confirm({
+ title: i18n.confirm.defaultTitle(),
+ content: (v == 'del') ? i18n.confirm.delete() : i18n.confirm.batchDeleteConfirm(),
+ okText: i18n.button.ok(),
+ cancelText: i18n.button.cancel(),
+ onOk() {
+ _this.onOk();
+ },
+ onCancel() {
+ return false;
+ },
+ });
+ }
+ onOk() {
+ const {
+ jobGrade
+ } = this.props;
+ jobGrade.delete();
+ }
+
+
+ getDropMenuDatas() {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ rightMenu
+ } = jobGrade;
+
+ let menus = [];
+ toJS(rightMenu).map((item, index) => {
+ let obj = {
+ key: item.menuFun,
+ icon: ,
+ content: item.menuName,
+ }
+ if (item.menuFun == 'collection' || item.menuFun == 'help' || item.menuFun == 'pageAddress') {
+ obj.disabled = true;
+ }
+ menus.push(obj);
+ })
+ return menus;
+ }
+
+ handleMenuClick(key) {
+
+ }
+
+ getTabBtn() {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ form2
+ } = jobGrade;
+
+ const btn = [
+ (),
+ (),
+ (),
+ ];
+
+ return btn;
+ }
+
+ onSearchChange(val) {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ form2
+ } = jobGrade;
+
+ jobGrade.setRankName(val);
+ !this.isEmptyObject(form2.getFormParams()) && jobGrade.updateFields(val);
+ }
+
+ reRenderColumns(columns) {
+ let _this = this;
+ columns.forEach((c, index) => {
+ if (c.dataIndex == 'forbidden_tag') {
+ c.render = function(text, record) {
+ return _this.updateForbiddenTag(checked,record.id)} />
+ }
+ };
+ })
+ }
+
+ updateForbiddenTag(checked,id) {
+ const {
+ jobGrade
+ } = this.props;
+ jobGrade.updateForbiddenTag(checked,id);
+ }
+
+ onOperatesClick(record, rowIndex, operate) {
+ const {
+ index
+ } = operate;
+ (index == '0') && this.doEdit(record.randomFieldId);
+ (index == '1') && this.doDel(record.randomFieldId);
+
+ }
+
+ doEdit(id) {
+ const {
+ jobGrade
+ } = this.props;
+
+ jobGrade.setNeDialogTitle(i18n.label.editRankScheme());
+ jobGrade.setLevelId(id);
+ jobGrade.setIsNew(false);
+ jobGrade.setVisible(true);
+ jobGrade.getForm();
+ }
+
+ doDel(id) {
+ const {
+ jobGrade
+ } = this.props;
+ jobGrade.setIds(id);
+ this.showConfirm('del');
+ }
+
+
+ handleSave() {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ isNew
+ } = jobGrade;
+
+ isNew && jobGrade.save();
+ !isNew && jobGrade.edit();
+ }
+
+ getPanelComponents() {
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ searchCondition,
+ form2,
+ searchConditionLoading
+ } = jobGrade;
+
+ let arr = [];
+ let formParams = form2.getFormParams();
+ const {
+ isFormInit
+ } = form2;
+
+ isFormInit && searchCondition.map(c => {
+ c.items.map((field, index) => {
+ arr.push(
+
+
+ {}
+
+
+ )
+ })
+ })
+
+ if (searchConditionLoading) {
+ return (
+
+
+
+ )
+ } else {
+ return {
+ if ( e.keyCode == 13 && e.target.tagName === "INPUT") {
+ jobGrade.getTableInfo();
+ jobGrade.setPanelStatus(false)
+ }
+ }}>{arr}
+ }
+
+ }
+
+ //非空判断
+ isEmptyObject(obj) {
+ for (let key in obj) {
+ return false;
+ }
+ return true;
+ }
+
+
+
+ render() {
+
+ const {
+ jobGrade
+ } = this.props;
+ const {
+ isPanelShow, form2, gradeName, conditionNum, tableStore,nEdialogTitle,visible,condition,
+ form,dialogLoading,isEdit,selectedKey
+ } = jobGrade;
+
+ const topTab = [
+ {
+ color: "#000000",
+ groupid: "flowAll",
+ showcount: true,
+ title: "全部",
+ viewcondition: "0"
+ },
+ {
+ color: "#ff3232",
+ groupid: "flowNew",
+ showcount: true,
+ title: "启用",
+ viewcondition: "1"
+ },
+ {
+ color: "#fea468",
+ groupid: "flowRes",
+ showcount: true,
+ title: "禁用",
+ viewcondition: "2"
+ }
+ ];
+ const topTabCount = {
+ flowAll: "120",
+ flowNew: "112",
+ flowOver: "0",
+ };
+
+ return (
+
+
this.handleMenuClick(key)}
+ >
+ }
+ iconBgcolor='#217346'
+ loading={true}
+ buttons={this.getTopMenuBtns()}
+ showDropIcon={true}
+ dropMenuDatas={this.getDropMenuDatas()}
+ onDropMenuClick={(e) => this.handleMenuClick(e)}
+ >
+ jobGrade.setPanelStatus(bool)}
+ hideSearchAd={() => jobGrade.setPanelStatus(false)}
+ searchsAd= {isPanelShow ? this.getPanelComponents() : }
+ advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
+ hasMask={false}
+ buttonsAd={this.getTabBtn()}
+ onSearch={() => jobGrade.getTableInfo()}
+ onSearchChange={val => this.onSearchChange(val)}
+ />
+ this.reRenderColumns(c)}
+ onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)}
+ />
+
+
+
this.handleSave()}
+ onCancel={() => jobGrade.setVisible(false)}
+ />
+
+
+ {}
+
+
+ )
+ })
+ })
+
+ if (searchConditionLoading) {
+ return (
+
+
+
+ )
+ } else {
+ return {
+ if ( e.keyCode == 13 && e.target.tagName === "INPUT") {
+ jobLevel.getTableInfo();
+ jobLevel.setPanelStatus(false)
+ }
+ }}>{arr}
+ }
+
+ }
+
+ //非空判断
+ isEmptyObject(obj) {
+ for (let key in obj) {
+ return false;
+ }
+ return true;
+ }
+
+
+
+
+ render() {
+
+ const {
+ jobLevel
+ } = this.props;
+ const {
+ isPanelShow, form2, levelName, conditionNum, tableStore,nEdialogTitle,visible,condition,
+ form,dialogLoading,isEdit,selectedKey
+ } = jobLevel;
+
+ const topTab = [
+ {
+ color: "#000000",
+ groupid: "flowAll",
+ showcount: true,
+ title: "全部",
+ viewcondition: "0"
+ },
+ {
+ color: "#ff3232",
+ groupid: "flowNew",
+ showcount: true,
+ title: "启用",
+ viewcondition: "1"
+ },
+ {
+ color: "#fea468",
+ groupid: "flowRes",
+ showcount: true,
+ title: "禁用",
+ viewcondition: "2"
+ }
+ ];
+ const topTabCount = {
+ flowAll: "120",
+ flowNew: "112",
+ flowOver: "0",
+ };
+
+ return (
+
+
this.handleMenuClick(key)}
+ >
+ }
+ iconBgcolor='#217346'
+ loading={true}
+ buttons={this.getTopMenuBtns()}
+ showDropIcon={true}
+ dropMenuDatas={this.getDropMenuDatas()}
+ onDropMenuClick={(e) => this.handleMenuClick(e)}
+ >
+ jobLevel.setPanelStatus(bool)}
+ hideSearchAd={() => jobLevel.setPanelStatus(false)}
+ searchsAd= {isPanelShow ? this.getPanelComponents() : }
+ advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
+ hasMask={false}
+ buttonsAd={this.getTabBtn()}
+ onSearch={() => jobLevel.getTableInfo()}
+ onSearchChange={val => this.onSearchChange(val)}
+ />
+ this.reRenderColumns(c)}
+ onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)}
+ />
+
+
+
this.handleSave()}
+ onCancel={() => jobLevel.setVisible(false)}
+ />
+