dedsudiyu 5 mesiacov pred
rodič
commit
4d72ff7256

+ 5 - 3
src/views/integratedManagement/laboratoryManagement/subject/addSubject.vue

@@ -161,6 +161,7 @@
                     :key="item.userId"
                     :label="item.userName"
                     :value="item.userId">
+                    {{item.userName}}-{{item.account}}
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -182,6 +183,7 @@
                     :key="item.userId"
                     :label="item.userName"
                     :value="item.userId">
+                    {{item.userName}}-{{item.account}}
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -498,7 +500,7 @@ import { chemicalMsdsEdit } from '@/api/chemicalManage'
         },
         //查询学院下拉列表
         getDeptDropList(){
-          getDeptDropList({deptName:'',level:2,deptType:''}).then(response => {
+          getDeptDropList({deptName:'',level:2,deptType:1}).then(response => {
             this.$set(this,'deptOptions',response.data);
           });
         },
@@ -724,7 +726,7 @@ import { chemicalMsdsEdit } from '@/api/chemicalManage'
         /** 下列人员-懒加载 */
         userSelectList(query) {
           if (query !== '' && query.length>1) {
-            systemUserDropAuthList({"userName":query,'userType':'1'}).then(response => {
+            systemUserDropAuthList({"nameOrAccount":query,'userType':'1'}).then(response => {
               this.$set(this,'optionsUser',response.data);
             });
           } else {
@@ -733,7 +735,7 @@ import { chemicalMsdsEdit } from '@/api/chemicalManage'
         },
         userSelectListOne(query) {
           if (query !== '' && query.length>1) {
-            systemUserDropAuthList({"userName":query,'userType':''}).then(response => {
+            systemUserDropAuthList({"nameOrAccount":query,'userType':''}).then(response => {
               this.$set(this,'optionsUserOne',response.data);
             });
           } else {

+ 2 - 2
src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -14,7 +14,7 @@
               />
             </el-form-item>
             <el-form-item label="" prop="deptId">
-              <el-select v-model="queryParams.deptId" placeholder="二级单位" style="width:140px;">
+              <el-select v-model="queryParams.deptId" filterable placeholder="二级单位" style="width:140px;">
                 <el-option
                   v-for="dict in deptOptions"
                   :key="dict.deptId"
@@ -24,7 +24,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="" prop="buildId">
-              <el-select v-model="queryParams.buildId" placeholder="楼栋" style="width:140px;">
+              <el-select v-model="queryParams.buildId" filterable placeholder="楼栋" style="width:140px;">
                 <el-option
                   v-for="dict in buildOptions"
                   :key="dict.id"