diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js index 71ddb6c..022557c 100644 --- a/pc4mobx/organization/components/company/company.js +++ b/pc4mobx/organization/components/company/company.js @@ -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 {record.showOrder.toFixed(2)} + } + } + if (c.dataIndex == 'canceled') { c.render = function (text, record) { return _this.updateForbiddenTag(checked, record.id)} /> diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js index f1d465a..f1e845c 100644 --- a/pc4mobx/organization/components/department/department.js +++ b/pc4mobx/organization/components/department/department.js @@ -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 {record.showOrder.toFixed(2)} + } + } + if (c.dataIndex == 'canceled') { c.render = function (text, record) { return _this.updateForbiddenTag(checked, record.id)} /> diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js index 31e035d..4993f62 100644 --- a/pc4mobx/organization/components/job/Job.js +++ b/pc4mobx/organization/components/job/Job.js @@ -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 {record.showOrder.toFixed(2)} + } + } if (c.dataIndex == 'forbiddenTag') { c.render = function (text, record) { return _this.updateForbiddenTag(checked, record.id)} /> diff --git a/pc4mobx/organization/components/log/LogView.js b/pc4mobx/organization/components/log/LogView.js index 5231603..c34a154 100644 --- a/pc4mobx/organization/components/log/LogView.js +++ b/pc4mobx/organization/components/log/LogView.js @@ -143,12 +143,11 @@ export default class LogView extends React.Component { const btn = [ (), + logViewStore.getTableInfo(); this.setState({ showSearchAd: false }) + }}>{i18n.button.search()}), (), (), ]; - 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() :
} buttonsAd={this.getTabBtn()} diff --git a/pc4mobx/organization/components/resource/PersonnelResume.js b/pc4mobx/organization/components/resource/PersonnelResume.js index 28b81f1..78a0f12 100644 --- a/pc4mobx/organization/components/resource/PersonnelResume.js +++ b/pc4mobx/organization/components/resource/PersonnelResume.js @@ -326,7 +326,7 @@ export default class PersonnelResume extends React.Component { dropMenuDatas={this.getDropMenuDatas()} onDropMenuClick={(e) => this.handleMenuClick(e)} > - + { !this.isEmptyObject(resumeList) ?
diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js index 493f622..ebdf177 100644 --- a/pc4mobx/organization/components/resource/ResourceCard.js +++ b/pc4mobx/organization/components/resource/ResourceCard.js @@ -263,7 +263,6 @@ export default class ResourceCard extends React.Component {
- { data.buttons.slice(0,3).map((item,index) => { return ( diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js index f844268..6226e9e 100644 --- a/pc4mobx/organization/components/resource/resource.js +++ b/pc4mobx/organization/components/resource/resource.js @@ -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 { diff --git a/pc4mobx/organization/style/resume.less b/pc4mobx/organization/style/resume.less index 419010e..d016b2a 100644 --- a/pc4mobx/organization/style/resume.less +++ b/pc4mobx/organization/style/resume.less @@ -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; + } } \ No newline at end of file