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

Merge pull request 'feature/cl' (#27) from feature/cl into dev 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/27
This commit is contained in:
liang.cheng 2022-12-13 17:27:02 +08:00
parent 68c07ee8b9 a709470921
commit 69620d54c4
10 changed files with 295 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc4mobx/organization/apis/company.js
View File

@ -92,3 +92,4 @@ export const getCompanyExtendForm = (params) => {
export const getHasRight = (params) => {
return WeaTools.callApi('/api/bs/hrmorganization/comp/getHasRight', 'GET', params);
}

85
pc4mobx/organization/components/VersionsSlider.js Normal file
View File

@ -0,0 +1,85 @@
import {
WeaFormItem,
WeaTab,
WeaTableEdit
} from 'ecCom'
import {
Spin,
Button,
Tooltip,
Row, Col, Select
} from 'antd'
import { chunk, isEmpty } from 'lodash';
import { toJS } from "mobx";
const Option = Select.Option;
export default class VersionsSlider extends React.Component {
componentDidMount() {
}
render() {
const {
versionList,
handleChange
} = this.props;
const newData = chunk(versionList.datas, 2);
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>)
})
}
</Select></div>
</Col>
</Row>
<div style={{ "marginTop": "30px", "width": "100%" }}>
{newData.map((item, index) => {
return (
<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>
)
}
}

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

@ -1,12 +1,12 @@
/**
* @Author: 程亮
* @Date: 2022-05-18 14:52:39
* @LastEditTime: 2022-12-09 11:08:06
* @LastEditTime: 2022-12-09 17:45:16
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/company/CompanyExtend.js
*/
import { Button, Modal, message, Row, Col, Spin } from 'antd';
import isEmpty from 'lodash/isEmpty'
import { Button, Modal, message, Row, Col, Spin, Select,Tooltip } from 'antd';
import { chunk,isEmpty } from 'lodash';
import cloneDeep from 'lodash/cloneDeep'
import forEach from 'lodash/forEach'
import { WeaAlertPage, WeaTools, WeaTableEdit, WeaSearchGroup, WeaRightMenu, WeaFormItem, WeaTab, WeaTop, WeaSlideModal } from 'ecCom'
@ -15,6 +15,7 @@ import { inject, observer } from 'mobx-react';
import * as mobx from 'mobx';
import { i18n } from '../../public/i18n';
import '../../style/common.less';
import VersionsSlider from '../VersionsSlider';
const toJS = mobx.toJS;
import '../../style/common.less';
@ -184,7 +185,7 @@ export default class CompanyExtend extends React.Component {
content: i18n.button.version(),
key: 'view',
onClick: key => {
this.editCard();
this.view();
}
}
]
@ -242,6 +243,7 @@ export default class CompanyExtend extends React.Component {
companyExtend.open = false;
}
changeData(key) {
const {
companyExtend
@ -251,9 +253,9 @@ export default class CompanyExtend extends React.Component {
render() {
const { companyExtend } = this.props;
const { loading, tabkey, tabInfo, topTab, selectedKey, date, detailSelectedKey, isEditor, open } = companyExtend;
const { loading, tabkey, tabInfo, topTab, selectedKey, date, detailSelectedKey, isEditor, open, versionList } = companyExtend;
//try {
try {
return (
<div className='hrm-my-cardInfo' style={{ height: '100%', position: 'relative' }}>
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
@ -303,17 +305,17 @@ export default class CompanyExtend extends React.Component {
height={94}
direction={'right'}
measure={'%'}
content={<VersionsSlider versionList={versionList} handleChange={val => companyExtend.changeVersion(val)}/>}
onClose={this.onClose}
onAnimationEnd={() => console.log('onAnimationEnd')} />
</div>
)
//}
// catch (e) {
// return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}>
// <div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
// </WeaAlertPage>
// }
}
catch (e) {
return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}>
<div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
</WeaAlertPage>
}
}
}

5
pc4mobx/organization/components/department/department.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-12-09 11:47:53
* @LastEditTime: 2022-12-13 16:00:41
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/
@ -535,8 +535,7 @@ export default class Department extends React.Component {
let tree = (
<WeaOrgTree ecId={`${this && this.props && this.props.ecId || ''}_WeaOrgTree@dhi1ro`}
ref='WeaOrgTree'
// dataUrl={"/api/bs/hrmorganization/dept/getSearchTree"}
dataUrl={"/api/hrm/base/getHrmSearchTree"}
dataUrl={"/api/bs/hrmorganization/dept/getSearchTree"}
loading
needSearch
noCache={true}

31
pc4mobx/organization/components/department/departmentExtend.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-06-02 09:20:03
* @LastEditTime: 2022-06-29 17:42:27
* @LastEditTime: 2022-12-09 17:46:00
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/departmentExtend.js
*/
@ -11,12 +11,13 @@ 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 { WeaAlertPage, WeaTools, WeaTableEdit, WeaSearchGroup, WeaRightMenu, WeaFormItem, WeaTab, WeaTop,WeaSlideModal } from 'ecCom'
import { WeaSwitch } from 'comsMobx';
import { inject, observer } from 'mobx-react';
import * as mobx from 'mobx';
import { i18n } from '../../public/i18n';
import AttachToNumberField from "../NewNumberField";
import VersionsSlider from '../VersionsSlider';
const toJS = mobx.toJS;
import '../../style/common.less';
@ -40,6 +41,11 @@ export default class DepartmentExtendStore extends React.Component {
departmentExtend.getData();
}
view = () => {
const { departmentExtend } = this.props;
departmentExtend.open = true;
}
getTabChildren = () => {
const { departmentExtend } = this.props;
let { tableInfo, isEditor, tabkey, onRowSelect, selectedRowKeys, detailSelectedKey } = departmentExtend;
@ -179,6 +185,13 @@ export default class DepartmentExtendStore extends React.Component {
onClick: key => {
this.editCard();
}
}, {
icon: <i className='icon-coms-common' />,
content: i18n.button.version(),
key: 'view',
onClick: key => {
this.view();
}
}
]
}
@ -193,6 +206,8 @@ export default class DepartmentExtendStore extends React.Component {
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 view = <Button ecId={`${this && this.props && this.props.ecId || ''}_Button@vkeda5`} type="primary" onClick={this.view} >{i18n.button.version()}</Button>;
const btns = [];
try {
if (isEditor) {
@ -203,6 +218,7 @@ export default class DepartmentExtendStore extends React.Component {
} else {
if (buttons.hasEdit) {
btns.push(edit);
btns.push(view);
}
}
} catch (e) { }
@ -232,7 +248,7 @@ export default class DepartmentExtendStore extends React.Component {
render() {
const { departmentExtend } = this.props;
const { loading, tabkey, tabInfo, topTab, selectedKey, date, detailSelectedKey,isEditor } = departmentExtend;
const { loading, tabkey, tabInfo, topTab, selectedKey, date, detailSelectedKey,isEditor,open, versionList } = departmentExtend;
try {
return (
@ -274,6 +290,15 @@ export default class DepartmentExtendStore extends React.Component {
</Spin>
</WeaTop>
</WeaRightMenu>
<WeaSlideModal visible={open}
top={6}
width={40}
height={94}
direction={'right'}
measure={'%'}
content={!isEmpty(versionList) ? <VersionsSlider versionList={versionList} handleChange={val => departmentExtend.changeVersion(val)}/> : ''}
onClose={this.onClose}
onAnimationEnd={() => console.log('onAnimationEnd')} />
</div>
)

6
pc4mobx/organization/components/job/Job.js
View File

@ -1,7 +1,7 @@
/**
* @Author: 程亮
* @Date: 2022-05-26 14:05:59
* @LastEditTime: 2022-12-08 15:04:50
* @LastEditTime: 2022-12-13 16:01:40
* @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js
*/
@ -481,8 +481,8 @@ export default class Job extends React.Component {
let tree = (
<WeaOrgTree ecId={`${this && this.props && this.props.ecId || ''}_WeaOrgTree@dhi1ro`}
ref='WeaOrgTree'
// dataUrl={"/api/bs/hrmorganization/job/getSearchTree"}
dataUrl={"/api/hrm/base/getHrmSearchTree"}
dataUrl={"/api/bs/hrmorganization/job/getSearchTree"}
// dataUrl={"/api/hrm/base/getHrmSearchTree"}
loading
needSearch
noCache={true}

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

@ -164,7 +164,7 @@ export const i18n = {
newResourceBasicType: () => getLabel(386246, '新建人员资料类型'),
editResourceBasicInfo: () => getLabel(386246, '编辑人员资料'),
editResourceBasicType: () => getLabel(386246, '编辑人员资料类型'),
forbidden: () => getLabel(531114, '已禁用'),
forbidden: () => getLabel(531114, '已封存'),
mangerDetachName: () => getLabel(385936, '模块管理分权'),
newManagerDetach: () => getLabel(386246, '新建模块管理分权'),
editManagerDetach: () => getLabel(386247, '编辑模块管理分权'),

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

@ -312,6 +312,7 @@ export class CompanyStore {
return true;
}
setIds(ids) {
this.ids = ids;
}

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

@ -79,7 +79,8 @@ export class CompanyExtendStore {
editResource = () => {
let pDatas = this.form.getFormParams();
Api.editResource({ ...{
Api.editResource({
...{
id: this.id,
viewCondition: this.selectedKey
},
@ -175,6 +176,10 @@ export class CompanyExtendStore {
if (!isEmpty(this.tabInfo)) this.detailSelectedKey = this.tabInfo[0].key;
}
changeVersion = data => {
debugger
}
setLoading(val) {
this.loading = val;
}
@ -240,4 +245,49 @@ 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: '产品运营'
}
]
}
}

52
pc4mobx/organization/stores/departmentextend.js
View File

@ -28,6 +28,8 @@ export class DepartmentExtendStore {
@observable selectedRowKeys = [];
@observable selectedRows = [];
@observable open = false;
@action onRowSelect = (keys) => {
this.setSelectedRowKeys(keys);
}
@ -168,6 +170,11 @@ export class DepartmentExtendStore {
if (!isEmpty(this.tabInfo)) this.detailSelectedKey = this.tabInfo[0].key;
}
changeVersion = data => {
debugger
}
setLoading(val) {
this.loading = val;
}
@ -233,5 +240,50 @@ 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: '产品运营'
}
]
}
}