solve conflict

This commit is contained in:
Chengliang 2022-06-02 17:06:47 +08:00
commit aefcb9772b
14 changed files with 1842 additions and 343 deletions

View File

@ -0,0 +1,89 @@
import {
WeaTools
} from 'ecCom'
export const getSearchList = (params) => {
return fetch('/api/bs/hrmorganization/dept/listPage', {
method: 'POST',
mode: 'cors',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(params)
})
}
export const deleteTableData = (params) => {
return fetch('/api/bs/hrmorganization/dept/deleteByIds', {
method: 'POST',
mode: 'cors',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(params)
})
}
export const getAdvanceSearchCondition = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/dept/getSearchCondition', 'GET', params);
}
export const getHrmListByJobId = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/job/getHrmListByJobId', 'GET', params);
}
export const getCopyForm = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/job/getCopyForm', 'GET', params);
}
export const add = (params) => {
return fetch('/api/bs/hrmorganization/dept/saveBaseForm', {
method: 'POST',
mode: 'cors',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(params)
})
}
export const copy = (params) => {
return fetch('/api/bs/hrmorganization/job/copyJobItem', {
method: 'POST',
mode: 'cors',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(params)
})
}
export const editResource = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/dept/updateForm', 'POST', params);
}
export const updateForbiddenTag = (params) => {
return fetch('/api/bs/hrmorganization/dept/updateForbiddenTagById', {
method: 'POST',
mode: 'cors',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(params)
})
}
export const getDeptForm = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/dept/getSaveForm', 'GET', params);
}
export const getDeptExtendForm = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/dept/getDeptBaseForm', 'GET', params);
}
export const getHasRight = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/dept/getHasRight', 'GET', params);
}

View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 16:23:32
* @LastEditTime: 2022-06-01 11:51:20
* @LastEditTime: 2022-06-01 17:15:50
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
*/
@ -252,16 +252,6 @@ export default class Company extends React.Component {
// )
// }
// });
const menu = (
<Menu>
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.doDel(record.id) }}>删除</a>
</Menu.Item>
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.select(record.id) }}>联查部门</a>
</Menu.Item>
</Menu>
)
columns.forEach((c, index) => {
if (c.dataIndex == 'forbiddenTag') {
c.render = function (text, record) {
@ -281,9 +271,11 @@ export default class Company extends React.Component {
c.render = function (text, record) {
const menu = (
<Menu>
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.doDel(record.id) }}>删除</a>
</Menu.Item>
{
record.isUsed === 0 ? <Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.doDel(record.id) }}>删除</a>
</Menu.Item> : ''
}
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.select(record.id) }}>联查部门</a>
</Menu.Item>
@ -413,6 +405,9 @@ export default class Company extends React.Component {
onChange(selectedRowKeys, selectedRows) {
company.setSelectedRowKeys(selectedRowKeys);
},
getCheckboxProps: record => ({
disabled: record.isUsed === 1, // 配置无法勾选的列
}),
};
const pagination = {
@ -481,14 +476,6 @@ export default class Company extends React.Component {
}}
indentSize={15}
/>
// <NewWeaTable ecId={`${this && this.props && this.props.ecId || ''}_NewWeaTable@q4rrwm`}
// dataSource={dataSource}
// columns={this.reRenderColumns(columns)}
// rowSelection={rowSelection}
// pagination={pagination}
// loading={loading}
// indentSize={15}
// />
}
</WeaTop>

View File

@ -0,0 +1,92 @@
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 NewPopconfirm 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(<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@jacv6v@${index}`}
label={`${field.label}`}
labelCol={{ span: `${field.labelcol}` }}
error={form.getError(field)}
tipPosition="bottom"
wrapperCol={{ span: `${field.fieldcol}` }}>
{<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@7vxyfr@${index}`} fieldConfig={field} form={form} formParams={form.getFormParams()} />}
</WeaFormItem>)
})
})
return <div className="wea-form-item-group">{arr}</div>
}
render() {
const {
title,
visible,
save,
onCancel,
loading,
height,
} = this.props, {
width,
} = this.state;
const buttons = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => save()} disabled={loading}>{i18n.button.ok()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => onCancel()} disabled={loading}>{i18n.button.cancel()}</Button>)
];
return (
<WeaDialog ecId={`${this && this.props && this.props.ecId || ''}_WeaDialog@1txk5f`}
title={title}
icon="icon-coms-hrm"
iconBgcolor="#217346"
visible={visible}
closable={true}
hasScroll={true}
onCancel={() => onCancel()}
buttons={buttons}
style={{ width: width, height: height }}
>
{
loading ? <div className='hrm-loading-center-small'>
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={loading}></Spin>
</div>
: this.getForm()
}
</WeaDialog>
)
}
}

View File

@ -0,0 +1,635 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-06-02 16:41:55
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/
import React from 'react'
import * as mobx from 'mobx'
import {
inject,
observer,
} from 'mobx-react'
import {
WeaTop,
WeaTab,
WeaFormItem,
WeaRightMenu,
WeaTable,
WeaLeftRightLayout,
WeaOrgTree
} from 'ecCom'
import {
Row,
Col,
Spin,
Modal,
Button,
message,
Switch,
Menu, Dropdown, Icon
} from 'antd'
import {
WeaSwitch,
WeaTableNew
} from 'comsMobx'
import {
i18n
} from '../../public/i18n';
import '../../style/common.less';
import NewAndEditDialog from '../NewAndEditDialog';
import NewWeaTableDialog from '../NewWeaTableDialog';
import NewPopconfirm from './NewPopconfirm'
const toJS = mobx.toJS;
const confirm = Modal.confirm;
@inject('department')
@observer
export default class Department extends React.Component {
constructor(props) {
super(props);
}
componentWillMount() {
}
componentDidMount() {
this.init();
}
componentWillReceiveProps(nextProps) {
const {
department
} = this.props;
if (this.props.location.key !== nextProps.location.key) {
this.init();
}
}
init() {
const {
department
} = this.props;
department.getTableInfo();
department.getHasRight();
department.getCopyForm();
}
getTopMenuBtns() {
const {
department
} = this.props;
const {
topMenu,
selectedRowKeys
} = department;
let btns = [];
topMenu.map((item, i) => {
if (item.menuFun === 'batchDelete') {
btns.push(<Button type='primary' onClick={() => this.handleClick(item)} disabled={selectedRowKeys.length > 0 ? false : true} >{item.menuName}</Button>);
} else if (item.menuFun === 'copy') {
btns.push(<Button type='primary' onClick={() => this.handleClick(item)} disabled={selectedRowKeys.length > 0 ? false : true} >{item.menuName}</Button>);
} else {
btns.push(<Button type='primary' onClick={() => this.handleClick(item)}>{item.menuName}</Button>);
}
});
return btns;
}
handleClick(item) {
const {
department
} = this.props;
const {
isPanelShow
} = department;
isPanelShow && department.setPanelStatus(false);
this[item.menuFun] && this[item.menuFun]();
}
new() {
const {
department
} = this.props;
department.setNeDialogTitle(i18n.label.deptManage());
department.setNewVisible(true);
department.getDeptForm();
}
//联查岗位
select(id) {
// const {
// department
// } = this.props;
// department.setNeDialogTitle("联查人员");
// department.setVisible(true);
// department.getHrmTable(id);
}
//合并
merge(id){
const {
department
} = this.props;
department.setNeDialogTitle(i18n.label.mergeDept());
department.confirmVisible(true);
department.getMergeForm();
}
//转移
transfer(id) {
const {
department
} = this.props;
department.setNeDialogTitle(i18n.label.mergeDept());
department.confirmVisible(true);
department.getTransferForm();
}
copy() {
const {
department
} = this.props;
const {
selectedRowKeys
} = department;
let keys = toJS(selectedRowKeys).toString();
department.setIds(keys);
confirm({
title: i18n.confirm.defaultTitle(),
content: this.getCopyForm(),
okText: i18n.button.ok(),
cancelText: i18n.button.cancel(),
onOk() {
department.copy()
},
onCancel() {
return false;
},
});
}
getCopyForm() {
const {
department
} = this.props;
const {
copyCondition,
form2,
} = department;
let formParams = form2.getFormParams();
const {
isFormInit
} = form2;
let arr = [];
isFormInit && copyCondition.map(c => {
c.items.map((field, index) => {
arr.push(
<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@u6ex85@${index}`}
label={`${field.label}`}
labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}>
{<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@p7d3td@${index}`} fieldConfig={field} form={form2} formParams={formParams} />}
</WeaFormItem>
)
})
})
return arr;
}
batchDelete() {
const {
department
} = this.props;
const {
selectedRowKeys
} = department;
let keys = toJS(selectedRowKeys).toString();
department.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 {
department
} = this.props;
department.delete();
}
getDropMenuDatas() {
const {
department
} = this.props;
const {
rightMenu
} = department;
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) {
const {
department
} = this.props;
const {
isPanelShow
} = department;
isPanelShow && department.setPanelStatus(false);
this[key] && this[key]();
}
updateForbiddenTag(checked, id) {
const {
department
} = this.props;
department.updateForbiddenTag(checked, id);
}
onSearchChange(val) {
const {
department
} = this.props;
const {
form
} = department;
department.setDepartmentName(val);
!this.isEmptyObject(form.getFormParams()) && department.updateFields(val);
}
reRenderColumns(columns) {
const {
department
} = this.props;
let _this = this;
columns.forEach((c, index) => {
if (c.dataIndex == 'forbiddenTag') {
c.render = function (text, record) {
return <Switch defaultChecked={record.forbiddenTag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
}
};
if (c.dataIndex == 'deptName') {
c.render = function (text, record) {
return <a href='javascript:void(0);' onClick={() => {
window.open(`/spa/organization/static/index.html#/main/organization/departmentExtend/${record.id}`, "_blank")
}}>{text}</a>
}
}
if (c.dataIndex == 'operate') {
c.className = "wea-table-operates"
c.width = 80
c.render = function (text, record) {
const menu = (
<Menu>
{
record.isUsed === 0 ? <Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.doDel(record.id) }}>删除</a>
</Menu.Item> : ''
}
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.merge(record.id) }}>合并</a>
</Menu.Item>
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.transfer(record.id) }}>转移</a>
</Menu.Item>
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.select(record.id) }}>联查岗位</a>
</Menu.Item>
</Menu>
)
return <Dropdown overlay={menu}>
<i class="icon-coms-more" />
</Dropdown>
}
}
})
return columns;
}
doDel(id) {
const {
department
} = this.props;
department.setIds(id);
this.showConfirm('del');
}
handleSave() {
const {
department
} = this.props;
department.save();
}
getTabBtn() {
const {
department
} = this.props;
const {
form
} = department;
const btn = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => { department.setCurrent(1); department.setPageSize(10); department.getTableInfo(); department.setPanelStatus(false) }}>{i18n.button.search()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju6`} onClick={() => form.reset()}>{i18n.button.reset()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@5u9mfz`} onClick={() => department.setPanelStatus(false)}>{i18n.button.cancel()}</Button>),
];
return btn;
}
getPanelComponents() {
const {
department
} = this.props;
const {
searchCondition,
form,
searchConditionLoading
} = department;
let arr = [];
let formParams = form.getFormParams();
const {
isFormInit
} = form;
isFormInit && searchCondition.map(c => {
c.items.map((field, index) => {
arr.push(<Col ecId={`${this && this.props && this.props.ecId || ''}_Col@4cc308@${index}`} span={(index % 2 == 0) ? 10 : 11} offset={1}>
<div style={{ marginTop: 20 }}>
<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@u6ex85@${index}`}
label={`${field.label}`}
labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}>
{<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@p7d3td@${index}`} fieldConfig={field} form={form} formParams={formParams} />}
</WeaFormItem>
</div>
</Col>)
})
})
if (searchConditionLoading) {
return (
<div className='hrm-loading-center-small' style={{ top: '25%' }}>
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@lbktzb`} spinning={searchConditionLoading}></Spin>
</div>
)
} else {
return <Row ecId={`${this && this.props && this.props.ecId || ''}_Row@ppeb6z`} onKeyDown={(e) => {
if (e.keyCode == 13 && e.target.tagName === "INPUT") {
department.getTableInfo();
department.setPanelStatus(false)
}
}}>{arr}</Row>
}
}
//非空判断
isEmptyObject(obj) {
for (let key in obj) {
return false;
}
return true;
}
//左侧树
getTree = () => {
const {
department
} = this.props;
const {
companysId,
} = department
let tree = (
<WeaOrgTree ecId={`${this && this.props && this.props.ecId || ''}_WeaOrgTree@dhi1ro`}
ref='WeaOrgTree'
dataUrl={"/api/bs/hrmorganization/dept/getSearchTree"}
loading
needSearch
noCache={true}
needDropMenu={false}
//onSelect={this.selectVirtual} //组织维度回调函数
isLoadSubDepartment={true}
topPrefix={'hrmSearch'}
companysId={companysId}
inputLeftDom={`<b>${i18n.label.organization()}</b>`}
treeNodeClick={this.treeNodeClick}
expandAllChildrenOnSearch={true}
/>
)
return tree;
}
treeNodeClick = (event, ids, nodeids, nodes) => {
const {
department
} = this.props;
const {
form,
companysId
} = department;
const type = event.node.props.type || '0';
const id = event.node.props.id || '';
let params = {};
form.resetConditionValue();
department.setPanelStatus(false)
// department.tabkey = 'default_3';
department.nodeType = type;
if (type == '0') {
params['virtualtype'] = companysId;
}
if (type == '1') {
params['subcompanyid1'] = id;
}
if (type == '2') {
params['departmentid'] = id;
}
department.doSearch(params);
}
render() {
const {
department
} = this.props;
const {
isPanelShow, departmentName, conditionNum, visible, condition, form,
tableStore, dataSource, columns, loading, date, nEdialogTitle, dialogLoading,
form1, isEdit, newVisible, jobDataSource, jobColumns, selectedRowKeys, total, current, pageSize, init,
defaultShowLeft,confirmVisible,confirmLoading
} = department;
const rowSelection = {
onChange(selectedRowKeys, selectedRows) {
department.setSelectedRowKeys(selectedRowKeys);
},
getCheckboxProps: record => ({
disabled: record.isUsed === 1, // 配置无法勾选的列
}),
};
const pagination = {
current: current,
pageSize: pageSize,
total: total,
showSizeChanger: true,
showQuickJumper: true,
onShowSizeChange(current, pageSize) {
},
onChange(current) {
},
showTotal(total) {
return `${total}`
}
};
return (
<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.deptManage()}
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()}>
<WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
searchType={['base', 'advanced']}
showSearchAd={isPanelShow}
searchsBaseValue={this.isEmptyObject(form.getFormParams()) ? departmentName : form.getFormParams().departmentName}
setShowSearchAd={bool => department.setPanelStatus(bool)}
hideSearchAd={() => department.setPanelStatus(false)}
searchsAd={isPanelShow ? this.getPanelComponents() : <div></div>}
advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
hasMask={false}
buttonsAd={this.getTabBtn()}
onSearch={() => {
department.setCurrent(1);
department.setPageSize(10);
department.getTableInfo()
}}
onSearchChange={val => this.onSearchChange(val)}
/>
{
init ? <div className='hrm-new-weatable-spin'>
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={init}></Spin>
</div> :
<WeaTable rowKey={record => record.id} ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
loading={loading}
dataSource={dataSource} childrenColumnName="children"
columns={this.reRenderColumns(columns)}
rowSelection={rowSelection}
pagination={pagination}
onChange={(pagination, filters, sorter) => {
department.setCurrent(pagination.current);
department.setPageSize(pagination.pageSize);
department.getTableInfo();
}}
indentSize={15}
/>
}
</WeaLeftRightLayout>
</WeaTop>
</WeaRightMenu>
<NewWeaTableDialog ecId={`${this && this.props && this.props.ecId || ''}_NewTableDialog@q4rrwm`}
title={nEdialogTitle}
visible={visible}
height={400}
tableStore={tableStore}
onCancel={() => department.setVisible(false)}
/>
<NewAndEditDialog ecId={`${this && this.props && this.props.ecId || ''}_NewAndEditDialog@q4rrwm`}
title={nEdialogTitle}
visible={newVisible}
condition={toJS(condition)}
form={form1}
isFormInit={form1.isFormInit}
loading={dialogLoading}
isEdit={isEdit}
height={300}
conditionLen={13}
save={() => this.handleSave()}
onCancel={() => department.setNewVisible(false)}
enable={false} //是否开启字段联动
/>
<NewPopconfirm ecId={`${this && this.props && this.props.ecId || ''}_NewPopconfirm@q4rrwm`}
title={nEdialogTitle}
visible={confirmVisible}
condition={toJS(condition)}
form={form1}
isFormInit={form1.isFormInit}
loading={confirmLoading}
height={300}
save={() => this.handleSave()}
onCancel={() => department.setNewVisible(false)}
/>
</div>
)
}
}

View File

@ -0,0 +1,282 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:20:03
* @LastEditTime: 2022-06-02 11:40:57
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
*/
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 } from 'comsMobx';
import { inject, observer } from 'mobx-react';
import * as mobx from 'mobx';
import { i18n } from '../../public/i18n';
const toJS = mobx.toJS;
import '../../style/common.less';
@inject('departmentExtend')
@inject('department')
@observer
export default class DepartmentExtendStore extends React.Component {
componentDidMount() {
this.init();
}
init = () => {
const { departmentExtend,department } = this.props;
let {hash} = window.location;
hash = hash.split("?")[0];
let id = hash.match("[^/]+(?=/$|$)")[0];
departmentExtend.init();
departmentExtend.setId(id);
departmentExtend.getData();
}
getTabChildren = () => {
const { departmentExtend } = this.props;
let { tableInfo, isEditor, tabkey, onRowSelect, selectedRowKeys,detailSelectedKey } = departmentExtend;
let tabChildren = [];
tableInfo = toJS(tableInfo);
tableInfo && tableInfo.map((t, i) => {
if (detailSelectedKey == i) {
tabChildren.push(
<WeaTableEdit ecId={`${this && this.props && this.props.ecId || ''}_WeaTableEdit@b813my@${i}`}
ref={(ref)=>departmentExtend.setPersonalEditTables(ref)}
showTitle={isEditor}
// title={'列表信息'}
//addFirstRow={isEditor}
columns={t.tabinfo.columns}
datas={t.tabinfo.datas}
onChange={this.tableEditChange}
selectedRowKeys={toJS(selectedRowKeys)}
onRowSelect={keys => onRowSelect(keys)}
onBtnsSelect={key => this.onBtnsSelect(key, i)}
viewAttr={isEditor ? 2 : 1}
getRowSelection={isEditor ? (rowSelection) => {
Object.assign(rowSelection, {
getCheckboxProps: record => ({
disabled: record.viewAttr === 1, // 配置无法勾选的列
})
})
return rowSelection;
} : () => null}
/>
);
}
})
return tabChildren;
}
onBtnsSelect = (key, index) => {
const {
departmentExtend
} = this.props, {
tableInfo,
selectedRows,
setSelectedRowKeys,
selectedRowKeys
} = departmentExtend;
const datas = tableInfo[index].tabinfo.datas;
if (key === 'copy') {
tableInfo[index].tabinfo.datas = datas.map((data, i) => {
if (!selectedRows[index].includes(i)) {
data.viewAttr = 2;
}
return data
})
}
if (key === 'delete') {
tableInfo[index].tabinfo.datas = datas.map((data, i) => {
if (selectedRows[index].includes(i)) {
data.viewAttr = 1;
}
return data
});
setSelectedRowKeys(selectedRowKeys.filter(row => !selectedRows[index].includes(row)))
}
}
getSearchs = () => {
const { departmentExtend } = this.props;
let { form, conditions, isEditor } = departmentExtend;
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: (<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@vh6j67@${j}`}
underline={!isEditor}
label={`${field.label}`}
error={form.getError(field)}
tipPosition={tipPosition}
labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{ span: `${field.fieldcol}` }}>
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
</WeaFormItem>),
colSpan: 1
});
}
});
group.push(<WeaSearchGroup ecId={`${this && this.props && this.props.ecId || ''}_WeaSearchGroup@x9hby9@${i}`} className={`${isEditor ? 'hrm-center' : ''}`}
needTigger={true} hide={c.hide} title={c.title} showGroup={c.defaultshow} items={items} col={2} />)
});
return group;
}
tableEditChange = (data) => {
const { departmentExtend } = this.props;
let { detailSelectedKey = '0', tableInfo } = departmentExtend;
tableInfo = toJS(tableInfo);
let d = cloneDeep(tableInfo);
d[Number(detailSelectedKey)].tabinfo.datas = data;
departmentExtend.updateTableInfo(d);
}
getRightMenu = () => {
const { departmentExtend } = this.props;
const { isEditor, buttons } = departmentExtend;
let arr = [];
try {
if (buttons.hasEdit) {
if (isEditor) {
arr = [{
icon: <i className='icon-coms-common' />,
content: i18n.button.save(),
key: 'save',
onClick: key => {
this.saveEditCard();
}
}, {
icon: <i className='icon-coms-go-back' />,
content: i18n.button.back(),
key: 'back',
onClick: key => {
this.backCard();
}
}]
} else {
arr = [{
icon: <i className='icon-coms-edit' />,
content: i18n.button.modify(),
key: 'editCard',
onClick: key => {
this.editCard();
}
}
]
}
}
} catch (e) { }
return arr;
}
getTopButtons = () => {
const { departmentExtend } = this.props;
const { isEditor, buttons } = departmentExtend;
const save = <Button ecId={`${this && this.props && this.props.ecId || ''}_Button@pkes6y`} type="primary" onClick={this.saveEditCard} >{i18n.button.save()}</Button>;
const back = <Button ecId={`${this && this.props && this.props.ecId || ''}_Button@pl1fw8`} type="primary" onClick={this.backCard} >{i18n.button.back()}</Button>;
const edit = <Button ecId={`${this && this.props && this.props.ecId || ''}_Button@vkeda5`} type="primary" onClick={this.editCard} >{i18n.button.modify()}</Button>;
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;
}
editCard = () => {
const { departmentExtend } = this.props;
departmentExtend.edit();
}
saveEditCard = () => {
const { departmentExtend } = this.props;
departmentExtend.save();
}
backCard = () => {
this.init();
}
changeData(key) {
const {
departmentExtend
} = this.props;
departmentExtend.changeData(key);
}
render() {
const { departmentExtend } = this.props;
const { loading, tabkey, tabInfo,topTab,selectedKey,date,detailSelectedKey } = departmentExtend;
try {
return (
<div className='hrm-my-cardInfo' style={{ height: '100%', position: 'relative' }}>
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
datas={this.getRightMenu()}
>
<WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@bj98s7`}
loading={true}
buttons={this.getTopButtons()}
showDropIcon={true}
dropMenuDatas={this.getRightMenu()}
>
<WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
datas={topTab}
keyParam="viewCondition" //主键
selectedKey={selectedKey}
onChange={this.changeData.bind(this)}
/>
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4fj4z2`} spinning={loading}>
{this.getSearchs()}
{
!isEmpty(tabInfo) && <div className='hrm-my-cardInfo_detial_tabs'>
<WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@vjrq63`}
type='card'
keyParam='key'
datas={toJS(tabInfo)}
selectedKey={detailSelectedKey}
onChange={v => {
departmentExtend.updateDetailSelectedKey(v);
}}
/>
{this.getTabChildren()}
</div>
}
</Spin>
</WeaTop>
</WeaRightMenu>
</div>
)
} catch (e) {
return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}>
<div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
</WeaAlertPage>
}
}
}

View File

@ -1,268 +0,0 @@
/*
* Author: 黎永顺
* Description: 部门管理
* Date: 2022-05-20 08:54:59
* LastEditTime: 2022-05-20 09:34:30
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { i18n } from "../../public/i18n";
import { Row, Col, Spin, Modal, Button, message, Switch } from "antd";
import {
WeaTop,
WeaTab,
WeaFormItem,
WeaRightMenu,
WeaLeftRightLayout,
WeaTable,
} from "ecCom";
const data = [
{
key: 1,
name: "a",
age: 32,
address: "我是a",
children: [
{
key: 11,
name: "aa",
age: 33,
address: "我是aa",
},
{
key: 12,
name: "ab",
age: 33,
address: "我是ab",
children: [
{
key: 121,
name: "aba",
age: 33,
address: "我是aba",
},
],
},
{
key: 13,
name: "ac",
age: 33,
address: "我是ac",
children: [
{
key: 131,
name: "aca",
age: 33,
address: "我是aca",
children: [
{
key: 1311,
name: "acaa",
age: 33,
address: "我是acaa",
},
{
key: 1312,
name: "acab",
age: 33,
address: "我是acab",
},
],
},
],
},
],
},
{
key: 2,
name: "b",
age: 32,
address: "我是b",
},
];
@observer
class DepartmentManage extends Component {
constructor(props) {
super(props);
this.state = {};
}
/**
* name: 右击菜单列表
* return {*}
*/
getDropMenuDatas = () => {
let menus = [];
[].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;
};
/**
* name: 右键菜单点击的回调
* param undefined
* return {*}
*/
handleMenuClick = (key) => {
// const { officeManageStore } = this.props;
// const { isPanelShow } = officeManageStore;
// isPanelShow && officeManageStore.setPanelStatus(false);
switch (key) {
case "new":
default:
break;
}
};
/**
* name: 顶部操作按钮
* return {*}
*/
getTopMenuBtns = () => {
let btns = [
<Button type="primary">新增</Button>,
<Button type="primary">复制</Button>,
<Button type="primary">批量删除</Button>,
];
// [].map((item, i) => {
// if (item.menuFun !== "batchDelete") {
// btns.push(<Button type="primary">新增</Button>);
// btns.push(<Button type="primary">复制</Button>);
// } else {
// btns.push(
// <Button type="primary" disabled={true}>
// 批量删除
// </Button>
// );
// }
// });
return btns;
};
/**
* name: 搜索面板底部按钮组
* return {*}
*/
getTabBtn = () => {
const btn = [
<Button
ecId={`${(this && this.props && this.props.ecId) || ""}_Button@5b3aeb`}
type="primary">
{i18n.button.search()}
</Button>,
<Button
ecId={`${(this && this.props && this.props.ecId) || ""}_Button@8acd45`}>
{i18n.button.reset()}
</Button>,
<Button
ecId={`${(this && this.props && this.props.ecId) || ""}_Button@06e592`}>
{i18n.button.cancel()}
</Button>,
];
return btn;
};
/**
* name: 表格内复选框设置
* return {*}
*/
rowSelection = () => {
return {
onChange(selectedRowKeys, selectedRows) {
console.log(
`selectedRowKeys: ${selectedRowKeys}`,
"selectedRows: ",
selectedRows
);
},
onSelect(record, selected, selectedRows) {
console.log(record, selected, selectedRows);
},
onSelectAll(selected, selectedRows, changeRows) {
console.log(selected, selectedRows, changeRows);
},
};
};
render() {
const columns = [
{
title: "姓名",
dataIndex: "name",
key: "name",
width: "40%",
},
{
title: "年龄",
dataIndex: "age",
key: "age",
width: "30%",
},
{
title: "住址",
dataIndex: "address",
key: "address",
width: "30%",
},
];
return (
<div className="depart-wapper">
<WeaRightMenu
ecId={`${
(this && this.props && this.props.ecId) || ""
}_WeaRightMenu@a3ba4d`}
datas={this.getDropMenuDatas()}
onClick={(key) => this.handleMenuClick(key)}>
<WeaTop
ecId={`${
(this && this.props && this.props.ecId) || ""
}_WeaTop@7547ff`}
title={i18n.label.departName()}
icon={<i className="icon-coms-hrm" />}
iconBgcolor="#217346"
loading={true}
buttons={this.getTopMenuBtns()}
showDropIcon={true}
dropMenuDatas={this.getDropMenuDatas()}
onDropMenuClick={(e) => this.handleMenuClick(e)}>
<WeaTab
ecId={`${
(this && this.props && this.props.ecId) || ""
}_WeaTab@daa881`}
searchType={["base", "advanced"]}
showSearchAd={false} //标准高级搜索显隐
searchsBaseValue={""} //普通 base input 搜索值外部受控
setShowSearchAd={(bool) => console.log(bool)}
hideSearchAd={() => console.log(false)} //隐藏高级搜索回调
searchsAd={<div></div>} //标准高级搜索条目组
advanceHeight={Math.ceil(2 / 2) * 52 + 20} //高级搜索面板的高度
hasMask={false}
buttonsAd={this.getTabBtn()}
onSearch={() => console.log()} //点搜索按钮时的回调
onSearchChange={(val) => console.log(val)} //在搜索框中输入的文字改变时的回调
/>
<WeaTable
columns={columns}
rowSelection={this.rowSelection}
dataSource={data}
/>
</WeaTop>
</WeaRightMenu>
</div>
);
}
}
export default DepartmentManage;

View File

@ -1,9 +1,9 @@
/**
* @Author: 程亮
* @Date: 2022-05-26 14:05:59
* @LastEditTime: 2022-06-01 16:18:15
* @LastEditTime: 2022-06-02 15:51:37
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/job.js
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/
import React from 'react'
import * as mobx from 'mobx'
@ -81,7 +81,7 @@ export default class Job extends React.Component {
} = this.props;
job.getTableInfo();
job.getHasRight();
job.getCopyForm();
job.getCopyForm()
}
getTopMenuBtns() {
@ -143,12 +143,13 @@ export default class Job extends React.Component {
job.getHrmTable(id);
}
copy() {
copy() {
const {
job
} = this.props;
const {
selectedRowKeys
selectedRowKeys,
} = job;
let keys = toJS(selectedRowKeys).toString();
job.setIds(keys);
@ -309,9 +310,11 @@ export default class Job extends React.Component {
c.render = function (text, record) {
const menu = (
<Menu>
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.doDel(record.id) }}>删除</a>
</Menu.Item>
{
record.isUsed === 0 ? <Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.doDel(record.id) }}>删除</a>
</Menu.Item> : ''
}
<Menu.Item>
<a href='javascript:void(0);' onClick={() => { _this.select(record.id) }}>联查人员</a>
</Menu.Item>
@ -483,14 +486,17 @@ export default class Job extends React.Component {
const {
isPanelShow, jobName, conditionNum, visible, condition, form,
tableStore, dataSource, columns, loading, date, nEdialogTitle, dialogLoading,
form1, isEdit, newVisible, deptDataSource, deptColumns, selectedRowKeys, total, current, pageSize, init,
defaultShowLeft
form1, isEdit, newVisible,selectedRowKeys, total, current, pageSize, init,
defaultShowLeft,form2
} = job;
const rowSelection = {
onChange(selectedRowKeys, selectedRows) {
job.setSelectedRowKeys(selectedRowKeys);
},
getCheckboxProps: record => ({
disabled: record.isUsed === 1, // 配置无法勾选的列
}),
};
const pagination = {

View File

@ -1,9 +1,3 @@
/*
* Author: 黎永顺
* Description:
* Date: 2022-05-23 17:44:32
* LastEditTime: 2022-05-30 09:29:18
*/
import React from "react";
import Route from "react-router/lib/Route";
import { WeaLocaleProvider } from "ecCom";
@ -24,6 +18,8 @@ import StaffScheme from "./components/staff/StaffScheme";
import Staff from "./components/staff/Staff";
import Job from "./components/job/Job";
import JobExtend from "./components/job/JobExtend";
import Department from "./components/department/department";
import DepartmentExtendStore from "./components/department/departmentExtend";
import stores from "./stores";
import "./style/index";
@ -62,12 +58,8 @@ const Routes = (
component={BranchNumSetting}
/>
<Route key="company" path="company" component={Company} />
<Route
key="departmentManage"
path="departmentManage"
component={DepartmentManage}
/>
<Route key="department" path="department" component={Department} />
<Route key="departmentExtend" path="departmentExtend/:id" component={DepartmentExtendStore} />
<Route key="staffscheme" path="staffscheme" component={StaffScheme} />
<Route key="staff" path="staff" component={Staff} />
<Route key="job" path="job" component={Job} />

View File

@ -130,8 +130,6 @@ export const i18n = {
newOfficeClassifyName: () => getLabel(386246, '新建职务分类信息'),
branchNumSetting: () => getLabel(386246, '分部编号设置'),
companyName: () => getLabel(385937, '分部'),
departName: () => getLabel(386246, '部门管理'),
staffSchemeName: () => getLabel(385936, '编制方案'),
newStaffScheme: () => getLabel(386246, '新建编制方案'),
ediStaffScheme: () => getLabel(386247, '编辑编制方案'),
@ -141,7 +139,9 @@ export const i18n = {
jobName: () => getLabel(385936, '岗位'),
newJob: () => getLabel(386246, '新建岗位'),
editJob: () => getLabel(386247, '编辑岗位'),
deptManage: () => getLabel(385936, '部门管理'),
newDept: () => getLabel(386246, '新建部门'),
mergeDept:()=> getLabel(386246, '合并部门'),

View File

@ -130,6 +130,7 @@ export class CompanyStore {
}).then(data => {
if (data.code === 200) {
message.success(i18n.message.deleteSuccess());
this.setSelectedRowKeys('');
this.getTableInfo();
} else {
message.warning(data.msg);

View File

@ -0,0 +1,457 @@
import {
observable,
action
} from 'mobx';
import * as mobx from 'mobx';
import * as Api from '../apis/department'; // 引入API接口文件
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 DepartmentStore {
@observable tableStore = new TableStore();
@observable topMenu = []
@observable rightMenu = [];
@observable dataSource = [];
@observable columns = [];
@observable jobDataSource = [];
@observable jobColumns = [];
@observable loading = true;
@observable dialogLoading = true;
@observable isEdit = true;
@observable nEdialogTitle = '';
@observable searchCondition = [];
@observable condition = [];
@observable copyCondition = [];
@observable isPanelShow = false; //高级搜索面板
@observable form = new WeaForm();
@observable form1 = new WeaForm(); //新增主表表单
@observable form2 = new WeaForm(); //复制表单
@observable departmentName = '';
@observable conditionNum = 8;
@observable ids = ''; //选择行id
@observable id = ''; //页面跳转参数id
@observable searchConditionLoading = true;
@observable visible = false;
@observable newVisible = false; //新增弹窗
@observable departmentId = '';
@observable selectedRowKeys = '';
@observable date = '';
@observable init = true; //是否首次加载
@observable total = '';
@observable current = 1;
@observable pageSize = 10;
@observable defaultShowLeft = true;
@observable companysId = 1 //集团id
@observable confirmVisible = false;
@observable confirmLoading = true;
@action
getTableInfo(params) {
this.setLoading(true);
params = {
...params,
current: this.current,
pageSize: this.pageSize
}
if (this.isEmptyObject(this.form.getFormParams())) {
params = {
...params,
...this.form.getFormParams(),
departmentName: this.departmentName
};
} else {
params = {
...params,
...this.form.getFormParams(),
};
}
Api.getSearchList(params).then(response => {
return response.json()
}).then(res => {
if (res.code === 200) {
res.data.pageInfo.columns && this.setColumns(res.data.pageInfo.columns);
this.setTotal(res.data.pageInfo.total);
res.data.pageInfo.list && this.setDataSource(res.data.pageInfo.list);
this.setLoading(false);
this.setInit(false);
} else {
message.warning(res.msg);
}
}).catch(error => {
message.warning(error.msg);
})
}
@action("nodetree事件")
doSearch(params) {
this.setInit(true);
this.getTableInfo(params);
}
@action("联查人员")
getHrmTable(id) {
// let params = {
// departmentId: id
// }
// this.tableStore = new TableStore();
// Api.getHrmListBydepartmentId(params).then(res => {
// if (res.code === 200) {
// res.data.datas && this.tableStore.getDatas(res.data.datas, 1);
// } else {
// message.warning(res.msg);
// }
// }, error => {
// message.warning(error.msg);
// })
}
//删除
delete() {
let params = {
ids: this.ids
};
Api.deleteTableData(params).then(response => {
return response.json()
}).then(data => {
if (data.code === 200) {
message.success(i18n.message.deleteSuccess());
this.setSelectedRowKeys('');
this.getTableInfo();
} else {
message.warning(data.msg);
}
}).catch(error => {
message.warning(error.msg);
})
}
updateForbiddenTag(checked, id) {
let params = {
forbiddenTag: checked,
id: id
}
Api.updateForbiddenTag(params).then(response => {
return response.json()
}).then(data => {
if (data.code === 200) {
message.success(data.msg, 1);
} else {
message.warning(data.msg);
}
}).catch(error => {
message.warning(error.msg);
})
}
getSearchCondition() {
this.setScLoadingStatus(true);
Api.getAdvanceSearchCondition().then(res => {
if (res.code === 200) {
this.setScLoadingStatus(false);
res.data.conditions && this.setSearchCondition(res.data.conditions);
res.data.conditions && this.form.initFormFields(res.data.conditions);
} else {
message.warning(res.msg);
}
}, error => {
message.warning(error.msg);
})
}
getDeptForm() {
let params = {};
this.setDialogLoadingStatus(true);
Api.getDeptForm(params).then(res => {
if (res.code === 200) {
this.setDialogLoadingStatus(false);
res.data.condition && this.setCondition(res.data.condition);
res.data.condition && this.form1.initFormFields(res.data.condition);
} else {
message.warning(res.msg);
}
}, error => {
message.warning(error.msg);
})
}
@action("合并部门")
getMergeForm() {
// let params = {};
// this.setConfirmLoading(true);
// Api.getDeptForm(params).then(res => {
// if (res.code === 200) {
// this.setConfirmLoading(false);
// res.data.condition && this.setCondition(res.data.condition);
// res.data.condition && this.form1.initFormFields(res.data.condition);
// } else {
// message.warning(res.msg);
// }
// }, error => {
// message.warning(error.msg);
// })
}
@action("转移部门")
getTransferForm() {
// let params = {};
// this.setConfirmLoading(true);
// Api.getDeptForm(params).then(res => {
// if (res.code === 200) {
// this.setConfirmLoading(false);
// res.data.condition && this.setCondition(res.data.condition);
// res.data.condition && this.form1.initFormFields(res.data.condition);
// } else {
// message.warning(res.msg);
// }
// }, error => {
// message.warning(error.msg);
// })
}
@action("复制表单")
getCopyForm() {
let params = {};
Api.getCopyForm(params).then(res => {
if (res.code === 200) {
res.data && this.setCopyCondition(res.data);
res.data && this.form2.initFormFields(res.data);
} else {
message.warning(res.msg);
}
}, error => {
message.warning(error.msg);
})
}
save() {
let params = {
...this.form1.getFormParams()
};
this.form1.validateForm().then(f => {
if (f.isValid) {
Api.add(params).then(response => {
return response.json()
}).then(data => {
if (data.code === 200) {
message.success(data.msg);
this.getTableInfo();
this.setNewVisible(false);
} else {
message.warning(data.msg);
}
}).catch(error => {
message.warning(error.msg);
})
} else {
f.showErrors();
this.setDate(new Date());
}
});
}
copy() {
let params = {
ids: this.ids,
...this.form2.getFormParams()
};
Api.copy(params).then(response => {
return response.json()
}).then(data => {
if (data.code === 200) {
message.success(data.msg);
this.getTableInfo();
this.form2 = new WeaForm();
this.setSelectedRowKeys('');
} else {
message.error(data.msg);
}
}).catch(error => {
message.warning(error.msg);
})
}
@action
getHasRight() {
Api.getHasRight().then(res => {
if (res.code === 200) {
res.data.rightMenu && this.setRightMenu(res.data.rightMenu);
res.data.topMenu && this.setTopMenu(res.data.topMenu);
} else {
message.warning(res.msg);
}
}, error => {
message.warning(error.msg);
})
}
updateFields(val) {
this.form.updateFields({
compName: {
value: val
}
});
}
setSearchCondition(condition) {
this.searchCondition = condition;
}
setScLoadingStatus(bool) {
this.searchConditionLoading = bool;
}
setPanelStatus(bool) {
this.isPanelShow = bool;
bool && this.getSearchCondition();
if (!bool) {
this.scLoadingReset();
}
}
setDepartmentName(val) {
this.departmentName = val;
}
isEmptyObject(obj) {
for (let key in obj) {
return false;
}
return true;
}
setIds(ids) {
this.ids = ids;
}
setId(id) {
this.id = id;
}
scLoadingReset() {
this.searchConditionLoading = true;
}
formReset() {
this.form1 = new WeaForm();
}
setVisible(bool) {
this.visible = bool;
}
setDialogLoadingStatus(bool) {
this.dialogLoading = bool;
}
setSearchCondition(searchCondition) {
this.searchCondition = searchCondition;
}
setDepartmentId(departmentId) {
this.departmentId = departmentId;
}
setDate(date) {
this.date = date;
}
setTopMenu(topMenu) {
this.topMenu = topMenu;
}
setRightMenu(rightMenu) {
this.rightMenu = rightMenu;
}
setDataSource(dataSource) {
this.dataSource = dataSource;
}
setJobDataSource(jobDataSource) {
this.jobDataSource = jobDataSource;
}
setColumns(columns) {
this.columns = columns
}
setJobColumns(jobColumns) {
this.jobColumns = jobColumns
}
setSelectedRowKeys(selectedRowKeys) {
this.selectedRowKeys = selectedRowKeys;
}
setLoading(bool) {
this.loading = bool;
}
setNeDialogTitle(title) {
this.nEdialogTitle = title
}
setCondition(condition) {
this.condition = condition;
}
setCopyCondition(copyCondition) {
this.copyCondition = copyCondition;
}
setNewVisible(bool) {
this.formReset();
this.newVisible = bool;
}
setTotal(total) {
this.total = total;
}
setCurrent(current) {
this.current = current;
}
setPageSize(pageSize) {
this.pageSize = pageSize;
}
setInit(bool) {
this.init = bool;
}
setConfirmVisible(confirmVisible) {
this.confirmVisible = confirmVisible;
}
setConfirmLoading(confirmLoading) {
this.confirmLoading = confirmLoading;
}
}

View File

@ -0,0 +1,235 @@
import { observable, action, toJS } from "mobx";
import { WeaForm } from "comsMobx";
import isEmpty from 'lodash/isEmpty'
import { WeaTableNew } from "comsMobx";
import { Modal, message } from "antd";
import { i18n } from "../public/i18n";
import forEach from 'lodash/forEach'
import * as Api from '../apis/department'; // 引入API接口文件
export class DepartmentExtendStore {
@observable form = new WeaForm();
@observable tableInfo = []
@observable conditions = [];
@observable isEditor = false;
@observable isNew = true;
@observable loading = true;
@observable tabInfo = [];
@observable selectedKey = '0';
@observable detailSelectedKey = '0';
@observable topTab = [];
@observable buttons = {};
@observable id = ''; //部门id
@observable date = '';
@observable personalEditTables;
@observable tabkey = '0'
@observable selectedRowKeys = [];
@observable selectedRows = [];
@action onRowSelect = (keys) => {
this.setSelectedRowKeys(keys);
}
@action setSelectedRowKeys = (keys) => {
this.selectedRowKeys = keys;
}
@action
edit = () => {
this.isEditor = true;
this.getData();
this.getTabInfo();
this.detailSelectedKey = '0'
}
init = () => {
this.detailSelectedKey = '0'
this.isEditor = false;
}
save = () => {
if (this.loading)
return;
this.loading = true;
this.form.validateForm().then(f => {
if (f.isValid) {
if (this.personalEditTables) {
const targetDatas = this.tableInfo[this.detailSelectedKey].tabinfo.datas,
isPass = (targetDatas.length > 0) ? this.personalEditTables.refs.edit.doRequiredCheck().pass : true
if (isPass) {
this.editResource()
} else {
this.loading = false;
}
} else {
this.editResource();
}
} else {
f.showErrors();
this.setDate(new Date());
this.loading = false;
}
})
}
editResource = () => {
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;
})
}
getTableEditParams = () => {
const params = {};
this.tableInfo && this.tableInfo.forEach(t => {
t.tabinfo.datas = t.tabinfo.datas || [];
params[t.tabinfo.rownum] = t.tabinfo.datas.length;
t.tabinfo && t.tabinfo.datas && t.tabinfo.datas.forEach((item, index) => {
!isEmpty(item) && forEach(item, (value, key) => {
Object.assign(params, {
[`${key}_${index}`]: value
});
})
})
})
return params
}
getData = () => {
this.setLoading(true);
let params = {
viewAttr: this.isEditor ? 2 : 1,
id: this.id,
viewCondition:this.selectedKey
}
Api.getDeptExtendForm(params).then((res) => {
if (res.code === 200) {
res.data.result.conditions && this.form.initFormFields(res.data.result.conditions);
res.data.result.conditions && this.setConditions(res.data.result.conditions);
this.tableInfo = this.handleTable(res.data.result.tables);
this.getTabInfo();
res.data.result.buttons && this.setButtons(res.data.result.buttons);
res.data.result.tabInfo && this.setTopTab(res.data.result.tabInfo);
this.isEditor && this.getSelectedRows();
this.setLoading(false);
} else {
message.warning(res.msg);
}
}, error => {
message.warning(error.msg);
})
}
handleTable = (datas) => {
return datas && datas.map(data => {
const { tabinfo: { columns } } = data;
const length = columns.length;
columns.map(c => {
c.width = `${95 / length}%`
})
return data
})
}
getTabInfo = () => {
this.tabInfo = [];
this.tableInfo && this.tableInfo.forEach((c, idx) => {
if (!c.hide) {
this.tabInfo.push({
key: `${idx}`,
title: c.tabname,
})
}
})
if (!isEmpty(this.tabInfo)) this.detailSelectedKey = this.tabInfo[0].key;
}
setLoading(val) {
this.loading = val;
}
updateTabKey = (key) => {
this.tabKey = key;
}
updateDetailSelectedKey =(key) => {
this.detailSelectedKey = key;
}
updateTableInfo = (data) => {
this.tableInfo = data
}
setSelectedKey = (key) => {
this.selectedKey = key;
}
getSelectedRows = () => {
const selectedRows = [];
this.tableInfo.forEach(t => {
const singleTableRows = [];
t.tabinfo.datas.forEach((data, i) => {
if (data.viewAttr === 1) {
singleTableRows.push(i);
}
});
selectedRows.push(singleTableRows);
})
this.selectedRows = selectedRows;
}
setTopTab(topTab) {
this.topTab = topTab;
}
changeData(key) {
this.setSelectedKey(key);
this.getData();
}
setId(id) {
this.id = id;
}
setPersonalEditTables = (ref) => {
this.personalEditTables = ref;
}
setConditions(conditions) {
this.conditions = conditions;
}
setButtons(buttons) {
this.buttons = buttons;
}
}

View File

@ -8,11 +8,14 @@ import { SequenceStore } from "./sequence";
import { GroupStore } from "./group";
import {CompanyExtendStore} from "./companyextend";
import {CompanyStore} from "./company";
import {DepartmentStore} from "./department";
import {DepartmentExtendStore} from "./departmentextend";
import {StaffSchemeStore} from "./staffscheme";
import {StaffStore} from "./staff";
import {JobStore} from "./job";
import {JobExtendStore} from "./jobextend";
module.exports = {
simpleOrgStore: new SimpleOrgStore(),
standardOrgStore: new StandardOrgStore(),
@ -24,6 +27,8 @@ module.exports = {
group: new GroupStore(),
companyExtend: new CompanyExtendStore(),
company: new CompanyStore(),
department: new DepartmentStore(),
departmentExtend: new DepartmentExtendStore(),
staffScheme: new StaffSchemeStore(),
staff: new StaffStore(),
job: new JobStore(),

View File

@ -30,8 +30,6 @@ export class JobStore {
@observable rightMenu = [];
@observable dataSource = [];
@observable columns = [];
@observable deptDataSource = [];
@observable deptColumns = [];
@observable loading = true;
@observable dialogLoading = true;
@observable isEdit = true;
@ -63,7 +61,6 @@ export class JobStore {
@action
getTableInfo(params) {
this.setLoading(true);
@ -134,6 +131,7 @@ export class JobStore {
}).then(data => {
if (data.code === 200) {
message.success(i18n.message.deleteSuccess());
this.setSelectedRowKeys('');
this.getTableInfo();
} else {
message.warning(data.msg);
@ -236,30 +234,25 @@ export class JobStore {
}
copy() {
debugger
let params = {
ids: this.ids,
...this.form2.getFormParams()
};
this.form2.validateForm().then(f => {
if (f.isValid) {
Api.copy(params).then(response => {
return response.json()
}).then(data => {
if (data.code === 200) {
message.success(data.msg);
this.getTableInfo();
} else {
message.error(data.msg);
}
}).catch(error => {
message.warning(error.msg);
})
Api.copy(params).then(response => {
return response.json()
}).then(data => {
if (data.code === 200) {
message.success(data.msg);
this.getTableInfo();
this.form2 = new WeaForm();
this.setSelectedRowKeys('');
} else {
f.showErrors();
this.setDate(new Date());
message.error(data.msg);
}
});
}).catch(error => {
message.warning(error.msg);
})
}
@ -363,17 +356,10 @@ export class JobStore {
this.dataSource = dataSource;
}
setDeptDataSource(deptDataSource) {
this.deptDataSource = deptDataSource;
}
setColumns(columns) {
this.columns = columns
}
setDeptColumns(deptColumns) {
this.deptColumns = deptColumns
}
setSelectedRowKeys(selectedRowKeys) {
this.selectedRowKeys = selectedRowKeys;