Merge remote-tracking branch 'origin/master'

k94314517

2024-10-12 51e18e190dafdec70dc1f4a3a9ecd76fb2116726

 admin/src/views/business/relativeMember.vue

@@ -65,8 +65,8 @@
            icon="el-icon-plus" v-permissions="['business:traintime:create']">培训期导入</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
            v-permissions="['business:member:delete']">批量删除</el-button></li>
        <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()"
            icon="el-icon-plus">下发授权</el-button></li>
        <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()">下发授权</el-button></li>
        <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">导出</el-button></li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
        <el-table-column type="selection" width="55"></el-table-column>
@@ -383,6 +383,7 @@

<style lang="scss" scoped>
@import '@/assets/style/variables.scss';

.box {
  width: 100%;
  display: flex;
@@ -399,6 +400,7 @@
    height: 100%;
  }
}

.zhuguan {
  color: $primary-color;
  border: 1px solid $primary-color;