Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

9 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/position.vue

@@ -1,5 +1,5 @@
<template>
  <TableLayout :permissions="['business:member:query']">
  <TableLayout :permissions="['business:position:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
      <el-form-item label="" prop="name">
@@ -17,6 +17,7 @@
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:position:delete']">批量删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
          v-loading="isWorking.search"
          :data="tableData.list"
          stripe
@@ -24,6 +25,7 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="岗位" min-width="200px"></el-table-column>
        <el-table-column prop="memberNum" label="员工数" min-width="200px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码"  min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" min-width="200px"></el-table-column>
        <el-table-column
@@ -56,14 +58,14 @@
import Pagination from '@/components/common/Pagination'
import OperaPositionWindow from '@/components/business/OperaPositionWindow'
export default {
  name: 'areaSet',
  name: 'userPosition',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaPositionWindow },
  data () {
    return {
      // 搜索
      searchForm: {
        title: ''
        name: ''
      }
    }
  },