productDev/dmvisit.git

			@@ -6,34 +6,31 @@
			<el-input v-model="searchForm.keyword" placeholder="请输入姓名/手机号/工号" @keypress.enter.native="search"></el-input>
			</el-form-item>
			<el-form-item label="" prop="hasFace">
			<el-select v-model="searchForm.hasFace" @keypress.enter.native="search" placeholder="是否有人脸">
			<el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="是否有人脸">
			<el-option label="无" value="0"></el-option>
			<el-option label="有" value="1"></el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="" prop="canVisit">
			<el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="可拜访">
			<el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="可拜访">
			<el-option label="是" value="1"></el-option>
			<el-option label="否" value="0"></el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="" prop="status">
			<el-select v-model="searchForm.status" @keypress.enter.native="search" placeholder="状态">
			<el-select v-model="searchForm.status" @keypress.enter.native="search" clearable placeholder="状态">
			<el-option label="正常" value="0"></el-option>
			<el-option label="禁用" value="1"></el-option>
			<el-option label="拉黑/冻结" value="2"></el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="" prop="hkStatus">
			<el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="海康同步状态">
			<el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="海康同步状态">
			<el-option label="待同步" value="0"></el-option>
			<el-option label="同步成功" value="1"></el-option>
			<el-option label="同步失败" value="2"></el-option>
			</el-select>
			</el-form-item>
			<el-form-item label="" >
			<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" >是否包含下级组织</el-checkbox>
			</el-form-item>
			<section>
			<el-button type="primary" @click="search">搜索</el-button>
			<el-button @click="reset">重置</el-button>
			@@ -52,9 +49,12 @@
			<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>
			<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('人员导入',department,searchForm.companyType)" icon="el-icon-plus" v-permissions="['business:member:create']">人员导入</el-button></li>
			<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('人员导入',searchForm.companyType)" icon="el-icon-plus" v-permissions="['business:member: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 style="float: right">
			<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1" @change="search" >是否包含下级组织</el-checkbox>
			</li>
			</ul>
			<el-table
			v-loading="isWorking.search"
			@@ -170,7 +170,7 @@
			<el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">取消主管</el-button>
			<el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row,1)" v-if="row.headStatus == 0" v-permissions="['business:member:head']">设为主管</el-button>
			<el-button type="text" icon="el-icon-plus" @click="empower(row.id)" v-permissions="['business:empower:create']">重新授权</el-button>
			<el-button type="text" icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">删除</el-button>
			<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:member:delete']">删除</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -183,6 +183,7 @@
			<!-- 查看人员开卡记录 -->
			<cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
			<OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
			<OperaMemberImportWindow ref="OperaMemberImportWindow" @success="handlePageChange" />
			<OperaMemberRoleWindow ref="OperaMemberRoleWindow" @success="handlePageChange" />
			</template>
			</TableLayout1>
			@@ -196,12 +197,13 @@
			import Tree from '@/components/common/Tree'
			import OperaMemberWindow from '@/components/business/OperaMemberWindow'
			import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
			import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
			import { fetchList } from '@/api/business/company'
			import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
			export default {
			name: 'internalMember',
			extends: BaseTable,
			components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow },
			components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow ,OperaMemberImportWindow},
			data () {
			return {
			TreeList: [],
			@@ -371,7 +373,6 @@
			.catch(() => {})
			},
			callback (row) {
			alert(row.name)
			console.log(row)
			this.searchForm.erpOrgId = row.erpId
			this.searchForm.companyId = row.id