liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!3 公司/分部扩展页面 

Merge pull request !3 from reset/feature/cl
This commit is contained in:
reset 2022-05-17 06:49:34 +00:00 committed by Gitee
parent 89aab7a742 dd9646213f
commit e0432a21c5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 1324 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

309
pc4mobx/organization/components/company/CompanyExtend.js
View File

@ -1,65 +1,63 @@
import { Button, Modal,message,Row,Col, Spin} from 'antd'; import { Button, Modal, message, Row, Col, Spin } from 'antd';
import isEmpty from 'lodash/isEmpty' import isEmpty from 'lodash/isEmpty'
import cloneDeep from 'lodash/cloneDeep' import cloneDeep from 'lodash/cloneDeep'
import forEach from 'lodash/forEach' import forEach from 'lodash/forEach'
import { WeaAlertPage, WeaTools,WeaTableEdit,WeaSearchGroup,WeaRightMenu, WeaFormItem, WeaTab} from 'ecCom' import { WeaAlertPage, WeaTools, WeaTableEdit, WeaSearchGroup, WeaRightMenu, WeaFormItem, WeaTab,WeaTop } from 'ecCom'
import {WeaSwitch} from 'comsMobx'; import { WeaSwitch } from 'comsMobx';
import { inject, observer} from 'mobx-react'; import { inject, observer } from 'mobx-react';
import * as mobx from 'mobx'; import * as mobx from 'mobx';
import {i18n} from '../../public/i18n'; import { i18n } from '../../public/i18n';
const toJS = mobx.toJS; const toJS = mobx.toJS;
import '../../style/common.less';
@inject('companyExtend') @inject('companyExtend')
@inject('company') @inject('company')
@observer @observer
export default class CompanyExtend extends React.Component { export default class CompanyExtend extends React.Component {
componentDidMount(){ componentDidMount() {
const {companyExtend} = this.props;
companyExtend.setTopButtons(this.getTopButtons.bind(this));
companyExtend.setTopRightMenus(this.getRightMenu.bind(this));
companyExtend.setTopShowDropIcon(true);
this.init(); this.init();
} }
init = () => { init = () => {
// const {companyExtend, companyExtend, setParentRightMenu} = this.props; const { companyExtend } = this.props;
companyExtend.init(); companyExtend.init();
// companyExtend.hrmId=hrmId; // companyExtend.hrmId=hrmId;
companyExtend.getData(); companyExtend.getData();
} }
getTabChildren = () => { getTabChildren = () => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
let {tableInfo, isEditor, tabkey,onRowSelect,selectedRowKeys} = companyExtend; let { tableInfo, isEditor, tabkey, onRowSelect, selectedRowKeys } = companyExtend;
let tabChildren = []; let tabChildren = [];
tableInfo = toJS(tableInfo); tableInfo = toJS(tableInfo);
tableInfo && tableInfo.map((t,i)=>{ tableInfo && tableInfo.map((t, i) => {
if(tabkey==i){ if (tabkey == i) {
tabChildren.push( tabChildren.push(
<WeaTableEdit ecId={`${this && this.props && this.props.ecId || ''}_WeaTableEdit@b813my@${i}`} <WeaTableEdit ecId={`${this && this.props && this.props.ecId || ''}_WeaTableEdit@b813my@${i}`}
//ref={(ref)=>companyExtend.setPersonalEditTables(ref)} //ref={(ref)=>companyExtend.setPersonalEditTables(ref)}
showTitle={isEditor} showTitle={isEditor}
// title={'列表信息'} // title={'列表信息'}
// addFirstRow={isEditor} // addFirstRow={isEditor}
columns={t.tabinfo.columns} columns={t.tabinfo.columns}
datas={t.tabinfo.datas} datas={t.tabinfo.datas}
onChange={this.tableEditChange} onChange={this.tableEditChange}
selectedRowKeys={toJS(selectedRowKeys)} selectedRowKeys={toJS(selectedRowKeys)}
onRowSelect={keys => onRowSelect(keys)} onRowSelect={keys => onRowSelect(keys)}
onBtnsSelect={key=>this.onBtnsSelect(key,i)} onBtnsSelect={key => this.onBtnsSelect(key, i)}
viewAttr={isEditor?2: 1} viewAttr={isEditor ? 2 : 1}
getRowSelection={isEditor? (rowSelection)=>{ getRowSelection={isEditor ? (rowSelection) => {
Object.assign(rowSelection,{ Object.assign(rowSelection, {
getCheckboxProps: record => ({ getCheckboxProps: record => ({
disabled: record.viewAttr === 1, // 配置无法勾选的列 disabled: record.viewAttr === 1, // 配置无法勾选的列
}) })
}) })
return rowSelection; return rowSelection;
}: ()=>null} } : () => null}
/> />
); );
} }
}) })
return tabChildren; return tabChildren;
} }
@ -76,60 +74,60 @@ export default class CompanyExtend extends React.Component {
const datas = tableInfo[index].tabinfo.datas; const datas = tableInfo[index].tabinfo.datas;
if (key === 'copy') { if (key === 'copy') {
tableInfo[index].tabinfo.datas = datas.map( (data,i) => { tableInfo[index].tabinfo.datas = datas.map((data, i) => {
if (!selectedRows[index].includes(i)) { if (!selectedRows[index].includes(i)) {
data.viewAttr = 2; data.viewAttr = 2;
} }
return data return data
}) })
} }
if (key === 'delete') { if (key === 'delete') {
tableInfo[index].tabinfo.datas = datas.map( (data,i) => { tableInfo[index].tabinfo.datas = datas.map((data, i) => {
if (selectedRows[index].includes(i)) { if (selectedRows[index].includes(i)) {
data.viewAttr = 1; data.viewAttr = 1;
} }
return data return data
}); });
setSelectedRowKeys(selectedRowKeys.filter(row => !selectedRows[index].includes(row))) setSelectedRowKeys(selectedRowKeys.filter(row => !selectedRows[index].includes(row)))
} }
} }
getSearchs = () => { getSearchs = () => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
let {form, conditions, isEditor} = companyExtend; let { form, conditions, isEditor } = companyExtend;
const {isFormInit} = form; const { isFormInit } = form;
let group = []; let group = [];
let tipPosition = 'bottom'; let tipPosition = 'bottom';
window.e9HideFormFieldKeys = []; window.e9HideFormFieldKeys = [];
isFormInit && conditions.forEach((c, i) =>{ isFormInit && conditions.forEach((c, i) => {
let items = []; let items = [];
c.items.forEach( (field, j) => { c.items.forEach((field, j) => {
if(c.hide || (!isEmpty(field.otherParams) && field.otherParams.hide)){ if (c.hide || (!isEmpty(field.otherParams) && field.otherParams.hide)) {
window.e9HideFormFieldKeys.push(field.domkey[0]); window.e9HideFormFieldKeys.push(field.domkey[0]);
}else{ } else {
items.push({ items.push({
com:(<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@vh6j67@${j}`} com: (<WeaFormItem ecId={`${this && this.props && this.props.ecId || ''}_WeaFormItem@vh6j67@${j}`}
underline={!isEditor} underline={!isEditor}
label={`${field.label}`} label={`${field.label}`}
error={form.getError(field)} error={form.getError(field)}
tipPosition={tipPosition} tipPosition={tipPosition}
labelCol={{span: `${window.HrmLabelCol}`}} labelCol={{ span: `${field.labelcol}` }}
wrapperCol={{span: `${window.HrmWrapperCol}`}}> wrapperCol={{ span: `${field.fieldcol}` }}>
<WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form}/> <WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
</WeaFormItem>), </WeaFormItem>),
colSpan: 1 colSpan: 1
}); });
} }
}); });
group.push(<WeaSearchGroup ecId={`${this && this.props && this.props.ecId || ''}_WeaSearchGroup@x9hby9@${i}`} className={`${isEditor?'hrm-center':''}`} 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} />) needTigger={true} hide={c.hide} title={c.title} showGroup={c.defaultshow} items={items} col={2} />)
}); });
return group; return group;
} }
tableEditChange = (data) => { tableEditChange = (data) => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
let {tabkey = '0', tableInfo} = companyExtend; let { tabkey = '0', tableInfo } = companyExtend;
tableInfo = toJS(tableInfo); tableInfo = toJS(tableInfo);
let d = cloneDeep(tableInfo); let d = cloneDeep(tableInfo);
d[Number(tabkey)].tabinfo.datas = data; d[Number(tabkey)].tabinfo.datas = data;
@ -137,51 +135,51 @@ export default class CompanyExtend extends React.Component {
} }
getRightMenu = () => { getRightMenu = () => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
const {isEditor, buttons} = companyExtend; const { isEditor, buttons } = companyExtend;
let arr = []; let arr = [];
try{ try {
if(buttons.hasEdit){ if (buttons.hasEdit) {
if (isEditor){ if (isEditor) {
arr = [{ arr = [{
icon: <i className='icon-coms-common'/>, icon: <i className='icon-coms-common' />,
content: i18n.button.save(), content: i18n.button.save(),
key: 'save', key: 'save',
onClick: key =>{ onClick: key => {
this.saveEditCard(); this.saveEditCard();
} }
}, { }, {
icon: <i className='icon-coms-go-back'/>, icon: <i className='icon-coms-go-back' />,
content: i18n.button.back(), content: i18n.button.back(),
key: 'back', key: 'back',
onClick: key =>{ onClick: key => {
this.backCard(); this.backCard();
} }
}] }]
} else { } else {
arr = [{ arr = [{
icon: <i className='icon-coms-edit'/>, icon: <i className='icon-coms-edit' />,
content:i18n.button.modify(), content: i18n.button.modify(),
key: 'editCard', key: 'editCard',
onClick: key =>{ onClick: key => {
this.editCard(); this.editCard();
} }
}
]
} }
]
}
} }
}catch(e){} } catch (e) { }
return arr; return arr;
} }
getTopButtons = () => { getTopButtons = () => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
const {isEditor, buttons} = companyExtend; const { isEditor, buttons } = companyExtend;
const save = <Button ecId={`${this && this.props && this.props.ecId || ''}_Button@pkes6y`} type="primary" onClick={this.saveEditCard} >{i18n.button.save()}</Button>; 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 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 edit = <Button ecId={`${this && this.props && this.props.ecId || ''}_Button@vkeda5`} type="primary" onClick={this.editCard} >{i18n.button.modify()}</Button>;
const btns = []; const btns = [];
try{ try {
if (isEditor) { if (isEditor) {
if (buttons.hasSave) { if (buttons.hasSave) {
btns.push(save); btns.push(save);
@ -192,17 +190,17 @@ export default class CompanyExtend extends React.Component {
btns.push(edit); btns.push(edit);
} }
} }
}catch(e){} } catch (e) { }
return btns; return btns;
} }
editCard = () => { editCard = () => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
companyExtend.edit(); companyExtend.edit();
} }
saveEditCard = () => { saveEditCard = () => {
const {companyExtend} = this.props; const { companyExtend } = this.props;
companyExtend.save(); companyExtend.save();
} }
@ -210,10 +208,17 @@ export default class CompanyExtend extends React.Component {
this.init(); this.init();
} }
changeData(key) {
const {
companyExtend
} = this.props;
companyExtend.changeData(key);
}
render() { render() {
const {companyExtend} = this.props; const { companyExtend } = this.props;
const {loading, detailSelectedKey, tabInfo} = companyExtend; const { loading, detailSelectedKey, tabInfo,topTab,selectedKey } = companyExtend;
// if(!hasRight && !loading){ // if(!hasRight && !loading){
// return ( // return (
// <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@387kx5`}> // <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@387kx5`}>
@ -222,33 +227,51 @@ export default class CompanyExtend extends React.Component {
// ) // )
// } // }
try{ // try {
return ( return (
<div className='hrm-my-cardInfo' style={{height:'100%', position: 'relative'}}> <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}> <Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4fj4z2`} spinning={loading}>
{this.getSearchs()} {this.getSearchs()}
{ {
!isEmpty(tabInfo) && <div className='hrm-my-cardInfo_detial_tabs'> !isEmpty(tabInfo) && <div className='hrm-my-cardInfo_detial_tabs'>
<WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@vjrq63`} <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@vjrq63`}
type='card' type='card'
keyParam='key' keyParam='key'
datas={toJS(tabInfo)} datas={toJS(tabInfo)}
selectedKey={detailSelectedKey} selectedKey={detailSelectedKey}
onChange={ v => { onChange={v => {
companyExtend.updateDetailSelectedKey(v); companyExtend.updateDetailSelectedKey(v);
}} }}
/> />
{this.getTabChildren()} {this.getTabChildren()}
</div> </div>
} }
</Spin> </Spin>
</div> </WeaTop>
</WeaRightMenu>
</div>
) )
}catch(e){ // } catch (e) {
return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}> // return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}>
<div style={{ color: '#000' }}>{i18n.message.authFailed()}</div> // <div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
</WeaAlertPage> // </WeaAlertPage>
} // }
} }
} }

2
pc4mobx/organization/public/i18n.js
View File

@ -822,6 +822,8 @@ export const i18n = {
'531692': () => getLabel('531692', '说明：总部节点的人员编号设置主要用于新建分部时将总部的编号设置自动复制给新分部，不用于全局的开关控制，实际根据各分部的开关独立控制。'), '531692': () => getLabel('531692', '说明：总部节点的人员编号设置主要用于新建分部时将总部的编号设置自动复制给新分部，不用于全局的开关控制，实际根据各分部的开关独立控制。'),
}, },
button: { button: {
back: () => getLabel(1290, '返回'),
batchOpen: () => getLabel(534249, '批量解锁'), batchOpen: () => getLabel(534249, '批量解锁'),
collect: () => getLabel(28111, '收藏'), collect: () => getLabel(28111, '收藏'),
helper: () => getLabel(275, '帮助'), helper: () => getLabel(275, '帮助'),

49
pc4mobx/organization/stores/company.js
View File

@ -18,62 +18,15 @@ export class CompanyStore {
@observable form2 = new WeaForm(); @observable form2 = new WeaForm();
@observable form = new WeaForm(); @observable form = new WeaForm();
@observable form1 = new WeaForm(); @observable form1 = new WeaForm();
@observable schemeName = "";
@observable conditionNum = 2; @observable conditionNum = 2;
@observable ids = ""; //选择行id @observable ids = ""; //选择行id
@observable searchConditionLoading = true; @observable searchConditionLoading = true;
@observable nEdialogTitle = "";
@observable visible = false; @observable visible = false;
@observable dialogLoading = true;
@observable schemeId = "";
@observable date = ""; @observable date = "";
@action @action
getHasRight() { getHasRight() {
this.topMenu = [
{
isBatch: "1",
isTop: "1",
menuFun: "new",
menuIcon: "icon-coms-New-Flow",
menuName: "新建",
type: "BTN_Addnew",
},
{
isBatch: "1",
isTop: "1",
menuFun: "batchDelete",
menuIcon: "icon-coms-Batch-delete",
menuName: "批量删除",
type: "BTN_BatchDelete",
},
];
this.rightMenu = [
{
isBatch: "0",
isTop: "1",
menuFun: "new",
menuIcon: "icon-coms-New-Flow",
menuName: "新建",
type: "BTN_Addnew",
},
{
isBatch: "0",
isTop: "0",
menuFun: "log",
menuIcon: "icon-coms-Print-log",
menuName: "日志",
type: "BTN_log",
},
{
isBatch: "0",
isTop: "0",
menuFun: "custom",
menuIcon: "icon-coms-task-list",
menuName: "显示列定制",
type: "BTN_COLUMN",
},
];
} }
updateFields(val) { updateFields(val) {

1277
pc4mobx/organization/stores/companyextend.js
View File

File diff suppressed because it is too large Load Diff

4
pc4mobx/organization/stores/index.js
View File

@ -6,6 +6,8 @@ import { JobGradeStore } from "./jobgrade";
import { OfficeManageStore } from "./officeManage"; import { OfficeManageStore } from "./officeManage";
import { SequenceStore } from "./sequence"; import { SequenceStore } from "./sequence";
import { GroupStore } from "./group"; import { GroupStore } from "./group";
import {CompanyExtendStore} from "./companyextend";
import {CompanyStore} from "./company"
module.exports = { module.exports = {
simpleOrgStore: new SimpleOrgStore(), simpleOrgStore: new SimpleOrgStore(),
@ -16,4 +18,6 @@ module.exports = {
officeManageStore: new OfficeManageStore(), officeManageStore: new OfficeManageStore(),
sequence: new SequenceStore(), sequence: new SequenceStore(),
group: new GroupStore(), group: new GroupStore(),
companyExtend: new CompanyExtendStore(),
company: new CompanyStore()
}; };

18
pc4mobx/organization/style/common.less
View File

@ -29,4 +29,22 @@
padding-top: 28px; padding-top: 28px;
height: calc(100% - 47px); height: calc(100% - 47px);
overflow: auto; overflow: auto;
}
//公司、分部管理
.hrm-my-cardInfo {
padding-bottom: 20px;
background: #fff;
a {
color: #123885;
&:hover {
color: red;
}
}
.hrm-center {
.ant-col-24 .wea-form-cell {
padding-left: 25%;
}
}
} }