Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/views/admin/system/user/index.vue

@@ -34,6 +34,11 @@
 				<div class="layout-padding-auto layout-padding-view">
 					<el-row v-show="showSearch">
 						<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+							<el-form-item label="用户" prop="userIds">
+								<div style="width: 180px">
+									<select-user v-model="state.queryForm.userIds" clearable />
+								</div>
+							</el-form-item>
 							<el-form-item :label="$t('sysuser.username')" prop="username">
 								<el-input v-model="state.queryForm.username" :placeholder="$t('sysuser.inputUsernameTip')" clearable />
 							</el-form-item>
@@ -46,6 +51,7 @@
 							</el-form-item>
 						</el-form>
 					</el-row>
+
 					<el-row>
 						<div class="mb8" style="width: 100%">
 							<el-button v-auth="'sys_user_add'" icon="folder-add" type="primary" @click="userDialogRef.openDialog()">