companyProjecet.git

			@@ -40,12 +40,13 @@
			<span>{{ scope.row.position_name }}</span>
			</template>
			</el-table-column>
			<el-table-column prop="supplier_name" label="所在单位/企业"></el-table-column>
			<el-table-column prop="create_time" label="入会时间" width="140"></el-table-column>
			<el-table-column fixed="right" label="操作" width="120">
			<template slot-scope="scope">
			<div>
			<!-- <el-button @click="EditClick(scope.row)" type="text" size="small" v-auth="'/branch/branch/member'">修改</el-button> -->
			<el-button @click="delClick(scope.row)" type="text" size="small" v-auth="'/branch/branch/member'">删除</el-button>
			<el-button @click="EditClick(scope.row)" type="text" size="small">修改</el-button>
			<el-button @click="delClick(scope.row)" type="text" size="small">删除</el-button>
			</div>
			</template>
			</el-table-column>
			@@ -68,7 +69,7 @@
			<!--添加-->
			<Add v-if="open_add" :open_add="open_add" :positionList="positionList" @close="closeDialogFunc($event, 'add')"></Add>
			<!--编辑-->
			<!-- <Edit :open_edit="open_edit" :userModel="userModel" @close="closeDialogFunc($event, 'edit')"></Edit> -->
			<Edit v-if="open_edit" :open_edit="open_edit" :formData="userModel" :positionList="positionList" @close="closeDialogFunc($event, 'edit')"></Edit>

			</div>
			</template>
			@@ -76,11 +77,11 @@
			<script>
			import { deepClone } from '@/utils/base.js'
			import BranchApi from '@/api/branch.js';
			// import Edit from './dialog/editMember.vue';
			import Edit from './dialog/editMember.vue';
			import Add from './dialog/addMember.vue';
			export default {
			components: {
			// Edit,
			Edit,
			Add
			},
			data() {
			@@ -115,6 +116,7 @@
			},
			created() {
			/获取列表/
			this.getPosition();
			this.getData();
			},
			methods: {