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

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

@@ -129,7 +129,9 @@
                     v-for="item in lockOptions"
                     :key="item.lockId"
                     :label="item.lockName"
-                    :value="item.lockId">
+                    :value="item.lockId"
+                    :disabled="item.disabled"
+                  >
                     {{item.lockName}}-{{item.lockNum}}
                   </el-option>
                 </el-select>
@@ -143,7 +145,9 @@
                     v-for="item in keyCabinetOptions"
                     :key="item.lockId"
                     :label="item.lockName"
-                    :value="item.lockId">
+                    :value="item.lockId"
+                    :disabled="item.disabled"
+                  >
                     {{item.lockName}}-{{item.lockNum}}
                   </el-option>
                 </el-select>
@@ -581,19 +585,15 @@
       //智能锁选中触发
       lockChange(index,val){
         let self = this;
-        let list=[];
-        val.forEach((item)=>{
-          self.lockOptions.forEach((minItem)=>{
-            if(item == minItem.lockId){
-              list.push({
-                lockName:minItem.lockName,
-                lockId:minItem.lockId,
-                lockNum:minItem.lockNum
-              })
+        this.lockOptions.forEach(v => {
+          v.disabled = false
+          console.log(self.newData.cabinetDoorModelList[index])
+          val.forEach(item=>{
+            if (item ==v.lockId){
+              v.disabled = true
             }
           })
         })
-        this.$set(this.newData.cabinetDoorModelList[index],'cabinetLockListArr',list);
       },
       //钥匙柜选中触发
       cabinetLockChange(index,val){

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

@@ -189,7 +189,7 @@
       //获取数据列表
       getList(){
         let obj = JSON.parse(JSON.stringify(this.queryParams))
-        obj.doorId = this.leftDataList[this.checkType].doorId
+        obj.doorId = this.leftDataList[this.checkType].doorUniqueId
         if(this.dateRangeA[0]){
           obj.openTime = this.dateRangeA[0]+'T00:00:00'
           obj.openEndTime = this.dateRangeA[1]+'T23:59:59'
@@ -197,13 +197,6 @@
           obj.openTime = "";
           obj.openEndTime = "";
         }
-        // if(this.dateRangeB[0]){
-        //   obj.startTimeB = this.dateRangeB[0]+'T00:00:00'
-        //   obj.endTimeB = this.dateRangeB[1]+'T23:59:59'
-        // }else{
-        //   obj.startTimeB = "";
-        //   obj.endTimeB = "";
-        // }
         chemicalLockLogLockList(obj).then(response => {
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);