Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/qiaobi into dev

src/views/backStageManage/organization/department/components/department.vue

@@ -3,7 +3,7 @@
       <el-container>
         <el-header>
           <div class="header">
-            <el-form :inline="true">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
               <el-form-item label="部门名称:" prop="name">
                 <el-input v-model="queryParams.name" placeholder="请输入部门名称"/>
               </el-form-item>

src/views/backStageManage/organization/personnel/components/personnel.vue

@@ -3,12 +3,12 @@
       <el-container>
         <el-header>
           <div class="header">
-            <el-form :inline="true">
+            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true"  >
               <el-form-item label="姓名:" prop="name">
                 <el-input v-model="queryParams.name" placeholder="请输入"/>
               </el-form-item>
-              <el-form-item class="tenant">
-        		<el-select v-model="queryParams.tenant"  @change="getList" clearable placeholder="根据租户查询">
+              <el-form-item label="所属租户:" class="tenant">
+        		<el-select v-model="queryParams.tenant" @change="getList" clearable placeholder="根据租户查询">
 					<el-option
 						v-for="item in tenantList"
 						:key="item.id"