diff --git a/src/components/drawer/index.jsx b/src/components/drawer/index.jsx index d5446f9..1d6e01e 100644 --- a/src/components/drawer/index.jsx +++ b/src/components/drawer/index.jsx @@ -32,7 +32,7 @@ export default class DrawerComponents extends React.Component { dataSource: [], columns: [], spinning: true, - showJob: false, + showJob: false, //港湾二开 不显示岗位 }; } @@ -70,8 +70,8 @@ export default class DrawerComponents extends React.Component { } //获取数据 - getDeatilDatas(params, type = 'chart', showJob = '1') { - this.setState({ spinning: true, data: [], dataSource: [] }); + getDeatilDatas(params, type = 'chart', showJob = '0') { + this.setState({ spinning: true }); d3.json( '/api/bs/hrmorganization/orgchart/getDepartmentDetail?' + qs.stringify({ detauleType: type, ...params, showJob }), @@ -325,18 +325,21 @@ export default class DrawerComponents extends React.Component { }; showDrawer = (params) => { - this.getDeatilDatas(params, 'chart', '0'); + //港湾二开 不显示岗位 + const showJob = '0'; + this.getDeatilDatas(params, 'chart', showJob); this.setState({ open: true, params: params }); }; onClose = () => { this.setState({ open: false, detailType: 'chart', showJob: false }); + this.setState({ open: false, detailType: 'chart', showJob: false }); }; changeDetail = () => { const { detailType, params } = this.state; let type = detailType == 'chart' ? 'table' : 'chart'; - const showJob = this.state.showJob ? '1' : '0'; + const showJob = '0'; this.setState({ detailType: type, }); @@ -378,25 +381,6 @@ export default class DrawerComponents extends React.Component { }} extra={ - {detailType == 'chart' && params && params.fclass == '0' && ( - { - this.setState({ - showJob: e.target.checked, - }); - - this.getDeatilDatas( - params, - detailType, - e.target.checked ? '1' : '0', - ); - }} - > - {getLabel(547447, labelData)} - - )} diff --git a/src/components/topBar/index.jsx b/src/components/topBar/index.jsx index baec137..bcf53ad 100644 --- a/src/components/topBar/index.jsx +++ b/src/components/topBar/index.jsx @@ -305,7 +305,7 @@ export class TopBar extends React.Component { -