Merge branch 'base-modify'

src/api/admin/userManagement/index.js

@@ -160,3 +160,21 @@ export function getOne(id) {
     method: 'get',
   });
 }
+
+// 员工变更记录
+export function findPositionChangeRecord(params) {
+  return fetch({
+    url: 'api/admin/postion/admin/findPositionChangeRecord',
+    method: 'get',
+    params: params
+  });
+}
+
+// 员工修改
+export function updUserChange(params) {
+  return fetch({
+    url: 'api/admin/postion/admin/updUserChange',
+    method: 'post',
+    data: params
+  });
+}
\ No newline at end of file

src/router/index.js

@@ -555,12 +555,6 @@ export const asyncRouterMap = [{
       component: _import('userManagement/imCustomerServiceManger/cusomterServiceList'),
       name: '客服列表',
       authority: 'imCustomerServiceManger'
-    },
-    {
-      path: 'employeesInput',
-      component: _import('userManagement/employeesInput'),
-      name: '员工录入',
-      authority: 'employeesInput'
     }
   ]
 },
@@ -794,5 +788,20 @@ export const asyncRouterMap = [{
       authority: 'vehicleStatistics'
 		}
   ]
+},
+{
+  path: '/interior',
+  component: Layout,
+  name: '内部人员管理',
+  icon: 'setting',
+  authority: 'interior',
+  children: [
+    {
+      path: 'employeesInput',
+      component: _import('interior/employeesInput'),
+      name: '员工录入',
+      authority: 'employeesInput'
+    }
+  ]
 }
 ];

src/views/baseInfo/bannerSetting.vue

@@ -260,8 +260,6 @@ export default {
 		 * 操作-编辑
 		 * */
 		handleUpdate(row) {
-      console.log(objDeepCopy);
-      
       this.modalTitle = '编辑'
 			this.form = objDeepCopy(row)
 			this.bannerDialogVisible = true

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
 			}
 		}
 	},