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/resource.js b/pc4mobx/organization/components/resource/resource.js index 08a5120..6226e9e 100644 --- a/pc4mobx/organization/components/resource/resource.js +++ b/pc4mobx/organization/components/resource/resource.js @@ -383,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 {