9/3 工位基础优化

src/views/basic/collectPoint/userWorkplace.vue

@@ -3,18 +3,24 @@
     <el-card>
       <div>
         <el-form :inline="true" :model="userQuery" size="mini" v-if="showSearch">
-          <el-row :gutter="12">
+          <el-row :gutter="24">
-            <el-col :span="6">
+            <!--<el-col :span="6">-->
-              <el-form-item label="所属部门:">
+            <!--  <el-form-item label="所属部门:">-->
-                <el-input v-model="userQuery.deptName" placeholder="所属部门" clearable></el-input>
+            <!--    <el-input v-model="userQuery.deptName" placeholder="所属部门" clearable></el-input>-->
+            <!--  </el-form-item>-->
+            <!--</el-col>-->
+            <el-col :span="10">
+              <el-form-item label="当前部门:" class="query-form-item">
+                <deptSelect  :value.sync="userQuery.deptCode"/>
+                <!--<deptSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+            <!--<el-col :span="6">-->
-              <el-form-item label="当前仓库:" class="query-form-item">
+            <!--  <el-form-item label="当前仓库:" class="query-form-item">-->
-                <invSelect :value.sync="userQuery.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>
+            <!--    <invSelect :value.sync="userQuery.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
-              </el-form-item>
+            <!--  </el-form-item>-->
-            </el-col>
+            <!--</el-col>-->
-            <el-col :span="6">
+            <el-col :span="10">
               <el-form-item label="账号/名称:">
                 <el-input v-model="userQuery.userKey" placeholder="请输入账号/名称" clearable>
                 </el-input>
@@ -39,7 +45,7 @@
           <el-table-column type="index" label="序号"></el-table-column>
           <el-table-column label="用户账号" prop="userName" width="120"></el-table-column>
           <el-table-column label="用户名称" prop="employeeName" width="120"></el-table-column>
-          <el-table-column label="用户仓库" prop="invName" width="120"></el-table-column>
+          <!--<el-table-column label="用户仓库" prop="invName" width="120"></el-table-column>-->
           <el-table-column label="所属部门" prop="deptName" width="260"></el-table-column>
           <el-table-column label="备注" prop="remark" width="300"></el-table-column>
           <!--<el-table-column label="操作" fixed="right" width="100">-->
@@ -367,7 +373,6 @@ export default {
       userQuery: {
         page: 1,
         limit: 10,
-        invCode: this.$store.getters.locInvCode,
         deptCode: this.$store.getters.locDeptCode,
         key: '',
         userKey: '',
@@ -431,7 +436,6 @@ export default {
         page: 1,
         limit: 10,
         key: '',
-        invCode: this.$store.getters.locInvCode
       }
       this.getUsers()
     },