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

非标bug修复

This commit is contained in:
Chengliang 2024-07-10 16:52:53 +08:00
parent 38f2b63034
commit d64d1d069f
6 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,7 +548,7 @@ export default class Company extends React.Component {
return ( return (
hasRight && <div ref='page' style={{ height: '100%' }}> hasRight && <div ref='page' style={{ height: '100%' }} className = 'organization-scrollable-table'>
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`} <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
datas={this.getDropMenuDatas()} datas={this.getDropMenuDatas()}
onClick={key => this.handleMenuClick(key)} onClick={key => this.handleMenuClick(key)}

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

@ -660,7 +660,7 @@ export default class Department extends React.Component {
return ( return (
hasRight && <div ref='page' style={{ height: '100%' }}> hasRight && <div ref='page' style={{ height: '100%' }} className = 'organization-scrollable-table'>
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`} <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
datas={this.getDropMenuDatas()} datas={this.getDropMenuDatas()}
onClick={key => this.handleMenuClick(key)} onClick={key => this.handleMenuClick(key)}

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

@ -608,7 +608,7 @@ export default class Job extends React.Component {
return ( return (
hasRight && <div ref='page' style={{ height: '100%' }}> hasRight && <div ref='page' style={{ height: '100%' }} className = 'organization-scrollable-table'>
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`} <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
datas={this.getDropMenuDatas()} datas={this.getDropMenuDatas()}
onClick={key => this.handleMenuClick(key)} onClick={key => this.handleMenuClick(key)}

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

@ -499,6 +499,15 @@ export default class Resource extends React.Component {
return true; return true;
} }
getTableWidth = (columns) => {
const columnLength = columns.filter((col)=>col.display === 'true').length;
if(columnLength>10){
return columnLength*150;
}else{
return '100%'
}
}
render() { render() {
@ -513,7 +522,7 @@ export default class Resource extends React.Component {
if (hasRight === false) { if (hasRight === false) {
return renderNoright(); return renderNoright();
} }
const width = tableStore.columns.filter(c => c.display === "true").length * 50;
return ( return (
hasRight && <div ref='page' style={{ height: '100%' }}> hasRight && <div ref='page' style={{ height: '100%' }}>
<WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`} <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
@ -555,7 +564,7 @@ export default class Resource extends React.Component {
needScroll={true} needScroll={true}
getColumns={c => this.reRenderColumns(c)} getColumns={c => this.reRenderColumns(c)}
onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)} onOperatesClick={(record, index, operate) => this.onOperatesClick(record, index, operate)}
tableWidth={width} tableWidth={this.getTableWidth}
/> />
</WeaLeftRightLayout> </WeaLeftRightLayout>
</WeaTop> </WeaTop>

2
pc4mobx/organization/stores/resource.js
View File

@ -600,6 +600,7 @@ export class ResourceStore {
this.customTemplateId = res.data.templateId; this.customTemplateId = res.data.templateId;
} }
bool ? this.setTemplates(res.data.templates) : this.setCustomTemplates(res.data.templates); bool ? this.setTemplates(res.data.templates) : this.setCustomTemplates(res.data.templates);
this.getCustomTransferData();
} else { } else {
message.warning(res.msg); message.warning(res.msg);
} }
@ -727,7 +728,6 @@ export class ResourceStore {
this.search = bool; this.search = bool;
this.searchDialog.loading = true; this.searchDialog.loading = true;
this.getSearchTemplate(bool); this.getSearchTemplate(bool);
this.getCustomTransferData();
} }

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

@ -28,7 +28,8 @@
margin-top: 10px; margin-top: 10px;
} }
.wea-left-right-layout-right { //分部 部门 岗位
.organization-scrollable-table .wea-left-right-layout-right{
overflow: scroll !important; overflow: scroll !important;
} }