Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

 src/views/febs/system/role/Index.vue

@@ -5,22 +5,21 @@
        <div class="app-container">
          <div class="filter-container">
            <el-input v-model="queryParams.roleName" :placeholder="$t('table.role.roleName')" class="filter-item search-item" />
            <el-button class="filter-item" type="primary" @click="search">
            <el-button class="hr-but-all" type="primary" @click="search">
              {{ $t('table.search') }}
            </el-button>
            <el-button class="filter-item" type="success" @click="reset">
            <el-button class="hr-but-all" type="success" @click="reset">
              {{ $t('table.reset') }}
            </el-button>
            <el-dropdown v-has-any-permission="['role:add','role:delete','role:export']" trigger="click" class="filter-item">
              <el-button>
                {{ $t('table.more') }}<i class="el-icon-arrow-down el-icon--right" />
              </el-button>
              <el-dropdown-menu slot="dropdown">
                <el-dropdown-item v-has-permission="['role:add']" @click.native="add">{{ $t('table.add') }}</el-dropdown-item>
                <el-dropdown-item v-has-permission="['role:delete']" @click.native="batchDelete">{{ $t('table.delete') }}</el-dropdown-item>
                <el-dropdown-item v-has-permission="['role:export']" @click.native="exportExcel">{{ $t('table.export') }}</el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
            <el-button v-has-permission="['role:add']" class="hr-but-all" type="success" @click.native="add">
              {{ $t('table.add') }}
            </el-button>
            <el-button v-has-permission="['role:delete']" type="primary" @click.native="batchDelete">
              {{ $t('table.delete') }}
            </el-button>
            <el-button v-has-permission="['role:export']" class="hr-but-all" type="success" @click.native="exportExcel">
              {{ $t('table.export') }}
            </el-button>
          </div>
          <el-table
            ref="table"
@@ -79,7 +78,6 @@
                <el-tree
                  ref="permsTree"
                  :data="permsTree"
                  :check-strictly="true"
                  show-checkbox
                  accordion
                  node-key="id"
@@ -118,7 +116,7 @@
      queryParams: {},
      sort: {},
      pagination: {
        size: 10,
        size: 15,
        num: 1
      },
      role: this.initRole(),