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

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

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/58
This commit is contained in:
liang.cheng 2024-12-10 15:53:17 +08:00
parent ed2f6bd9ff 1842906c83
commit 2a3941cb03
8 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc4mobx/organization/components/company/company.js
View File

@ -328,6 +328,12 @@ export default class Company extends React.Component {
// }
// });
columns.forEach((c, index) => {
if (c.dataIndex == 'showOrder') {
c.render = function (text, record) {
return <span>{record.showOrder.toFixed(2)}</span>
}
}
if (c.dataIndex == 'canceled') {
c.render = function (text, record) {
return <Switch checked={record.canceled == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />

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

@ -375,6 +375,12 @@ export default class Department extends React.Component {
} = this.props;
let _this = this;
columns.forEach((c, index) => {
if (c.dataIndex == 'showOrder') {
c.render = function (text, record) {
return <span>{record.showOrder.toFixed(2)}</span>
}
}
if (c.dataIndex == 'canceled') {
c.render = function (text, record) {
return <Switch checked={record.canceled == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />

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

@ -332,6 +332,11 @@ export default class Job extends React.Component {
} = this.props;
let _this = this;
columns.forEach((c, index) => {
if (c.dataIndex == 'showOrder') {
c.render = function (text, record) {
return <span>{record.showOrder.toFixed(2)}</span>
}
}
if (c.dataIndex == 'forbiddenTag') {
c.render = function (text, record) {
return <Switch checked={record.forbiddenTag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />

9
pc4mobx/organization/components/log/LogView.js
View File

@ -143,12 +143,11 @@ export default class LogView extends React.Component {
const btn = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => {
logViewStore.getTableInfo(); this.setState({ showSearchAd: false })
}}>{i18n.button.search()}</Button>),
logViewStore.getTableInfo(); this.setState({ showSearchAd: 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={() => this.setState({ showSearchAd: false })}>{i18n.button.cancel()}</Button>),
];
return btn;
}
@ -180,8 +179,8 @@ export default class LogView extends React.Component {
searchType={['advanced']}
showSearchAd={showSearchAd}
setShowSearchAd={bool => {
this.setState({ showSearchAd: bool })
}}
this.setState({ showSearchAd: bool })
}}
advanceHeight={161}
searchsAd={showSearchAd ? this.getPanelComponents() : <div></div>}
buttonsAd={this.getTabBtn()}

2
pc4mobx/organization/components/resource/PersonnelResume.js
View File

@ -326,7 +326,7 @@ export default class PersonnelResume extends React.Component {
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()}>
<WeaLeftRightLayout className='org-personnel-resume' ecId={`${this && this.props && this.props.ecId || ''}_WeaLeftRightLayout@7muhhb`} isNew={true} showLeft={defaultShowLeft} leftCom={this.getTree()}>
{
!this.isEmptyObject(resumeList) ? <div id='personnel-resume'>
<div className='content'>

1
pc4mobx/organization/components/resource/ResourceCard.js
View File

@ -263,7 +263,6 @@ 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 (

12
pc4mobx/organization/components/resource/resource.js
View File

@ -50,6 +50,17 @@ const WeaTable = WeaTableNew.WeaTable;
const { ButtonSelect } = WeaDropdown;
const getLabel = WeaLocaleProvider.getLabel;
const viewDepartment = (id) => {
window.open(`/spa/hrm/engine.html#/hrmengine/organization?showTree=false&isView=1&type=department&id=${id}`);
}
const viewSubCompany = (id) => {
window.open(`/spa/hrm/engine.html#/hrmengine/organization?showTree=false&isView=1&type=subcompany&id=${id}`);
}
window.viewDepartment = viewDepartment;
window.viewSubCompany = viewSubCompany;
@inject('resource')
@inject('datasImport')
@observer
@ -372,6 +383,7 @@ export default class Resource extends React.Component {
let _this = this;
columns.forEach((c, index) => {
c.className = "wea-table-indent"
c.oldWidth = (100 / columns.length).toFixed(2) + '%';
if (c.dataIndex == 'lastname') {
c.render = function (text, record) {
return <a href='javascript:void(0);' onClick={() => {

6
pc4mobx/organization/style/resume.less
View File

@ -37,4 +37,10 @@
left: 44%;
box-shadow: 2px 2px 10px #909090;
background-color: #FFFFFF;
}
.org-personnel-resume {
.wea-left-right-layout-right {
overflow: scroll !important;
}
}