@@ -382,9 +370,10 @@ export default class JobGrade extends React.Component {
this.handleSave()}
onCancel={() => jobGrade.setVisible(false)}
diff --git a/pc4mobx/organization/components/postionrank/JobLevel.js b/pc4mobx/organization/components/postionrank/JobLevel.js
index 020cd11..9c8ed11 100644
--- a/pc4mobx/organization/components/postionrank/JobLevel.js
+++ b/pc4mobx/organization/components/postionrank/JobLevel.js
@@ -109,7 +109,7 @@ export default class JobLevel extends React.Component {
jobLevel
} = this.props;
- jobLevel.setNeDialogTitle(i18n.label.newRankScheme());
+ jobLevel.setNeDialogTitle(i18n.label.newJobLevel());
jobLevel.setIsNew(true);
jobLevel.setVisible(true);
jobLevel.getForm();
@@ -174,7 +174,15 @@ export default class JobLevel extends React.Component {
}
handleMenuClick(key) {
+ const {
+ jobLevel
+ } = this.props;
+ const {
+ isPanelShow
+ } = jobLevel;
+ isPanelShow && jobLevel.setPanelStatus(false);
+ this[key] && this[key]();
}
getTabBtn() {
@@ -206,6 +214,13 @@ export default class JobLevel extends React.Component {
!this.isEmptyObject(form2.getFormParams()) && jobLevel.updateFields(val);
}
+ changeData(key) {
+ const {
+ jobLevel
+ } = this.props;
+ jobLevel.changeData(key);
+ }
+
reRenderColumns(columns) {
let _this = this;
columns.forEach((c, index) => {
@@ -238,7 +253,7 @@ export default class JobLevel extends React.Component {
jobLevel
} = this.props;
- jobLevel.setNeDialogTitle(i18n.label.editRankScheme());
+ jobLevel.setNeDialogTitle(i18n.label.editJobLevel());
jobLevel.setLevelId(id);
jobLevel.setIsNew(false);
jobLevel.setVisible(true);
@@ -332,37 +347,9 @@ export default class JobLevel extends React.Component {
} = this.props;
const {
isPanelShow, form2, levelName, conditionNum, tableStore,nEdialogTitle,visible,condition,
- form,dialogLoading,isEdit,selectedKey
+ form,dialogLoading,isEdit,selectedKey,topTab,topTabCount
} = 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 (
@@ -383,9 +370,10 @@ export default class JobLevel extends React.Component {
this.handleSave()}
onCancel={() => jobLevel.setVisible(false)}
diff --git a/pc4mobx/organization/components/postionrank/RankScheme.js b/pc4mobx/organization/components/postionrank/RankScheme.js
index 41deb7d..929bf8a 100644
--- a/pc4mobx/organization/components/postionrank/RankScheme.js
+++ b/pc4mobx/organization/components/postionrank/RankScheme.js
@@ -174,7 +174,15 @@ export default class RankScheme extends React.Component {
}
handleMenuClick(key) {
+ const {
+ rankScheme
+ } = this.props;
+ const {
+ isPanelShow
+ } = rankScheme;
+ isPanelShow && rankScheme.setPanelStatus(false);
+ this[key] && this[key]();
}
getTabBtn() {
diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js
new file mode 100644
index 0000000..c3f4537
--- /dev/null
+++ b/pc4mobx/organization/components/sequence/Sequence.js
@@ -0,0 +1,414 @@
+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('sequence')
+@observer
+export default class Sequence extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ componentWillMount() {
+ }
+
+ componentDidMount() {
+ this.init();
+ }
+
+ componentWillReceiveProps(nextProps) {
+ const {
+ sequence
+ } = this.props;
+
+ if (this.props.location.key !== nextProps.location.key) {
+ this.init();
+ }
+ }
+
+ init() {
+ const {
+ sequence
+ } = this.props;
+ sequence.getTableInfo();
+ sequence.getHasRight();
+ }
+
+ getTopMenuBtns() {
+ const {
+ sequence
+ } = this.props;
+ const {
+ topMenu,
+ tableStore
+ } = sequence;
+
+ let btns = [];
+ topMenu.map((item, i) => {
+ if (item.menuFun !== 'batchDelete') {
+ btns.push();
+ } else {
+ btns.push();
+ }
+
+ });
+
+ return btns;
+ }
+
+ handleClick(item) {
+ const {
+ sequence
+ } = this.props;
+ const {
+ isPanelShow
+ } = sequence;
+
+ isPanelShow && sequence.setPanelStatus(false);
+ this[item.menuFun] && this[item.menuFun]();
+ }
+
+ new() {
+ const {
+ sequence
+ } = this.props;
+
+ sequence.setNeDialogTitle(i18n.label.newSequence());
+ sequence.setIsNew(true);
+ sequence.setVisible(true);
+ sequence.getForm();
+ }
+
+ batchDelete() {
+ const {
+ sequence
+ } = this.props;
+ const {
+ tableStore
+ } = sequence;
+
+ let keys = toJS(tableStore.selectedRowKeys).toString();
+ sequence.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 {
+ sequence
+ } = this.props;
+ sequence.delete();
+ }
+
+
+ getDropMenuDatas() {
+ const {
+ sequence
+ } = this.props;
+ const {
+ rightMenu
+ } = sequence;
+
+ 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) {
+ const {
+ sequence
+ } = this.props;
+ const {
+ isPanelShow
+ } = sequence;
+
+ isPanelShow && sequence.setPanelStatus(false);
+ this[key] && this[key]();
+ }
+
+ getTabBtn() {
+ const {
+ sequence
+ } = this.props;
+ const {
+ form2
+ } = sequence;
+
+ const btn = [
+ (),
+ (),
+ (),
+ ];
+
+ return btn;
+ }
+
+ onSearchChange(val) {
+ const {
+ sequence
+ } = this.props;
+ const {
+ form2
+ } = sequence;
+
+ sequence.setSequenceName(val);
+ !this.isEmptyObject(form2.getFormParams()) && sequence.updateFields(val);
+ }
+
+ changeData(key) {
+ const {
+ sequence
+ } = this.props;
+ sequence.changeData(key);
+ }
+
+ 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 {
+ sequence
+ } = this.props;
+ sequence.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 {
+ sequence
+ } = this.props;
+
+ sequence.setNeDialogTitle(i18n.label.editSequence());
+ sequence.setLevelId(id);
+ sequence.setIsNew(false);
+ sequence.setVisible(true);
+ sequence.getForm();
+ }
+
+ doDel(id) {
+ const {
+ sequence
+ } = this.props;
+ sequence.setIds(id);
+ this.showConfirm('del');
+ }
+
+
+ handleSave() {
+ const {
+ sequence
+ } = this.props;
+ const {
+ isNew
+ } = sequence;
+
+ isNew && sequence.save();
+ !isNew && sequence.edit();
+ }
+
+ getPanelComponents() {
+ const {
+ sequence
+ } = this.props;
+ const {
+ searchCondition,
+ form2,
+ searchConditionLoading
+ } = sequence;
+
+ 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") {
+ sequence.getTableInfo();
+ sequence.setPanelStatus(false)
+ }
+ }}>{arr}
+ }
+
+ }
+
+ //非空判断
+ isEmptyObject(obj) {
+ for (let key in obj) {
+ return false;
+ }
+ return true;
+ }
+
+
+
+
+ render() {
+
+ const {
+ sequence
+ } = this.props;
+ const {
+ isPanelShow, form2, levelName, conditionNum, tableStore,nEdialogTitle,visible,condition,
+ form,dialogLoading,isEdit,selectedKey,topTab,topTabCount
+ } = sequence;
+
+
+ return (
+
+
this.handleMenuClick(key)}
+ >
+ }
+ iconBgcolor='#217346'
+ loading={true}
+ buttons={this.getTopMenuBtns()}
+ showDropIcon={true}
+ dropMenuDatas={this.getDropMenuDatas()}
+ onDropMenuClick={(e) => this.handleMenuClick(e)}
+ >
+ sequence.setPanelStatus(bool)}
+ hideSearchAd={() => sequence.setPanelStatus(false)}
+ searchsAd= {isPanelShow ? this.getPanelComponents() : }
+ advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
+ hasMask={false}
+ buttonsAd={this.getTabBtn()}
+ onSearch={() => sequence.getTableInfo()}
+ onSearchChange={val => this.onSearchChange(val)}
+ />
+ this.reRenderColumns(c)}
+ onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)}
+ />
+
+
+
this.handleSave()}
+ onCancel={() => sequence.setVisible(false)}
+ />
+ {arr}
}
+ onChange = data => {
+ if(this.state.enable && data.schemeId) {
+ const {
+ condition,
+ form,
+ bindChangeEnvent,
+ } = this.props;
+ bindChangeEnvent(data.schemeId.value);
+ }
+
+
+ };
+
+ onBlur = data => {
+ //console.log("onBlur 回调", data);
+ };
+
+
getSearchGroupForm() {
const {
condition,
form,
isFormInit,
- domkey,
isEdit
} = this.props;
@@ -67,15 +86,16 @@ export default class NewAndEditDialog extends React.Component {
_arr.push({
com: (
-
-
+ label={`${field.label}`}
+ labelCol={{ span: `${field.labelcol}` }}
+ error={form.getError(field)}
+ tipPosition="bottom"
+ wrapperCol={{ span: `${field.fieldcol}` }}
+ underline={isEdit ? false : true}
+ >
+
+
),
colSpan: 1
})
@@ -115,17 +135,17 @@ export default class NewAndEditDialog extends React.Component {
visible={visible}
closable={true}
hasScroll={true}
- onCancel={() => onCancel() }
- buttons={isEdit?buttons:buttons.slice(1,2)}
- style={{width: width, height: height}}
+ onCancel={() => onCancel()}
+ buttons={isEdit ? buttons : buttons.slice(1, 2)}
+ style={{ width: width, height: height }}
>
{
- loading ?
-
-
- : 1 ? '' : 'hrm-dialog-form'}>
- {conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()}
-
+ loading ?
+
+
+ : 1 ? '' : 'hrm-dialog-form'}>
+ {conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()}
+
}
)
diff --git a/pc4mobx/organization/components/group/Group.js b/pc4mobx/organization/components/group/Group.js
new file mode 100644
index 0000000..4e26c0b
--- /dev/null
+++ b/pc4mobx/organization/components/group/Group.js
@@ -0,0 +1,224 @@
+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;
+
+
+@inject('group')
+@observer
+export default class Group extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ componentWillMount() {
+ }
+
+ componentDidMount() {
+ this.init();
+ }
+
+ componentWillReceiveProps(nextProps) {
+ const {
+ group
+ } = this.props;
+
+ if (this.props.location.key !== nextProps.location.key) {
+ this.init();
+ }
+ }
+
+ init() {
+ const {
+ group
+ } = this.props;
+ group.getGroupForm();
+ group.getHasRight();
+ }
+
+ getTopMenuBtns() {
+ const {
+ group
+ } = this.props;
+ const {
+ topMenu,
+ tableStore
+ } = group;
+
+ let btns = [];
+ topMenu.map((item, i) => {
+ btns.push();
+ });
+ return btns;
+ }
+
+ getDropMenuDatas() {
+ const {
+ group
+ } = this.props;
+ const {
+ rightMenu
+ } = group;
+
+ 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;
+ }
+
+
+
+ doEdit(id) {
+ const {
+ group
+ } = this.props;
+
+ group.setNeDialogTitle(i18n.label.editGroup());
+ group.setVisible(true);
+ group.getForm();
+ }
+
+
+ handleSave() {
+ const {
+ group
+ } = this.props;
+ group.edit();
+ }
+
+ handleMenuClick(key) {
+ this[key] && this[key]();
+ }
+
+ handleClick(item) {
+ this[item.menuFun] && this[item.menuFun]();
+ }
+
+
+ changeData(key) {
+ const {
+ group
+ } = this.props;
+ group.changeData(key);
+ }
+
+ getFormField() {
+ const {
+ group
+ } = this.props;
+ const { form1, groupCondition } = group;
+
+ const { isFormInit } = form1;
+ const formParams = form1.getFormParams();
+ let items = [];
+ isFormInit && toJS(groupCondition).map(c => {
+ c.items.map((fields, index) => {
+ items.push(
+
+ );
+ });
+ });
+ return {items}
;
+ }
+
+
+
+ render() {
+
+ const {
+ group
+ } = this.props;
+ const {
+ nEdialogTitle, visible, condition, form, dialogLoading, isEdit, topTab, selectedKey
+ } = group;
+
+ return (
+
+
this.handleMenuClick(key)}
+ >
+ }
+ iconBgcolor='#217346'
+ loading={true}
+ buttons={this.getTopMenuBtns()}
+ showDropIcon={true}
+ dropMenuDatas={this.getDropMenuDatas()}
+ onDropMenuClick={(e) => this.handleMenuClick(e)}
+ >
+
+
+ {this.getFormField()}
+
+
+
+
this.handleSave()}
+ onCancel={() => group.setVisible(false)}
+ enable={false} //是否开启字段联动
+ />
+