dedsudiyu 2 lat temu
rodzic
commit
738c09511b

+ 8 - 0
src/api/laboratory/electronicInformationBoard.js

@@ -1,6 +1,14 @@
 import request from '@/utils/request'
 
 
+//获取实验室列表
+export function getSubList(query) {
+  return request({
+    url: '/laboratory/subject/cardInfo/subList',
+    method: 'get',
+    params: query
+  })
+}
 //获取信息牌列表
 export function XxpCardInfoList(query) {
   return request({

+ 1 - 0
src/views/comprehensive/personnel/onDutyConfiguration/infoPage.vue

@@ -80,6 +80,7 @@
         getInfoByDate(obj).then(response => {
           this.loading = false;
           if(response.rows[0]){
+            this.$set(this,'total',response.total);
             this.$set(this,'listData',response.rows);
           }else{
             this.outButton();

+ 59 - 42
src/views/emergencyManagement/electronicInformationBoard/index.vue

@@ -80,9 +80,7 @@
             filterable
             remote
             clearable
-            @focus="selectFocus"
             reserve-keyword
-            @clear="clearClick"
             placeholder="输入关键字检索选择"
             :remote-method="getSelectList"
             @change="selectChange"
@@ -114,8 +112,8 @@
 </template>
 
 <script>
-  import { XxpCardInfoList,XxpCardInfo,XxpCardInfoPut,XxpCardInfoDelete } from "@/api/laboratory/electronicInformationBoard";
-  import { filterDept,getSubList } from "@/api/medicUniversity-3_1/index";
+  import { XxpCardInfoList,XxpCardInfo,XxpCardInfoPut,XxpCardInfoDelete,getSubList } from "@/api/laboratory/electronicInformationBoard";
+  // import { filterDept,getSubList } from "@/api/medicUniversity-3_1/index";
   import {listDepartments} from "@/api/system/dept";
   export default {
     name: 'index',
@@ -158,7 +156,8 @@
     },
     created(){
       this.getDeptListTow();
-      this.filterDept();
+      // this.getSubList();
+      // this.filterDept();
       this.getList();
     },
     mounted(){
@@ -199,29 +198,46 @@
             location:row.location,
             isStart:row.isStart,
           });
+          this.getSelectList(row.subjectName,row.subjectId);
         }
         this.$set(this,'addDialogType',true);
       },
-      //查询当前院系
-      filterDept(){
-        filterDept().then(response => {
-          let idText = "";
-          for(let i=0;i<response.data.length;i++){
-            if(i==0){
-              idText = idText + response.data[i].deptId;
-            }else{
-              idText = idText +','+ response.data[i].deptId;
-            }
+      getSelectList(val,id){
+        if(val||id){
+          let obj = {}
+          if(id){
+            obj.id = id;
           }
-          //查询院系下实验室
-          getSubList(idText).then(response => {
-            //当前列表
-            this.selectList = JSON.parse(JSON.stringify(response.data));
-            //原始列表数据
-            this.selectListData = JSON.parse(JSON.stringify(response.data));
-          });
-        });
+          if(val){
+            obj.name = val.slice(0,30);
+          }
+          getSubList(obj).then(response => {
+            this.$set(this,'selectList',response.data);
+          })
+        }else{
+          this.$set(this,'selectList',[]);
+        }
       },
+      //查询当前院系
+      // filterDept(){
+      //   filterDept().then(response => {
+      //     let idText = "";
+      //     for(let i=0;i<response.data.length;i++){
+      //       if(i==0){
+      //         idText = idText + response.data[i].deptId;
+      //       }else{
+      //         idText = idText +','+ response.data[i].deptId;
+      //       }
+      //     }
+      //     //查询院系下实验室
+      //     getSubList(idText).then(response => {
+      //       //当前列表
+      //       this.selectList = JSON.parse(JSON.stringify(response.data));
+      //       //原始列表数据
+      //       this.selectListData = JSON.parse(JSON.stringify(response.data));
+      //     });
+      //   });
+      // },
       //实验室选中
       selectChange(id){
         let self = this;
@@ -231,26 +247,27 @@
           }
         }
       },
-      /** 实验室-本地懒加载 */
-      getSelectList(val) {
-        let self = this;
-        let list = [];
-        for(let i=0;i<self.selectListData.length;i++){
-          if(self.selectListData[i].name.indexOf(val) != -1){
-            list.push(self.selectListData[i]);
-          }
-        }
-        this.selectList = JSON.parse(JSON.stringify(list))
-      },
+      // /** 实验室-本地懒加载 */
+      // getSelectList(val) {
+      //   let self = this;
+      //   let list = [];
+      //   for(let i=0;i<self.selectListData.length;i++){
+      //     if(self.selectListData[i].name.indexOf(val) != -1){
+      //       list.push(self.selectListData[i]);
+      //     }
+      //   }
+      //   this.selectList = JSON.parse(JSON.stringify(list))
+      // },
       //实验室选中清除
-      clearClick(){
-        this.selectList = JSON.parse(JSON.stringify(this.selectListData))
-      },
-      selectFocus(){
-        if(!this.selectList[0]){
-          this.filterDept();
-        }
-      },
+      // clearClick(){
+      //   this.selectList = JSON.parse(JSON.stringify(this.selectListData))
+      // },
+      // selectFocus(){
+      //   if(!this.selectList[0]){
+      //     // this.filterDept();
+      //     this.getSubList();
+      //   }
+      // },
       submitForm(){
         this.$refs["form"].validate((valid) => {
           if (valid) {