productDev/dmvisit.git

			@@ -6,7 +6,6 @@
			<el-form-item label="" prop="keyword">
			<el-input v-model="searchForm.keyword" placeholder="请输入姓名/手机号/工号" @keypress.enter.native="search"></el-input>
			</el-form-item>

			<el-form-item label="" prop="positionId">
			<el-select v-model="searchForm.positionId" clearable filterable placeholder="岗位">
			<el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
			@@ -61,8 +60,8 @@
			<ul class="toolbar"
			v-permissions="['business:member:delete', 'business:member:create,business:empower:create', 'business:traintime:create']">
			<!--
			<li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">同步</el-button></li>
			-->
			<li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">同步</el-button></li>
			-->
			<li><el-button type="primary"
			@click="$refs.OperaMemberWindow.open('新建员工', null, department, searchForm.companyType)" icon="el-icon-plus"
			v-permissions="['business:member:create']">新建员工</el-button></li>
			@@ -84,7 +83,7 @@
			@click="exportExcel">导出</el-button></li>

			</ul>
			<el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
			<el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
			@selection-change="handleSelectionChange">
			<el-table-column type="selection" width="55"></el-table-column>
			<el-table-column fixed="left" prop="name" label="姓名" min-width="80px">
			@@ -272,9 +271,9 @@
			this.getPositionList()
			},
			mounted() {
			this.$nextTick(() => {
			/* this.$nextTick(() => {
			this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
			})
			})*/
			},
			methods: {
			startEmpowerBatch() {