-
- }
+ {field.domkey[0] == 'departmentcode' && field.viewAttr != '1' && }
),
colSpan: 1
});
@@ -296,7 +301,7 @@ export default class DepartmentExtendStore extends React.Component {
height={94}
direction={'right'}
measure={'%'}
- content={!isEmpty(versionList) ? departmentExtend.changeVersion(val)}/> : ''}
+ content={!isEmpty(versionList) ? departmentExtend.changeVersion(val)}/> : _this.updateForbiddenTag(checked, record.id)} />
}
};
- if (c.dataIndex == 'jobName') {
+ if (c.dataIndex == 'jobTitleName') {
c.render = function (text, record) {
return {
window.open(`/spa/organization/static/index.html#/main/organization/jobExtend/${record.id}`, "_blank")
diff --git a/pc4mobx/organization/components/resource/PersonnelResume.js b/pc4mobx/organization/components/resource/PersonnelResume.js
new file mode 100644
index 0000000..eaa2b8d
--- /dev/null
+++ b/pc4mobx/organization/components/resource/PersonnelResume.js
@@ -0,0 +1,346 @@
+import React from 'react'
+import * as mobx from 'mobx'
+import {
+ inject,
+ observer,
+} from 'mobx-react'
+import {
+ WeaTop,
+ WeaTab,
+ WeaFormItem,
+ WeaRightMenu,
+ WeaLeftRightLayout,
+ WeaOrgTree
+} from 'ecCom'
+import {
+ Row,
+ Col,
+ Spin,
+ Modal,
+ Button,
+ message,
+ Switch,
+ Menu, Dropdown, Icon, Select
+} from 'antd'
+import {
+ WeaSwitch,
+ WeaTableNew
+} from 'comsMobx'
+import {
+ i18n
+} from '../../public/i18n';
+
+import '../../style/resume.less';
+import { renderNoright } from '../../util';
+
+
+const toJS = mobx.toJS;
+const confirm = Modal.confirm;
+
+
+@inject('personnelResume')
+@observer
+export default class PersonnelResume extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ componentWillMount() {
+ }
+
+ componentDidMount() {
+ this.init();
+ }
+
+ componentWillReceiveProps(nextProps) {
+ const {
+ personnelResume
+ } = this.props;
+
+ if (this.props.location.key !== nextProps.location.key) {
+ this.init();
+ }
+ }
+
+ init() {
+ const {
+ personnelResume
+ } = this.props;
+ let { hash } = window.location;
+ hash = hash.split("?")[0];
+ let id = hash.match("[^/]+(?=/$|$)")[0];
+ personnelResume.resourceId = id;;
+ personnelResume.getHasRight();
+ }
+
+ //左侧树
+ getTree = () => {
+ const {
+ personnelResume
+ } = this.props;
+ const {
+ companysId,
+ } = personnelResume
+
+ let tree = (
+ ${i18n.label.organization()}`}
+ treeNodeClick={this.treeNodeClick}
+ expandAllChildrenOnSearch={true}
+ renderNode={item => this.renderNode(item)}
+ />
+ )
+ return tree;
+ }
+
+ renderNode(item) {
+ return
操作人: {versionList.operateName}
- -操作时间: {versionList.operateTime}
- -版本:
diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index 9736dd3..64fd9f2 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 16:23:32
- * @LastEditTime: 2022-12-09 11:36:44
+ * @LastEditTime: 2022-12-16 17:17:45
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
*/
@@ -184,7 +184,7 @@ export default class Company extends React.Component {
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
- company.version(record);
+ company.version(record.id);
},
onCancel() {
return false;
@@ -615,8 +615,8 @@ export default class Company extends React.Component {
isFormInit={form1.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
- height={340}
- conditionLen={2}
+ height={350}
+ conditionLen={1}
save={() => this.handleSave()}
onCancel={() => company.setNewVisible(false)}
saveAndSetting = {() => this.handleSaveAndSetting()}
diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js
index 341678b..538f594 100644
--- a/pc4mobx/organization/components/department/department.js
+++ b/pc4mobx/organization/components/department/department.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
- * @LastEditTime: 2022-12-13 16:00:41
+ * @LastEditTime: 2022-12-16 17:47:38
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/
@@ -348,7 +348,7 @@ export default class Department extends React.Component {
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
- department.version(record);
+ department.version(record.id);
},
onCancel() {
return false;
@@ -708,7 +708,7 @@ export default class Department extends React.Component {
loading={dialogLoading}
isEdit={isEdit}
height={400}
- conditionLen={2}
+ conditionLen={1}
save={() => this.handleSave()}
onCancel={() => department.setNewVisible(false)}
saveAndSetting={() => this.handleSaveAndSetting()}
@@ -724,7 +724,7 @@ export default class Department extends React.Component {
isFormInit={form1.isFormInit}
loading={confirmLoading}
height={100}
- width={400}
+ width={320}
isMerge={isMerge}
defaultValue={"0"}
save={() => this.PopconfirmSave()}
diff --git a/pc4mobx/organization/components/department/departmentExtend.js b/pc4mobx/organization/components/department/departmentExtend.js
index 6c20f50..bbdfe06 100644
--- a/pc4mobx/organization/components/department/departmentExtend.js
+++ b/pc4mobx/organization/components/department/departmentExtend.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:20:03
- * @LastEditTime: 2022-12-09 17:46:00
+ * @LastEditTime: 2022-12-16 16:35:02
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
*/
@@ -43,7 +43,12 @@ export default class DepartmentExtendStore extends React.Component {
view = () => {
const { departmentExtend } = this.props;
- departmentExtend.open = true;
+ departmentExtend.selectVersions();
+ }
+
+ onClose = () => {
+ const { departmentExtend } = this.props;
+ departmentExtend.open = false;
}
getTabChildren = () => {
@@ -134,7 +139,7 @@ export default class DepartmentExtendStore extends React.Component {
labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}>
暂无历史版本
}
onClose={this.onClose}
onAnimationEnd={() => console.log('onAnimationEnd')} />
diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js
index 2329e16..cc52470 100644
--- a/pc4mobx/organization/components/job/Job.js
+++ b/pc4mobx/organization/components/job/Job.js
@@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-26 14:05:59
- * @LastEditTime: 2022-12-13 16:01:40
+ * @LastEditTime: 2022-12-16 16:36:59
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/
@@ -127,9 +127,18 @@ export default class Job extends React.Component {
job.setNeDialogTitle(i18n.label.newPost());
job.setNewVisible(true);
job.getJobForm();
-
}
+
+ refresh() {
+ const {
+ job
+ } = this.props;
+
+ job.refresh();
+ }
+
+
//联查人员
select(id) {
const {
@@ -327,7 +336,7 @@ export default class Job extends React.Component {
return
+
+ {item.name}
+ {item.canceled && ({i18n.label.forbidden()})}
+
+ }
+
+ treeNodeClick = (event, ids, nodeids, nodes) => {
+ const {
+ personnelResume
+ } = this.props;
+ const {
+ companysId
+ } = personnelResume;
+ const type = event.node.props.type || '0';
+ const id = event.node.props.id || '';
+ personnelResume.nodeType = type;
+ if (type == '4') {
+ personnelResume.resourceId = id;
+ personnelResume.getPersonnelResume();
+ }
+ }
+
+ getTopMenuBtns() {
+ const {
+ personnelResume
+ } = this.props;
+ const {
+ topMenu,
+ tableStore
+ } = personnelResume;
+
+ let btns = [];
+
+ btns.push()
+
+ topMenu.map((item, i) => {
+ btns.push();
+ });
+
+
+
+ return btns;
+ }
+
+ handleClick(item) {
+ this[item.menuFun] && this[item.menuFun]();
+ }
+
+ handleChange(value) {
+
+ }
+
+ // log = () => {
+ // window.setLogViewProp({
+ // logMoudleType: 11,
+ // keys: new Date().getTime(),
+ // });
+ // }
+
+
+ getDropMenuDatas() {
+ const {
+ personnelResume
+ } = this.props;
+ const {
+ rightMenu
+ } = personnelResume;
+
+ 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) {
+ this[key] && this[key]();
+ }
+
+ isEmptyObject(obj) {
+ for (let key in obj) {
+ return false;
+ }
+ return true;
+ }
+
+
+ render() {
+
+ const {
+ personnelResume
+ } = this.props;
+ const {
+ hasRight, defaultShowLeft, resumeList
+ } = personnelResume;
+
+ if (hasRight === false) {
+ return renderNoright();
+ }
+
+
+ return (
+ hasRight &&
+ this.handleMenuClick(key)}
+ >
+
+
+
+
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js
index 0464c11..cc538a5 100644
--- a/pc4mobx/organization/components/resource/ResourceCard.js
+++ b/pc4mobx/organization/components/resource/ResourceCard.js
@@ -10,7 +10,8 @@ import {
WeaFormItem,
WeaRightMenu,
WeaAlertPage,
- WeaNewScrollPagination
+ WeaNewScrollPagination,
+ WeaSlideModal
} from 'ecCom'
import {
Row,
@@ -36,6 +37,9 @@ import FormItem from './FormItem';
import IframeItem from './IframeItem';
import AnchorDetect from './AnchorDetect';
import { renderNoright } from '../../util'; // 从util文件引入公共的方法
+import VersionsSlider from '../VersionsSlider';
+import isEmpty from 'lodash/isEmpty'
+
const toJS = mobx.toJS;
const confirm = Modal.confirm;
@@ -133,6 +137,16 @@ export default class ResourceCard extends React.Component {
window.open(e.item.props.url,"_blank")
}
+ view = () => {
+ const { resourceCard } = this.props;
+ resourceCard.selectVersions();
+ }
+
+ onClose = () => {
+ const { resourceCard } = this.props;
+ resourceCard.open = false;
+ }
+
onScroll = (event) => {
const {
resourceCard
@@ -188,7 +202,9 @@ export default class ResourceCard extends React.Component {
offset,
overtime,
intervalTime,
- data
+ data,
+ versionList,
+ open
} = resourceCard;
const menu = (
+
+
+
+
+
+
+
+ 人员简历信息
+| 一、基本信息 | +||||||
| 姓名 | +{resumeList.lastName} | +性别 | +{resumeList.sex} | +出生年月 | +{resumeList.birthday} | +|
| 籍贯 | +{resumeList.native} | +政治面貌 | +{resumeList.politics} | +部门 | +{resumeList.department} | +|
| 婚姻状况 | +{resumeList.marriage} | +岗位 | +{resumeList.jobtitle} | +入职时间 | +{resumeList.companystartdate} | +|
| 参加工作时间 | +{resumeList.workstartdate} | +身份证号 | +{resumeList.idCard} | +|||
| 家庭地址 | +{resumeList.address} | +联系电话 | +{resumeList.telephone} | +|||
| {resumeList.email} | +||||||
| {item.title} | +||||||
| {column.name} | + ) + }) + } +||||||
| {row.value} | + ) + }) + } +||||||
| 个人自述 | +{resumeList.selfStatement} | +|||||
+
{
data.buttons.slice(0,3).map((item,index) => {
return (
@@ -319,6 +336,15 @@ export default class ResourceCard extends React.Component {
暂无历史版本
}
+ onClose={this.onClose}
+ onAnimationEnd={() => console.log('onAnimationEnd')} />
)
}
diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js
index fffa35a..78be5e6 100644
--- a/pc4mobx/organization/components/resource/resource.js
+++ b/pc4mobx/organization/components/resource/resource.js
@@ -352,7 +352,7 @@ export default class Resource extends React.Component {
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
- resource.version(record);
+ resource.version(record.id);
},
onCancel() {
return false;
diff --git a/pc4mobx/organization/index.js b/pc4mobx/organization/index.js
index c09a712..de71a75 100644
--- a/pc4mobx/organization/index.js
+++ b/pc4mobx/organization/index.js
@@ -34,6 +34,7 @@ import ResourceBasicInfo from "./components/resource/ResourceBasicInfo";
import ResourceCard from "./components/resource/ResourceCard";
import ManagerDetach from "./components/detach/ManagerDetach";
import ColumnSetting from "./components/columnSetting";
+import PersonnelResume from "./components/resource/PersonnelResume"
import stores from "./stores";
import "./style/index";
@@ -100,6 +101,8 @@ const Routes = (