样式修改

src/common/less/public.less

@@ -150,4 +150,8 @@ i {
 }
 .fr{
   float: right;
+}
+
+.super .el-form-item{
+  margin-bottom: 0;
 }

src/components/permissions/user/index.vue

@@ -4,9 +4,11 @@
       :model="queryParams"
       ref="queryForm"
       :inline="true"
-      label-width="68px"
+      label-width="60px"
     >
-      <el-form-item label="账号" prop="loginName">
+    <el-row class="super">
+      <el-col :span="6">
+        <el-form-item label="账号" prop="loginName">
         <el-input
           v-model="queryParams.loginName"
           placeholder="请输入账号"
@@ -15,60 +17,57 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="用户名" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入用户名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门" prop="org">
-        <el-input
-          v-model="queryParams.org"
-          placeholder="请输入部门"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="地区" prop="areaId2">
-        <el-cascader
-          v-model="queryParams.areaId2"
-          placeholder="请选择省份/地市/区县"
-          :options="cityList"
-          @change="areaIdChange"
-          clearable
-          :props="{ checkStrictly: true }"
-          size="small"
-        ></el-cascader>
-        <!-- <el-select
-          v-model="queryParams.areaId"
-          placeholder="请选择省份/地市/区县"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in cityList"
-            :key="dict.system"
-            :label="dict.systemName"
-            :value="dict.system"
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="用户名" prop="userName">
+          <el-input
+            v-model="queryParams.userName"
+            placeholder="请输入用户名"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
           />
-        </el-select> -->
-      </el-form-item>
-      <el-form-item style="float: right">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="部门" prop="org">
+          <el-input
+            v-model="queryParams.org"
+            placeholder="请输入部门"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label="地区" prop="areaId2">
+          <el-cascader
+            v-model="queryParams.areaId2"
+            placeholder="请选择省份/地市/区县"
+            :options="cityList"
+            @change="areaIdChange"
+            clearable
+            :props="{ checkStrictly: true }"
+            size="small"
+          ></el-cascader>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item  class="fr">
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-col>
+    </el-row>
     </el-form>
     <el-row :gutter="10" class="marginBottom10">
       <el-col :span="1.5">
@@ -770,4 +769,5 @@ export default {
 .marginTop-20 {
   margin-top: -20px;
 }
+
 </style>