Merge branch '3.3.4-kdyh' into 3.3.3-AnQuanJianCha

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/associatedCabinetLock.vue

@@ -6,7 +6,7 @@
         <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
       </div>
       <div class="associatedCabinetLock-min-page">
-        <el-form ref="form" :model="form" label-width="0px">
+        <el-form style="flex: 1;flex-direction: column;display: flex;overflow: hidden;" ref="form" :model="form" label-width="0px">
           <el-table  border :data="tableList" ref="multipleTable">
           <el-table-column label="柜锁编号" align="center" prop="hardwareNum" width="300px"/>
           <el-table-column label="柜锁名称" align="center" prop="name" width="200px"/>