扫码弹窗问题

src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp

@@ -42,10 +42,10 @@
 <%--                            </div>--%>
 <%--                        </div>--%>
                         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">
-                            <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名代码：">品名代码：</label>
+                            <label class="label-item single-overflow col-md-4 col-lg-4 control-label" title="品名：">品名：</label>
                             <div class="col-lg-8 col-md-8">
                                 <sys:treeselect id="type" name="goodsInfo.type.id" value="${qrCode.goodsInfo.type.id}" labelName="goodsInfo.type.name" labelValue="${qrCode.goodsInfo.type.name}"
-                                                title="品名代码" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" />
+                                                title="品名" url="/warehouse/materialtype/materialType/treeData" cssClass="form-control" allowClear="true" allowSearch="true" />
                             </div>
                         </div>
                         <div class="col-xs-12 col-sm-6 col-md-4 col-lg-2">

src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp

@@ -451,6 +451,10 @@
                 // $("#scanResult").focus();
                 scanStart();
                 renderScanTable();
+                setTimeout(function () {
+                    var height = layer.height();
+                    layer.find('.layui-layer-content').height(height - 97);
+                })
             },
             yes: function (index, layero) {
                 var selectTableData = getSelectScanTable();