Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/conference/apply/applyList.vue

@@ -7,6 +7,9 @@
 			<el-form-item label="手机号">
 				<el-input v-model="listQuery.phone" placeholder="请输入手机号" clearable style="width:200px"></el-input>
 			</el-form-item>
+			<el-form-item label="上级手机号">
+				<el-input v-model="listQuery.parentPhone" placeholder="请输入上级手机号" clearable style="width:200px"></el-input>
+			</el-form-item>
 
 			<el-button type="primary" @click="search">搜索</el-button>
 			<el-button type="primary" @click="clearSearch">清空搜索</el-button>
@@ -27,6 +30,9 @@
 			</el-table-column>
 			<el-table-column prop="userName" label="姓名" align="center"></el-table-column>
 			<el-table-column prop="phone" label="电话" align="center"></el-table-column>
+			<el-table-column prop="positionName" label="身份" align="center"></el-table-column>
+			<el-table-column prop="parentName" label="上级姓名" align="center"></el-table-column>
+			<el-table-column prop="parentPhone" label="上级电话" align="center"></el-table-column>
 			<el-table-column prop="ticketNum" label="人数" align="center"></el-table-column>
 			<el-table-column prop="crtTime" label="报名时间" align="center"></el-table-column>
 		</el-table>
@@ -62,7 +68,8 @@ export default {
 				startTime: null,
 				endTime: null,
 				phone: null,
-				activityId: 2
+				activityId: 2,
+				parentPhone:null
 			}
 		}
 	},