Merge branch 'master' into bms

king

2021-01-15 76a4300654a18d228838c3f27455dc8e7a8cd616

 src/tabviews/verupmanage/subtabtable/index.jsx

@@ -12,12 +12,13 @@
import { buttonConfig, tabConfig } from '../config'
import MKEmitter from '@/utils/events.js'

import asyncComponent from '@/utils/asyncComponent'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import SubAction from '../actionList'
import SubSearch from '../topSearch'

import './index.scss'

const MainSearch = asyncComponent(() => import('@/tabviews/zshare/topSearch'))
const SubTable = asyncSpinComponent(() => import('@/tabviews/zshare/normalTable'))

class VerupSubTabViewTable extends Component {
@@ -112,8 +113,10 @@
            subcols.push(colMap.get(sub))
          }
        })
        _col.subcols = subcols
        _columns.push(_col)
        if (subcols.length > 0) {
          _col.subcols = subcols
          _columns.push(_col)
        }
      } else {
        _columns.push(col)
      }
@@ -180,6 +183,7 @@
      this.setState({
        data: result.data.map((item, index) => {
          item.key = index
          item.$$BID = _BID || ''
          return item
        }),
        total: result.total,
@@ -439,12 +443,8 @@

    return (
      <div className="verup-subtable" id={'subtable' + this.props.MenuID}>
        {searchlist && searchlist.length > 0 ?
          <SubSearch
            dict={this.state.dict}
            searchlist={searchlist}
            refreshdata={this.refreshbysearch}
          /> : null
        {searchlist && searchlist.length ?
          <MainSearch searchlist={searchlist} menuType="HS" refreshdata={this.refreshbysearch}/> : null
        }
        {actions ?
          <div className="sub-action">