diff --git a/pc4mobx/organization/apis/hrmInfoExtend.js b/pc4mobx/organization/apis/hrmInfoExtend.js
new file mode 100644
index 0000000..c2dea13
--- /dev/null
+++ b/pc4mobx/organization/apis/hrmInfoExtend.js
@@ -0,0 +1,11 @@
+import {
+ WeaTools
+} from 'ecCom';
+
+export const editResource = (params) => {
+ return WeaTools.callApi('/api/bs/hrmorganization/hrmresource/updateForm', 'POST', params);
+}
+
+export const getResourceExtendForm = (params) => {
+ return WeaTools.callApi('/api/bs/hrmorganization/hrmresource/getTabForm', 'GET', params);
+}
\ No newline at end of file
diff --git a/pc4mobx/organization/apis/job.js b/pc4mobx/organization/apis/job.js
index d3fc1ec..694f9f4 100644
--- a/pc4mobx/organization/apis/job.js
+++ b/pc4mobx/organization/apis/job.js
@@ -87,6 +87,10 @@ export const getHasRight = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/job/getHasRight', 'GET', params);
}
+export const getLevelId = (params) => {
+ return WeaTools.callApi('/api/bs/hrmorganization/grade/getLevelId', 'GET', params);
+}
+
export const getMergeForm = (params = {}) => {
return WeaTools.callApi('/api/bs/hrmorganization/job/getMergeForm', 'GET', params);
}
diff --git a/pc4mobx/organization/apis/jobgrade.js b/pc4mobx/organization/apis/jobgrade.js
index 2029137..8109602 100644
--- a/pc4mobx/organization/apis/jobgrade.js
+++ b/pc4mobx/organization/apis/jobgrade.js
@@ -62,6 +62,7 @@ export const getTabInfo = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/grade/getTabInfo', 'GET', params);
}
+
export const getHasRight = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/grade/getHasRight', 'GET', params);
}
diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js
index 6e65d79..c041255 100644
--- a/pc4mobx/organization/components/NewAndEditDialog.js
+++ b/pc4mobx/organization/components/NewAndEditDialog.js
@@ -66,7 +66,7 @@ export default class NewAndEditDialog extends React.Component {
if (moduleName == 'department' && data.parent_comp) {
bindChangeEnvent(data.parent_comp.value);
}
- if (moduleName == 'job' && (data.sequence_id || data.level_id)) {
+ if (moduleName == 'job' && (data.sequence_id || data.grade_id)) {
bindChangeEnvent(data);
}
};
diff --git a/pc4mobx/organization/components/job/JobExtend.js b/pc4mobx/organization/components/job/JobExtend.js
index 5f900cd..3338e57 100644
--- a/pc4mobx/organization/components/job/JobExtend.js
+++ b/pc4mobx/organization/components/job/JobExtend.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-26 14:07:12
- * @LastEditTime: 2022-06-22 17:01:11
+ * @LastEditTime: 2022-07-12 16:25:58
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/JobExtend.js
*/
@@ -105,12 +105,12 @@ export default class JobExtend extends React.Component {
getSearchs = () => {
const { jobExtend } = this.props;
- let { form, conditions, isEditor } = jobExtend;
+ let { form, condition, isEditor } = jobExtend;
const { isFormInit } = form;
let group = [];
let tipPosition = 'bottom';
window.e9HideFormFieldKeys = [];
- isFormInit && conditions.forEach((c, i) => {
+ isFormInit && condition.forEach((c, i) => {
let items = [];
c.items.forEach((field, j) => {
if (c.hide || (!isEmpty(field.otherParams) && field.otherParams.hide)) {
@@ -124,7 +124,7 @@ export default class JobExtend extends React.Component {
tipPosition={tipPosition}
labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}>
-
+
),
colSpan: 1
});
@@ -136,6 +136,14 @@ export default class JobExtend extends React.Component {
return group;
}
+ onChange = (data) => {
+ const { jobExtend } = this.props;
+ if (data.sequence_id || data.grade_id) {
+ jobExtend.updateConditions(data);
+ }
+ }
+
+
tableEditChange = (data) => {
const { jobExtend } = this.props;
let { detailSelectedKey = '0', tableInfo } = jobExtend;
@@ -228,7 +236,7 @@ export default class JobExtend extends React.Component {
render() {
const { jobExtend } = this.props;
- const { loading, tabkey, tabInfo, topTab, selectedKey, date, detailSelectedKey,isEditor } = jobExtend;
+ const { loading, tabkey, tabInfo, topTab, selectedKey, date, detailSelectedKey, isEditor } = jobExtend;
try {
@@ -239,7 +247,7 @@ export default class JobExtend extends React.Component {
>
}
iconBgcolor='#217346'
buttons={this.getTopButtons()}
diff --git a/pc4mobx/organization/components/resource/HrmInfoExtend.js b/pc4mobx/organization/components/resource/HrmInfoExtend.js
new file mode 100644
index 0000000..5c16bea
--- /dev/null
+++ b/pc4mobx/organization/components/resource/HrmInfoExtend.js
@@ -0,0 +1,187 @@
+
+import { Button, Modal, message, Row, Col, Spin } from 'antd';
+import isEmpty from 'lodash/isEmpty'
+import cloneDeep from 'lodash/cloneDeep'
+import forEach from 'lodash/forEach'
+import { WeaAlertPage, WeaTools, WeaTableEdit, WeaSearchGroup, WeaRightMenu, WeaFormItem, WeaTab, WeaTop } from 'ecCom'
+import { WeaSwitch, WeaForm } from 'comsMobx';
+import { inject, observer } from 'mobx-react';
+import * as mobx from 'mobx';
+import { i18n } from '../../public/i18n';
+import * as Api from '../../apis/hrmInfoExtend'; // 引入API接口文件
+
+
+const toJS = mobx.toJS;
+import '../../style/common.less';
+
+
+
+export default class HrmInfoExtend extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: props.location.query.hrmResourceID,
+ isEditor: false,
+ loading: false,
+ form: new WeaForm(),
+ conditions: [],
+ buttons: {},
+ date: ''
+ }
+ }
+
+ componentDidMount() {
+ this.init();
+ }
+
+ init = () => {
+ this.setState({
+ isEditor: false
+ });
+ this.getData();
+ }
+
+ getData = () => {
+ this.state.loading = true;
+ let params = {
+ viewAttr: this.isEditor ? 2 : 1,
+ id: this.state.id,
+ }
+ Api.getResourceExtendForm(params).then((res) => {
+ if (res.code === 200) {
+ this.state.form.initFormFields(res.data.conditions);
+ this.setState({
+ conditions: res.data.conditions,
+ buttons: res.data.buttons,
+ loading: false
+ })
+ } else {
+ message.warning(res.msg);
+ }
+ }, error => {
+ message.warning(error.msg);
+ })
+ }
+
+ getTopButtons = () => {
+ const { isEditor, buttons } = this.state;
+ const save = ;
+ const back = ;
+ const edit = ;
+ const btns = [];
+ try {
+ if (isEditor) {
+ if (buttons.hasSave) {
+ btns.push(save);
+ btns.push(back);
+ }
+ } else {
+ if (buttons.hasEdit) {
+ btns.push(edit);
+ }
+ }
+ } catch (e) { }
+ return btns;
+ }
+
+ getSearchs = () => {
+ let { form, conditions, isEditor } = this.state;
+ const { isFormInit } = form;
+ let group = [];
+ let tipPosition = 'bottom';
+ window.e9HideFormFieldKeys = [];
+ isFormInit && conditions.forEach((c, i) => {
+ let items = [];
+ c.items.forEach((field, j) => {
+ if (c.hide || (!isEmpty(field.otherParams) && field.otherParams.hide)) {
+ window.e9HideFormFieldKeys.push(field.domkey[0]);
+ } else {
+ items.push({
+ com: (
+
+ ),
+ colSpan: 1
+ });
+ }
+ });
+ group.push()
+ });
+ return group;
+ }
+
+ editCard = () => {
+ this.setState({
+ isEditor: true
+ })
+ this.getData();
+ }
+
+ //todo 更新操作暂不处理
+ saveEditCard = () => {
+ const {loading,form} = this.state;
+ this.state.form.validateForm().then(f => {
+ if (f.isValid) {
+ this.state.loading = true;
+ let pDatas = this.form.getFormParams();
+ Api.editResource({
+ ...{
+ id: this.id
+ },
+ ...pDatas,
+ ...this.getTableEditParams()
+ }).then(data => {
+ if (data.code == 200) {
+ message.success(i18n.message.saveSuccess());
+ this.init();
+ this.getData();
+ this.selectedRowKeys = [];
+ } else {
+ message.warning(data.message);
+ }
+ this.loading = false;
+ }, error => {
+ message.warning(error.message);
+ this.loading = false;
+ })
+ } else {
+ f.showErrors();
+ this.setDate(new Date());
+ this.loading = false;
+ }
+ })
+ }
+
+ backCard = () => {
+ this.init();
+ }
+
+
+ render() {
+
+ const { loading } = this.state;
+
+ return (
+
+
+ {
+ loading ?
+
+
+ : this.getSearchs()
+ }
+
+
+