Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/api/chemicalManage/index.js

@@ -226,6 +226,14 @@ export function chemicalStockGetStockByDoorId(query) {
     params: query
   })
 }
+//化学品柜-过滤柜锁
+export function chemicalCabinetGetLockList(query) {
+  return request({
+    url: '/chemical/cabinet/getLockList',
+    method: 'get',
+    params: query
+  })
+}
 //化学品柜-删除
 export function chemicalCabinetDelete(data) {
   return request({

src/views/chemicalManage/basicManagement/chemicalsCabinetManage/addPage.vue

@@ -175,7 +175,7 @@
   import { getDeptDropList, systemUserSelect,iotDeviceFindByType } from '@/api/commonality/permission'
   import { laboratorySubRelInfoGetRelList } from '@/api/commonality/noPermission'
   import {
-    chemicalCabinetAdd,
+    chemicalCabinetAdd, chemicalCabinetGetLockList,
     chemicalCabinetUpdate,
     chemicalStockGetStockByDoorId
   } from '@/api/chemicalManage'
@@ -300,6 +300,8 @@
         //实验室管理员数据
         safeList:[],
         safeIdList:[],
+        //过滤柜锁
+        filterCabinetLock:[],
       }
     },
     created(){
@@ -308,6 +310,7 @@
     mounted(){
       let self=this;
       this.getDeptDropList();
+      this.chemicalCabinetGetLockList();
 
     },
     methods:{
@@ -450,6 +453,12 @@
           }
         })
       },
+      //化学品柜-过滤柜锁
+      chemicalCabinetGetLockList(){
+        chemicalCabinetGetLockList({}).then(response => {
+          this.$set(this, 'filterCabinetLock', response.data)
+        });
+      },
       //查询学院列表
       getDeptDropList(){
         getDeptDropList({deptName:"",level:2,deptType:1}).then(response => {
@@ -575,7 +584,7 @@
       },
       //查询智能锁列表
       iotDeviceFindByType(subId){
-        iotDeviceFindByType({subjectId:subId,typeKeyList:['cabinetLock']}).then(response => {
+        iotDeviceFindByType({subjectId:subId,typeKeyList:['cabinetLock'],ids:this.filterCabinetLock}).then(response => {
           let list=[];
           response.data.forEach(function(item) {
             list.push({lockName:item.deviceName,lockId:item.id,lockNum:item.deviceNo})