Merge pull request 'feature/cl' (#28) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/28
This commit is contained in:
commit
a3950f3343
|
|
@ -41,6 +41,7 @@ export const getAdvanceSearchCondition = (params) => {
|
|||
return WeaTools.callApi('/api/bs/hrmorganization/comp/getSearchCondition', 'GET', params);
|
||||
}
|
||||
|
||||
|
||||
export const add = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/comp/saveBaseComp', 'POST', params);
|
||||
}
|
||||
|
|
@ -49,6 +50,10 @@ export const version = (params) => {
|
|||
return WeaTools.callApi('/api/bs/hrmorganization/version/subcompanyfielddefined/save', 'POST', params);
|
||||
}
|
||||
|
||||
export const selectVersions = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/version/subcompanyfielddefined/getVersion', 'GET', params);
|
||||
}
|
||||
|
||||
export const editResource = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/comp/updateComp', 'POST', params);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,10 @@ export const version = (params) => {
|
|||
return WeaTools.callApi('/api/bs/hrmorganization/version/departmentfielddefined/save', 'POST', params);
|
||||
}
|
||||
|
||||
export const selectVersions = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/version/departmentfielddefined/getVersion', 'GET', params);
|
||||
}
|
||||
|
||||
export const getTransferForm = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/dept/getMoveForm', 'GET', params);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,10 @@ export const getCopyForm = (params) => {
|
|||
return WeaTools.callApi('/api/bs/hrmorganization/job/getCopyForm', 'GET', params);
|
||||
}
|
||||
|
||||
export const refresh = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/job/refresh', 'GET', params);
|
||||
}
|
||||
|
||||
export const add = (params) => {
|
||||
return fetch('/api/bs/hrmorganization/job/saveBaseForm', {
|
||||
method: 'POST',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
|
||||
import {
|
||||
WeaTools
|
||||
} from 'ecCom'
|
||||
|
||||
export const getHasRight = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/personnelresume/hasRight', 'GET', params);
|
||||
}
|
||||
|
|
@ -43,8 +43,6 @@ export const version = (params) => {
|
|||
return WeaTools.callApi('/api/bs/hrmorganization/version/resourcefielddefined/save', 'POST', params);
|
||||
}
|
||||
|
||||
|
||||
|
||||
export const exportResource = (ids) => {
|
||||
fetch('/api/bs/hrmorganization/common/resource/export?ids='+ids).then(res => res.blob().then(blob => {
|
||||
var filename=`人员档案.xlsx`
|
||||
|
|
|
|||
|
|
@ -6,3 +6,8 @@ import {
|
|||
export const getCardData = (id) => {
|
||||
return WeaTools.callApi(`/api/bs/hrmorganization/personnelcard/getPersonnelCard?id=${id}`, 'GET');
|
||||
}
|
||||
|
||||
|
||||
export const selectVersions = (params) => {
|
||||
return WeaTools.callApi('/api/bs/hrmorganization/version/resourcefielddefined/getVersion', 'GET', params);
|
||||
}
|
||||
|
|
@ -50,8 +50,8 @@ export default class NewAndEditDialog extends React.Component {
|
|||
{<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@7vxyfr@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} onChange={this.onChange} />}
|
||||
{field.domkey[0] == 'subcompanycode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'departmentcode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'job_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'work_code' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{/* {field.domkey[0] == 'job_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'work_code' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>} */}
|
||||
</WeaFormItem>)
|
||||
})
|
||||
})
|
||||
|
|
@ -103,10 +103,10 @@ export default class NewAndEditDialog extends React.Component {
|
|||
>
|
||||
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@5r6c5a@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} onChange={this.onChange}
|
||||
onBlur={this.onBlur} />
|
||||
{field.domkey[0] == 'subcompanycode' && field.viewAttr != 1 && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'subcompanycode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'departmentcode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'job_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'work_code' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{/* {field.domkey[0] == 'job_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'work_code' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>} */}
|
||||
|
||||
</WeaFormItem>
|
||||
),
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ export default class AttachToNumberField extends PureComponent {
|
|||
subcompanycode: "SUBCOMPANY",
|
||||
departmentcode: "DEPARTMENT",
|
||||
job_no: "JOBTITLES",
|
||||
work_code: "USER"
|
||||
// work_code: "USER"
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,14 @@ export default class VersionsSlider extends React.Component {
|
|||
|
||||
}
|
||||
|
||||
isEmptyObject(obj) {
|
||||
for (let key in obj) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
render() {
|
||||
const {
|
||||
versionList,
|
||||
|
|
@ -32,54 +40,54 @@ export default class VersionsSlider extends React.Component {
|
|||
|
||||
|
||||
return (
|
||||
<div style={{ "marginTop": "50px", "paddingLeft": "30px", "height": "30px", "lineHeight": "30px", "paddingRight": "30px" }}>
|
||||
<Row>
|
||||
<Col span={8}>
|
||||
<p>操作人: {versionList.operateName}</p>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<p>操作时间: {versionList.operateTime}</p>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<div>版本: <Select showSearch
|
||||
style={{ width: 100 }}
|
||||
placeholder="请选择版本"
|
||||
defaultValue="1.0"
|
||||
optionFilterProp="children"
|
||||
notFoundContent="无法找到"
|
||||
onChange={handleChange}
|
||||
>
|
||||
{
|
||||
versionList.versions.map((item) => {
|
||||
return (<Option value={item.value}>V{item.value}</Option>)
|
||||
})
|
||||
}
|
||||
|
||||
<div style={{ "marginTop": "50px", "paddingLeft": "30px", "height": "30px", "lineHeight": "30px", "paddingRight": "30px" }}>
|
||||
<Row>
|
||||
<Col span={8}>
|
||||
<p>操作人: {versionList.operateName}</p>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<p>操作时间: {versionList.operateTime}</p>
|
||||
</Col>
|
||||
<Col span={8}>
|
||||
<div>版本: <Select showSearch
|
||||
style={{ width: 100 }}
|
||||
placeholder="请选择版本"
|
||||
defaultValue="1.0"
|
||||
optionFilterProp="children"
|
||||
notFoundContent="无法找到"
|
||||
onChange={handleChange}
|
||||
>
|
||||
{
|
||||
versionList.versions.map((item) => {
|
||||
return (<Option value={item.value}>V{item.value}</Option>)
|
||||
})
|
||||
}
|
||||
|
||||
</Select></div>
|
||||
</Col>
|
||||
</Row>
|
||||
|
||||
<div style={{ "marginTop": "30px", "width": "100%" }}>
|
||||
{newData.map((item, index) => {
|
||||
return (
|
||||
<div key={index} style={{ "display": "flex" }}>
|
||||
{item.map((subItem) => {
|
||||
</Select></div>
|
||||
</Col>
|
||||
</Row>
|
||||
<div style={{ "marginTop": "30px", "width": "100%" }}>
|
||||
{newData.map((item, index) => {
|
||||
return (
|
||||
<div style={{ "width": "50%", "height": "40px", "overflow": "hidden", "testOverflow": "ellipsis", "whiteSpace": "nowrap" }}>
|
||||
<span style={{ "width": "80px", "display": "inline-block", "textAlign": "right", "color": "#999999" }}>{subItem.fieldId}</span>
|
||||
{subItem.fieldValue.length > 10 ? <Tooltip placement="topLeft" title={subItem.fieldValue}>
|
||||
<span style={{ "marginLeft": "20px" }}>{subItem.fieldValue}</span>
|
||||
</Tooltip> : <span style={{ "marginLeft": "20px" }}>{subItem.fieldValue}</span>}
|
||||
<div key={index} style={{ "display": "flex" }}>
|
||||
{item.map((subItem) => {
|
||||
return (
|
||||
<div style={{ "width": "50%", "height": "40px", "overflow": "hidden", "testOverflow": "ellipsis", "whiteSpace": "nowrap" }}>
|
||||
<span style={{ "width": "80px", "display": "inline-block", "textAlign": "right", "color": "#999999" }}>{subItem.fieldId}</span>
|
||||
{subItem.fieldValue.length > 10 ? <Tooltip placement="topLeft" title={subItem.fieldValue}>
|
||||
<span style={{ "marginLeft": "20px" }}>{subItem.fieldValue}</span>
|
||||
</Tooltip> : <span style={{ "marginLeft": "20px" }}>{subItem.fieldValue}</span>}
|
||||
|
||||
</div>
|
||||
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* @Author: 程亮
|
||||
* @Date: 2022-05-18 14:52:39
|
||||
* @LastEditTime: 2022-12-09 17:45:16
|
||||
* @LastEditTime: 2022-12-16 17:48:54
|
||||
* @Description:
|
||||
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
|
||||
*/
|
||||
|
|
@ -129,7 +129,7 @@ export default class CompanyExtend extends React.Component {
|
|||
labelCol={{ span: `${field.labelcol}` }}
|
||||
wrapperCol={{ span: `${field.fieldcol}` }}>
|
||||
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
|
||||
{field.domkey[0] == 'comp_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true} />}
|
||||
{field.domkey[0] == 'subcompanycode' && <AttachToNumberField field={field} form={form} isEdit={true} />}
|
||||
</WeaFormItem>),
|
||||
colSpan: 1
|
||||
});
|
||||
|
|
@ -235,7 +235,7 @@ export default class CompanyExtend extends React.Component {
|
|||
|
||||
view = () => {
|
||||
const { companyExtend } = this.props;
|
||||
companyExtend.open = true;
|
||||
companyExtend.selectVersions();
|
||||
}
|
||||
|
||||
onClose = () => {
|
||||
|
|
@ -305,7 +305,7 @@ export default class CompanyExtend extends React.Component {
|
|||
height={94}
|
||||
direction={'right'}
|
||||
measure={'%'}
|
||||
content={<VersionsSlider versionList={versionList} handleChange={val => companyExtend.changeVersion(val)}/>}
|
||||
content={!isEmpty(versionList) ? <VersionsSlider versionList={versionList} handleChange={val => companyExtend.changeVersion(val)}/> : <div style={{"textAlign":"center","color":"red","fontSize":"20px","marginTop": "50px"}}> 暂无历史版本 </div>}
|
||||
onClose={this.onClose}
|
||||
onAnimationEnd={() => console.log('onAnimationEnd')} />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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()}
|
||||
|
|
|
|||
|
|
@ -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()}
|
||||
|
|
|
|||
|
|
@ -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}` }}>
|
||||
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
|
||||
{field.domkey[0] == 'dept_no' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
{field.domkey[0] == 'departmentcode' && field.viewAttr != '1' && <AttachToNumberField field={field} form={form} isEdit={true}/>}
|
||||
</WeaFormItem>),
|
||||
colSpan: 1
|
||||
});
|
||||
|
|
@ -296,7 +301,7 @@ export default class DepartmentExtendStore extends React.Component {
|
|||
height={94}
|
||||
direction={'right'}
|
||||
measure={'%'}
|
||||
content={!isEmpty(versionList) ? <VersionsSlider versionList={versionList} handleChange={val => departmentExtend.changeVersion(val)}/> : ''}
|
||||
content={!isEmpty(versionList) ? <VersionsSlider versionList={versionList} handleChange={val => departmentExtend.changeVersion(val)}/> : <div style={{"textAlign":"center","color":"red","fontSize":"20px","marginTop": "50px"}}> 暂无历史版本 </div>}
|
||||
onClose={this.onClose}
|
||||
onAnimationEnd={() => console.log('onAnimationEnd')} />
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <Switch checked={record.forbiddenTag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
|
||||
}
|
||||
};
|
||||
if (c.dataIndex == 'jobName') {
|
||||
if (c.dataIndex == 'jobTitleName') {
|
||||
c.render = function (text, record) {
|
||||
return <a href='javascript:void(0);' onClick={() => {
|
||||
window.open(`/spa/organization/static/index.html#/main/organization/jobExtend/${record.id}`, "_blank")
|
||||
|
|
|
|||
|
|
@ -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 = (
|
||||
<WeaOrgTree ecId={`${this && this.props && this.props.ecId || ''}_WeaOrgTree@dhi1ro`}
|
||||
ref='WeaOrgTree'
|
||||
dataUrl={"/api/bs/hrmorganization/personnelresume/getSearchTree"}
|
||||
loading
|
||||
needSearch
|
||||
noCache={true}
|
||||
needDropMenu={false}
|
||||
isLoadSubDepartment={true}
|
||||
topPrefix={'hrmSearch'}
|
||||
companysId={companysId}
|
||||
inputLeftDom={`<b>${i18n.label.organization()}</b>`}
|
||||
treeNodeClick={this.treeNodeClick}
|
||||
expandAllChildrenOnSearch={true}
|
||||
renderNode={item => this.renderNode(item)}
|
||||
/>
|
||||
)
|
||||
return tree;
|
||||
}
|
||||
|
||||
renderNode(item) {
|
||||
return <div className='text-elli' title={item.name}>
|
||||
<i className={item.icon} style={{ marginRight: '5px' }}></i>
|
||||
{item.name}
|
||||
{item.canceled && <span style={{ color: 'red' }}>({i18n.label.forbidden()})</span>}
|
||||
</div>
|
||||
}
|
||||
|
||||
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(<Select showSearch
|
||||
style={{ width: 115 }}
|
||||
placeholder="请选择模板"
|
||||
defaultValue="人员简历模板"
|
||||
optionFilterProp="children"
|
||||
notFoundContent="无法找到"
|
||||
size="large"
|
||||
onChange={this.handleChange()}
|
||||
>
|
||||
<Option value="1">人员简历模板</Option>
|
||||
<Option value="2">人员晋升模板</Option>
|
||||
</Select>)
|
||||
|
||||
topMenu.map((item, i) => {
|
||||
btns.push(<Button type='primary' onClick={() => this.handleClick(item)}>{item.menuName}</Button>);
|
||||
});
|
||||
|
||||
|
||||
|
||||
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: <i className={`${item.menuIcon}`} />,
|
||||
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 && <div ref='page' style={{ height: '100%' }}>
|
||||
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
|
||||
datas={this.getDropMenuDatas()}
|
||||
onClick={key => this.handleMenuClick(key)}
|
||||
>
|
||||
<WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@bj98s7`}
|
||||
title={i18n.label.personnelResume()}
|
||||
icon={<i className='icon-coms-hrm' />}
|
||||
iconBgcolor='#217346'
|
||||
loading={true}
|
||||
buttons={this.getTopMenuBtns()}
|
||||
showDropIcon={true}
|
||||
dropMenuDatas={this.getDropMenuDatas()}
|
||||
onDropMenuClick={(e) => this.handleMenuClick(e)}
|
||||
>
|
||||
<WeaLeftRightLayout ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@7muhhb`} isNew={true} showLeft={defaultShowLeft} leftCom={this.getTree()}>
|
||||
<div id='personnel-resume'>
|
||||
<div className='content'>
|
||||
<p className='title'>人员简历信息</p>
|
||||
<table border="1" align="center" width="750" cellspacing='0' className='resume-table'>
|
||||
<tr align="center" height='50'>
|
||||
<td colspan="7">一、基本信息</td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
<td width="100" >姓名</td>
|
||||
<td width="100">{resumeList.lastName}</td>
|
||||
<td width="100">性别</td>
|
||||
<td width="100">{resumeList.sex}</td>
|
||||
<td width="100">出生年月</td>
|
||||
<td width="100">{resumeList.birthday}</td>
|
||||
<td rowspan="3"><img style={{ "width": "100px", "height": "120px" }} src={resumeList.image} /></td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
<td width="100" >籍贯</td>
|
||||
<td width="100">{resumeList.native}</td>
|
||||
<td width="100">政治面貌</td>
|
||||
<td width="100">{resumeList.politics}</td>
|
||||
<td width="100">部门</td>
|
||||
<td width="100">{resumeList.department}</td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
<td width="100">婚姻状况</td>
|
||||
<td width="100">{resumeList.marriage}</td>
|
||||
<td width="100">岗位</td>
|
||||
<td width="100">{resumeList.jobtitle}</td>
|
||||
<td width="100">入职时间</td>
|
||||
<td width="100">{resumeList.companystartdate}</td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
<td width="100">参加工作时间</td>
|
||||
<td width="100" colspan="2">{resumeList.workstartdate}</td>
|
||||
<td width="100" colspan="2">身份证号</td>
|
||||
<td width="100" colspan="2">{resumeList.idCard}</td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
<td width="100" rowspan="2">家庭地址</td>
|
||||
<td width="100" rowspan="2" colspan="2">{resumeList.address}</td>
|
||||
<td width="100" colspan="2">联系电话</td>
|
||||
<td width="100" colspan="2">{resumeList.telephone}</td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
<td width="100" colspan="2">E-mail</td>
|
||||
<td width="100" colspan="2">{resumeList.email}</td>
|
||||
</tr>
|
||||
|
||||
{
|
||||
resumeList.tables.map((item, index) => {
|
||||
return (
|
||||
<React.Fragment key={index}>
|
||||
<tr align="center" height='50'>
|
||||
<td colspan="7">{item.title}</td>
|
||||
</tr>
|
||||
<tr align="center" height='50'>
|
||||
{
|
||||
item.columns.map(column => {
|
||||
return (
|
||||
<td width="100" rowspan={column.rowspans} colspan={column.colspans}>{column.name}</td>
|
||||
)
|
||||
})
|
||||
}
|
||||
</tr>
|
||||
|
||||
{
|
||||
item.datas.map(data => {
|
||||
return (
|
||||
<tr align="center" height='50'>
|
||||
{
|
||||
data.map((row, index) => {
|
||||
return (
|
||||
<td width="100" rowspan={row.rowspans} colspan={row.colspans}>{row.value}</td>
|
||||
)
|
||||
})
|
||||
}
|
||||
</tr>
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
</React.Fragment>
|
||||
)
|
||||
})
|
||||
}
|
||||
<tr align="center" height='200'>
|
||||
<td width="100">个人自述</td>
|
||||
<td width="100" colspan="6">{resumeList.selfStatement}</td>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</WeaLeftRightLayout>
|
||||
</WeaTop>
|
||||
</WeaRightMenu>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
@ -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 = (
|
||||
<Menu onClick={this.handleMenuClick}>
|
||||
|
|
@ -238,6 +254,7 @@ export default class ResourceCard extends React.Component {
|
|||
</div>
|
||||
</div>
|
||||
<div className='right-button'>
|
||||
<Button className='item' onClick={this.view} >{i18n.button.version()}</Button>
|
||||
{
|
||||
data.buttons.slice(0,3).map((item,index) => {
|
||||
return (
|
||||
|
|
@ -319,6 +336,15 @@ export default class ResourceCard extends React.Component {
|
|||
</div>
|
||||
</div>
|
||||
<Spin size="large" tip="" className='scroll-spin' spinning={scrollLoading} />
|
||||
<WeaSlideModal visible={open}
|
||||
// top={6}
|
||||
width={40}
|
||||
height={100}
|
||||
direction={'right'}
|
||||
measure={'%'}
|
||||
content={!isEmpty(versionList) ? <VersionsSlider versionList={versionList} handleChange={val => resourceCard.changeVersion(val)}/> : <div style={{"textAlign":"center","color":"red","fontSize":"20px","marginTop": "50px"}}> 暂无历史版本 </div>}
|
||||
onClose={this.onClose}
|
||||
onAnimationEnd={() => console.log('onAnimationEnd')} />
|
||||
</WeaNewScrollPagination>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 = (
|
|||
<Route key="resourceCard" path="resourceCard/:id" component={ResourceCard} />
|
||||
<Route key="managerDetach" path="managerDetach" component={ManagerDetach} />
|
||||
<Route key="columnSetting" path="columnSetting" component={ColumnSetting} />
|
||||
<Route key="personnelResume" path="personnelResume/:id" component={PersonnelResume} />
|
||||
|
||||
</Route>
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -171,6 +171,7 @@ export const i18n = {
|
|||
columnPermission:() => getLabel(386247, '栏目权限管理'),
|
||||
columnCustom:() => getLabel(386247, '栏目功能定义'),
|
||||
cardColumnSet:() => getLabel(386247, '人员卡片栏目设置'),
|
||||
personnelResume:() => getLabel(386247, '人员简历'),
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -265,8 +265,8 @@ export class CompanyStore {
|
|||
})
|
||||
}
|
||||
|
||||
@action("另存为版本") version(record) {
|
||||
Api.version(record).then(res => {
|
||||
@action("另存为版本") version(id) {
|
||||
Api.version({id:id}).then(res => {
|
||||
if (res.code === 200) {
|
||||
message.success(res.msg);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -26,10 +26,11 @@ export class CompanyExtendStore {
|
|||
@observable tabkey = '0';
|
||||
|
||||
@observable open = false;
|
||||
|
||||
@observable version = '1.0';
|
||||
|
||||
@observable selectedRowKeys = [];
|
||||
@observable selectedRows = [];
|
||||
@observable versionList = {};
|
||||
|
||||
@action onRowSelect = (keys) => {
|
||||
this.setSelectedRowKeys(keys);
|
||||
|
|
@ -47,6 +48,23 @@ export class CompanyExtendStore {
|
|||
this.detailSelectedKey = '0'
|
||||
}
|
||||
|
||||
@action selectVersions = () => {
|
||||
let params = {
|
||||
id:this.id,
|
||||
version:this.version
|
||||
}
|
||||
Api.selectVersions(params).then((res) => {
|
||||
this.open = true;
|
||||
if (res.code === 200) {
|
||||
this.setVersionList(res.data);
|
||||
} else {
|
||||
message.warning(res.msg);
|
||||
}
|
||||
}, error => {
|
||||
message.warning(error.msg);
|
||||
})
|
||||
}
|
||||
|
||||
init = () => {
|
||||
this.detailSelectedKey = '0'
|
||||
this.isEditor = false;
|
||||
|
|
@ -177,7 +195,8 @@ export class CompanyExtendStore {
|
|||
}
|
||||
|
||||
changeVersion = data => {
|
||||
debugger
|
||||
this.version = data;
|
||||
this.selectVersions();
|
||||
}
|
||||
|
||||
setLoading(val) {
|
||||
|
|
@ -245,49 +264,53 @@ export class CompanyExtendStore {
|
|||
this.date = date;
|
||||
}
|
||||
|
||||
//历史版本
|
||||
@observable versionList = {
|
||||
operateName: '史永成',
|
||||
operateTime: '2022-12-31',
|
||||
versions: [
|
||||
{ value: "1.0" },
|
||||
{ value: "1.1" },
|
||||
{ value: "1.2" },
|
||||
{ value: "1.3" }
|
||||
],
|
||||
datas: [
|
||||
{
|
||||
fieldId: '简称',
|
||||
fieldValue: '泛微'
|
||||
}, {
|
||||
fieldId: '全称',
|
||||
fieldValue: '泛微'
|
||||
}, {
|
||||
fieldId: '上级分部',
|
||||
fieldValue: '泛微北京'
|
||||
}, {
|
||||
fieldId: '网站',
|
||||
fieldValue: '1546875925@qq.com'
|
||||
}, {
|
||||
fieldId: '分部ID',
|
||||
fieldValue: '8'
|
||||
}, {
|
||||
fieldId: '显示顺序',
|
||||
fieldValue: '9'
|
||||
}, {
|
||||
fieldId: '分部编号',
|
||||
fieldValue: '分部1-1'
|
||||
}, {
|
||||
fieldId: '限制用户数',
|
||||
fieldValue: '产品运营'
|
||||
}, {
|
||||
fieldId: '在职离职人数',
|
||||
fieldValue: '产品运营'
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
|
||||
setVersionList(obj) {
|
||||
this.versionList = obj;
|
||||
}
|
||||
|
||||
//历史版本
|
||||
// @observable versionList = {
|
||||
// operateName: '史永成',
|
||||
// operateTime: '2022-12-31',
|
||||
// versions: [
|
||||
// { value: "1.0" },
|
||||
// { value: "1.1" },
|
||||
// { value: "1.2" },
|
||||
// { value: "1.3" }
|
||||
// ],
|
||||
// datas: [
|
||||
// {
|
||||
// fieldId: '简称',
|
||||
// fieldValue: '泛微'
|
||||
// }, {
|
||||
// fieldId: '全称',
|
||||
// fieldValue: '泛微'
|
||||
// }, {
|
||||
// fieldId: '上级分部',
|
||||
// fieldValue: '泛微北京'
|
||||
// }, {
|
||||
// fieldId: '网站',
|
||||
// fieldValue: '1546875925@qq.com'
|
||||
// }, {
|
||||
// fieldId: '分部ID',
|
||||
// fieldValue: '8'
|
||||
// }, {
|
||||
// fieldId: '显示顺序',
|
||||
// fieldValue: '9'
|
||||
// }, {
|
||||
// fieldId: '分部编号',
|
||||
// fieldValue: '分部1-1'
|
||||
// }, {
|
||||
// fieldId: '限制用户数',
|
||||
// fieldValue: '产品运营'
|
||||
// }, {
|
||||
// fieldId: '在职离职人数',
|
||||
// fieldValue: '产品运营'
|
||||
// }
|
||||
// ]
|
||||
|
||||
|
||||
|
||||
// }
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -374,8 +374,8 @@ export class DepartmentStore {
|
|||
})
|
||||
}
|
||||
|
||||
@action("另存为版本") version(record) {
|
||||
Api.version(record).then(res => {
|
||||
@action("另存为版本") version(id) {
|
||||
Api.version({id:id}).then(res => {
|
||||
if (res.code === 200) {
|
||||
message.success(res.msg);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ export class DepartmentExtendStore {
|
|||
@observable selectedRows = [];
|
||||
|
||||
@observable open = false;
|
||||
@observable version = '1.0';
|
||||
@observable versionList = {};
|
||||
|
||||
@action onRowSelect = (keys) => {
|
||||
this.setSelectedRowKeys(keys);
|
||||
|
|
@ -39,8 +41,7 @@ export class DepartmentExtendStore {
|
|||
}
|
||||
|
||||
|
||||
@action
|
||||
edit = () => {
|
||||
@action edit = () => {
|
||||
this.isEditor = true;
|
||||
this.getData();
|
||||
this.getTabInfo();
|
||||
|
|
@ -77,6 +78,23 @@ export class DepartmentExtendStore {
|
|||
})
|
||||
}
|
||||
|
||||
@action("历史版本") selectVersions = () => {
|
||||
let params = {
|
||||
id:this.id,
|
||||
version:this.version
|
||||
}
|
||||
Api.selectVersions(params).then((res) => {
|
||||
this.open = true;
|
||||
if (res.code === 200) {
|
||||
this.setVersionList(res.data);
|
||||
} else {
|
||||
message.warning(res.msg);
|
||||
}
|
||||
}, error => {
|
||||
message.warning(error.msg);
|
||||
})
|
||||
}
|
||||
|
||||
editResource = () => {
|
||||
let pDatas = this.form.getFormParams();
|
||||
Api.editResource({ ...{
|
||||
|
|
@ -171,7 +189,8 @@ export class DepartmentExtendStore {
|
|||
}
|
||||
|
||||
changeVersion = data => {
|
||||
debugger
|
||||
this.version = data;
|
||||
this.selectVersions();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -240,50 +259,8 @@ export class DepartmentExtendStore {
|
|||
this.date = date;
|
||||
}
|
||||
|
||||
//历史版本
|
||||
@observable versionList = {
|
||||
operateName: '史永成',
|
||||
operateTime: '2022-12-31',
|
||||
versions: [
|
||||
{ value: "1.0" },
|
||||
{ value: "1.1" },
|
||||
{ value: "1.2" },
|
||||
{ value: "1.3" }
|
||||
],
|
||||
datas: [
|
||||
{
|
||||
fieldId: '简称',
|
||||
fieldValue: '泛微'
|
||||
}, {
|
||||
fieldId: '全称',
|
||||
fieldValue: '泛微'
|
||||
}, {
|
||||
fieldId: '上级分部',
|
||||
fieldValue: '泛微北京'
|
||||
}, {
|
||||
fieldId: '网站',
|
||||
fieldValue: '1546875925@qq.com'
|
||||
}, {
|
||||
fieldId: '分部ID',
|
||||
fieldValue: '8'
|
||||
}, {
|
||||
fieldId: '显示顺序',
|
||||
fieldValue: '9'
|
||||
}, {
|
||||
fieldId: '分部编号',
|
||||
fieldValue: '分部1-1'
|
||||
}, {
|
||||
fieldId: '限制用户数',
|
||||
fieldValue: '产品运营'
|
||||
}, {
|
||||
fieldId: '在职离职人数',
|
||||
fieldValue: '产品运营'
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
|
||||
setVersionList(obj) {
|
||||
this.versionList = obj;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ import {ImportDialogStore} from "./importDialog";
|
|||
import {ResourceCardStore} from "./resourceCard";
|
||||
import {ManagerDetachStore} from "./managerDetach";
|
||||
import {ColumnSetting} from './columnSetting';
|
||||
import {PersonnelResumeStore} from './personnelResume'
|
||||
|
||||
|
||||
module.exports = {
|
||||
|
|
@ -61,4 +62,5 @@ module.exports = {
|
|||
resourceCard:new ResourceCardStore(),
|
||||
managerDetach: new ManagerDetachStore(),
|
||||
columnSetting: new ColumnSetting(),
|
||||
personnelResume:new PersonnelResumeStore()
|
||||
};
|
||||
|
|
|
|||
|
|
@ -155,6 +155,19 @@ export class JobStore {
|
|||
})
|
||||
}
|
||||
|
||||
@action("刷新") refresh() {
|
||||
Api.refresh().then(res => {
|
||||
if (res.code === 200) {
|
||||
this.getTableInfo();
|
||||
message.success(res.msg);
|
||||
} else {
|
||||
message.warning(res.msg);
|
||||
}
|
||||
}, error => {
|
||||
message.warning(error.msg);
|
||||
})
|
||||
}
|
||||
|
||||
updateForbiddenTag(checked, id) {
|
||||
let params = {
|
||||
forbiddenTag: checked,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,265 @@
|
|||
import {
|
||||
observable,
|
||||
action
|
||||
} from 'mobx';
|
||||
import * as mobx from 'mobx';
|
||||
import * as Api from '../apis/personnelResume';
|
||||
import {
|
||||
WeaForm
|
||||
} from 'comsMobx';
|
||||
import {
|
||||
WeaTableNew
|
||||
} from 'comsMobx';
|
||||
import {
|
||||
Modal,
|
||||
message,
|
||||
} from 'antd'
|
||||
import {
|
||||
i18n
|
||||
} from '../public/i18n';
|
||||
|
||||
const toJS = mobx.toJS;
|
||||
const {
|
||||
TableStore
|
||||
} = WeaTableNew;
|
||||
|
||||
|
||||
export class PersonnelResumeStore {
|
||||
|
||||
@observable topMenu = []
|
||||
@observable rightMenu = [];
|
||||
@observable condition = [];
|
||||
@observable form = new WeaForm();
|
||||
@observable loading = true;
|
||||
@observable resourceId = '';
|
||||
@observable resumeList = {
|
||||
lastName: '徐凤年',
|
||||
sex: '男',
|
||||
birthday: '1999-10-10',
|
||||
image: '/weaver/weaver.file.FileDownload?fileid=1538',
|
||||
native: '上海',
|
||||
politics: '党员',
|
||||
department: '财务部',
|
||||
marriage: '已婚',
|
||||
jobtitle: '剑道第一人',
|
||||
companystartdate: '2020-12-31',
|
||||
workstartdate: '2011-10-10',
|
||||
idCard: '3409871298377483992',
|
||||
address: '江苏省南京市雨花台区润和创智中心',
|
||||
telephone: '19823045643',
|
||||
email: '16378324@163.com',
|
||||
selfStatement:'本人性格开朗,秦武大帝转世,世间武道的第一人',
|
||||
tables: [
|
||||
{
|
||||
title: '二、社会保险及住房公积金缴纳情况（单位/元）',
|
||||
columns: [
|
||||
{
|
||||
name: '首次参保时间',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '养老保险',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '医疗保险',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '失业保险',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '住房公积金',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '企业年金',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
],
|
||||
datas: [
|
||||
[{
|
||||
value: '2022-10-02',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '80',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
value: '36',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '360',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '180',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '20000',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}]
|
||||
]
|
||||
},
|
||||
{
|
||||
title: '三、家庭成员信息（包括父母、配偶、子女）',
|
||||
columns: [
|
||||
{
|
||||
name: '关系',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '姓名',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '工作单位及职务',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '联系电话',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
name: '住址',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}
|
||||
],
|
||||
datas: [
|
||||
[
|
||||
{
|
||||
value: '父子',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '徐晓',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
value: '北凉王',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '1589756859',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '江苏省南京市北凉军营',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
value: '母子',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '吴素',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
value: '北凉王妃',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '15897566487',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '江苏省南京市北凉龙雀军团',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
value: '女儿',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '徐念凉',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
},
|
||||
{
|
||||
value: '北凉公主',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '15897566587',
|
||||
colspans: 1,
|
||||
rowspans: 1
|
||||
}, {
|
||||
value: '莽荒之地',
|
||||
colspans: 2,
|
||||
rowspans: 1
|
||||
}
|
||||
]
|
||||
]
|
||||
|
||||
}
|
||||
]
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@observable defaultShowLeft = true;
|
||||
@observable companysId = 1
|
||||
@observable hasRight = '';
|
||||
|
||||
|
||||
|
||||
@action("获取操作按钮") getHasRight() {
|
||||
Api.getHasRight().then(res => {
|
||||
if (res.code === 200) {
|
||||
this.setHasRight(res.data.hasRight);
|
||||
res.data.rightMenu && this.setRightMenu(res.data.rightMenu);
|
||||
res.data.topMenu && this.setTopMenu(res.data.topMenu);
|
||||
res.data.hasRight && this.getPersonnelResume();
|
||||
} else {
|
||||
message.warning(res.msg);
|
||||
}
|
||||
}, error => {
|
||||
message.warning(error.msg);
|
||||
})
|
||||
}
|
||||
|
||||
@action("获取人员简历") getPersonnelResume() {
|
||||
|
||||
|
||||
}
|
||||
|
||||
setTopMenu(topMenu) {
|
||||
this.topMenu = topMenu;
|
||||
}
|
||||
|
||||
setRightMenu(rightMenu) {
|
||||
this.rightMenu = rightMenu;
|
||||
}
|
||||
|
||||
setHasRight(bool) {
|
||||
this.hasRight = bool;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -167,8 +167,8 @@ const {
|
|||
this.tableStore.selectedRowKeys = [];
|
||||
}
|
||||
|
||||
@action("另存为版本") version(record) {
|
||||
Api.version(record).then(res => {
|
||||
@action("另存为版本") version(id) {
|
||||
Api.version({id:id}).then(res => {
|
||||
if (res.code === 200) {
|
||||
message.success(res.msg);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@ export class ResourceCardStore {
|
|||
@observable detectElements = [] // 受监控元素,可能存在空项
|
||||
@observable flag = true; // 点击Anchor菜单项,不执行监听滚动事件
|
||||
|
||||
@observable open = false;
|
||||
@observable version = '1.0';
|
||||
@observable versionList = {};
|
||||
|
||||
@action("初始化") init = () => {
|
||||
//const { userid } = JSON.parse(localStorage.getItem("theme-account"));
|
||||
this.getCardData();
|
||||
|
|
@ -36,6 +40,23 @@ export class ResourceCardStore {
|
|||
})
|
||||
}
|
||||
|
||||
@action("历史版本") selectVersions = () => {
|
||||
let params = {
|
||||
id:this.userid,
|
||||
version:this.version
|
||||
}
|
||||
Api.selectVersions(params).then((res) => {
|
||||
this.open = true;
|
||||
if (res.code === 200) {
|
||||
this.setVersionList(res.data);
|
||||
} else {
|
||||
message.warning(res.msg);
|
||||
}
|
||||
}, error => {
|
||||
message.warning(error.msg);
|
||||
})
|
||||
}
|
||||
|
||||
buildDetectElements = (data) => {
|
||||
!this.isEmptyObject(data) && data.anchorList.map((item, index) => {
|
||||
item.activity = index;
|
||||
|
|
@ -51,6 +72,11 @@ export class ResourceCardStore {
|
|||
return true;
|
||||
}
|
||||
|
||||
changeVersion = data => {
|
||||
this.version = data;
|
||||
this.selectVersions();
|
||||
}
|
||||
|
||||
|
||||
setData(value){
|
||||
this.data = value;
|
||||
|
|
@ -60,6 +86,10 @@ export class ResourceCardStore {
|
|||
setDetectElements(value) {
|
||||
this.detectElements = value;
|
||||
}
|
||||
|
||||
setVersionList(obj) {
|
||||
this.versionList = obj;
|
||||
}
|
||||
/************** json数据*****************/
|
||||
// @observable data = {
|
||||
// buttons:[
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
// 人员简历
|
||||
.code-box-demo .ant-select {
|
||||
margin: 0 8px 10px 0;
|
||||
}
|
||||
|
||||
#components-select-demo-search-box .code-box-demo .ant-select {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#personnel-resume {
|
||||
background-color: #dadce0;
|
||||
padding: 0 60px;
|
||||
.content{
|
||||
height: 100%;
|
||||
background-color: #FFFFFF;
|
||||
box-shadow: 2px 2px 10px #909090;
|
||||
padding: 20px 40px;
|
||||
.title{
|
||||
font-size: 18px;
|
||||
font-weight: 900;
|
||||
text-align: center;
|
||||
}
|
||||
.resume-table {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue