2020-11-13

king

2020-11-13 8190d6e5ac14616d85e3992169ecef6d99d03b76

 src/tabviews/commontable/index.jsx

@@ -517,6 +517,10 @@
    let _orderBy = orderBy || setting.order
    let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager)

    if (param.func === 'sPC_Get_TableData') {
      param.menuname = this.props.MenuName || ''
    }

    let result = await Api.genericInterface(param)
    if (result.status) {
      this.setState({
@@ -555,6 +559,10 @@

    let _orderBy = orderBy || setting.order
    let param = UtilsDM.getStatQueryDataParams(setting, statFields, search, _orderBy, BID, this.props.menuType, this.props.dataManager)

    if (param.func === 'sPC_Get_TableData') {
      param.menuname = this.props.MenuName || ''
    }

    Api.genericInterface(param).then(res => {
      if (res.status) {
@@ -821,11 +829,7 @@

  UNSAFE_componentWillReceiveProps(nextProps) {
    if (nextProps.refreshTab && nextProps.refreshTab.MenuID === this.props.MenuID) {
      if (nextProps.refreshTab.position === 'grid') {
        this.reloadtable()
      } else if (nextProps.refreshTab.position === 'view') {
        this.reloadview()
      }
      this.reloadview()
      this.props.refreshTabView('')
    } else if (!is(fromJS(this.props.tabviews), fromJS(nextProps.tabviews))) {
      let selectTab = nextProps.tabviews.filter(tab => tab.selected)[0]
@@ -858,7 +862,7 @@
  }

  render() {
    const { menuType } = this.props
    const { menuType, MenuName } = this.props
    const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, userConfig, tabActive, chartId, search, selectedData } = this.state

    return (
@@ -893,6 +897,7 @@
                      BID={BID}
                      setting={setting}
                      actions={actions}
                      MenuName={MenuName}
                      dict={this.state.dict}
                      MenuID={this.props.MenuID}
                      selectedData={selectedData}
@@ -906,9 +911,9 @@
                    {this.props.menuType !== 'HS' ? <SettingComponent
                      config={config}
                      columns={columns}
                      MenuName={MenuName}
                      dict={this.state.dict}
                      MenuID={this.props.MenuID}
                      MenuName={this.props.MenuName}
                      permAction={this.props.permAction}
                      permRoles={this.props.permRoles}
                      userConfig={this.state.userConfig}
@@ -924,6 +929,7 @@
                      config={config}
                      setting={setting}
                      columns={columns}
                      MenuName={MenuName}
                      pageSize={pageSize}
                      dict={this.state.dict}
                      data={this.state.data}
@@ -948,6 +954,7 @@
                    BID={BID}
                    plot={item}
                    config={config}
                    MenuName={MenuName}
                    tableId="mainTable"
                    data={this.state.data}
                    MenuID={this.props.MenuID}
@@ -967,6 +974,7 @@
                    BID={BID}
                    plot={item}
                    config={config}
                    MenuName={MenuName}
                    data={this.state.data}
                    getexceloutparam={this.getexceloutparam}
                    loading={this.state.loading}