Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/quality/checkType/selectUser.vue

@@ -5,10 +5,10 @@
     :modal= false
     width="1000px"
   >
-    <el-row :gutter="20">
+    <el-row :gutter="10">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px" align="center">
+      <el-form :model="queryParams" ref="queryUserForm" size="small" :inline="true" v-show="showSearch" label-width="80px" align="center">
-        <el-col :span="6" :xs="6">
+        <el-col :span="6">
-          <el-form-item label="员工工号">
+          <el-form-item label="员工工号" prop="userCode">
             <el-input
               v-model="queryParams.userCode"
               placeholder="员工工号"
@@ -19,7 +19,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="员工部门">
+          <el-form-item label="员工部门" prop="deptId">
             <Treeselect
               v-model="queryParams.deptId"
               :options="deptOptions"
@@ -37,7 +37,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="员工姓名">
+          <el-form-item label="员工姓名" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="员工姓名"
@@ -47,7 +47,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item>
             <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>
@@ -147,7 +147,7 @@ export default {
 
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      this.resetForm("queryUserForm");
       this.handleQuery();
     },