Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-14 680c4f9e4e8b079593c8e57c100b92890e70960d

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

@@ -11,25 +11,25 @@
        class="filter-item search-item date-range-item"
        type="daterange"
      />
      <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-button v-has-permission="['user:add']" class="filter-item" type="success" @click.native="add">
      <el-button v-has-permission="['user:add']" class="hr-but-all" type="success" @click.native="add">
        {{ $t('table.add') }}
      </el-button>
      <el-button v-has-permission="['user:delete']" class="filter-item" type="success" @click.native="batchDelete">
      <el-button v-has-permission="['user:delete']" type="primary" @click.native="batchDelete">
        {{ $t('table.delete') }}
      </el-button>
      <el-button v-has-permission="['user:reset']" class="filter-item" type="success" @click.native="resetPassword">
      <el-button v-has-permission="['user:reset']" class="hr-but-all" type="success" @click.native="resetPassword">
        {{ $t('table.resetPassword') }}
      </el-button>
      <el-button v-has-permission="['user:export']" class="filter-item" type="success" @click.native="exportExcel">
      <el-button v-has-permission="['user:export']" class="hr-but-all" type="success" @click.native="exportExcel">
        {{ $t('table.export') }}
      </el-button>
      <el-button class="filter-item" icon="el-icon-download" type="primary" plain @click="templateDownload">
      <el-button class="hr-but-all" type="primary" @click="templateDownload">
        {{ $t('table.templateDownload') }}
      </el-button>
      <el-upload
@@ -43,7 +43,7 @@
        :on-error="uploadError"
        :on-progress="uploadProgress"
      >
        <el-button v-has-permission="['user:import']" class="filter-item" icon="el-icon-upload2" type="success" plain>
        <el-button v-has-permission="['user:import']" class="hr-but-all" icon="el-icon-upload2" type="success" plain>
          {{ $t('table.import') }}
        </el-button>
      </el-upload>
@@ -83,7 +83,7 @@
          <span>{{ scope.row.username }}</span>
        </template>
      </el-table-column>
      <el-table-column label="员工姓名" prop="nickName" :show-overflow-tooltip="true" align="center" min-width="120px">
      <el-table-column label="姓名" prop="nickName" :show-overflow-tooltip="true" align="center" min-width="120px">
        <template slot-scope="scope">
          <span>{{ scope.row.nickName }}</span>
        </template>