Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/school/sysuser.vue

@@ -70,10 +70,14 @@
       </div>
       <div class="page-option">
         <q-btn color="accent" class="q-mr-md" icon="add" label="新增管理者" @click="EditManager(null)" />
+        <q-select filled v-model="checkedOP" stack-label option-value="Id" option-label="Name" style="margin-top:20px;"
+           ref="LeaveStatus" :options="operationList" label="更多" :dense="false"
+          class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
       </div>
     </div>
     <div class="page-content">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        selection="multiple" :selected.sync="selected" :selected-rows-label="getSelectedString"
         class="sticky-right-column-table sticky-tow-column-table" separator="none" title="员工管理" :data="data"
         :columns="columns" row-key="name">
         <template v-slot:body-cell-UserIcon="props">
@@ -172,6 +176,11 @@
       return {
         currentUrl: "",
         columns: [{
+            name: 'desc',
+            required: true,
+            label: '',
+            align: 'left',
+          },{
             name: 'UserIcon',
             label: '',
             field: 'UserIcon',
@@ -282,6 +291,21 @@
         dateListOne: [], //入职-离职日期
         dateListTwo: [], //生日开始-结束日期
         dateListThree:[], //开始-结束离职日期
+        operationList:[{  //更多操作
+          Id:0,
+          Name:'离职'
+        },{
+          Id:1,
+          Name:'重置密码'
+        },{
+          Id:2,
+          Name:'调岗'
+        },{
+          Id:3,
+          Name:'调部门'
+        }],
+        checkedOP:0, //选中
+        selected: [],
       }
     },
     mounted() {
@@ -509,6 +533,10 @@
             this.LeaveStatusList = res.Data;
           }
         })
+      },
+      getSelectedString(){
+        console.log(this.selected,'selected');
+        return this.selected.length === 0 ? '' : `${this.selected.length} record${this.selected.length > 1 ? 's' : ''} selected of ${this.data.length}`
       }
     },
   }