Skip to content

W
warehouse
Commit 9eb650aa by anxiaohe
Options

重置按钮

parent 75d1c166
Showing with 8 additions and 6 deletions
src/main/java/com/jeeplus/modules/warehouse/storage/web/StorageController.java
...@@ -285,8 +285,9 @@ public class StorageController extends BaseController { ...@@ -285,8 +285,9 @@ public class StorageController extends BaseController {
Page<StorageInfo> page = storageService.findByPcTypeModel(new Page<QrCode>(request, response), storageInfo); Page<StorageInfo> page = storageService.findByPcTypeModel(new Page<QrCode>(request, response), storageInfo);
return getBootstrapData(page); return getBootstrapData(page);
} else { } else {
return null; Page<StorageInfo> page = storageService.findByPcTypeModel(new Page<QrCode>(request, response), storageInfo);
return getBootstrapData(page);
} }
} }
} }
\ No newline at end of file
src/main/webapp/webpage/include/anihead.jsp
...@@ -61,4 +61,4 @@ ...@@ -61,4 +61,4 @@
<script type="text/javascript">var ctx = '${ctx}', ctxStatic='${ctxStatic}';</script> <script type="text/javascript">var ctx = '${ctx}', ctxStatic='${ctxStatic}';</script>
<link rel="stylesheet" id="theme" href="${ctxStatic}/common/css/app-${cookie.theme.value==null?'blue':cookie.theme.value}.css" /> <link rel="stylesheet" id="theme" href="${ctxStatic}/common/css/app-${cookie.theme.value==null?'blue':cookie.theme.value}.css" />
<script src="${ctxStatic}/common/js/jeeplus.js"></script> <script src="${ctxStatic}/common/js/jeeplus.js"></script>
<script src="${ctxStatic}/common/js/LodopFuncs.js"></script> <%--<script src="${ctxStatic}/common/js/LodopFuncs.js"></script>--%>
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js
...@@ -560,6 +560,8 @@ function getScanData (params, callback) { ...@@ -560,6 +560,8 @@ function getScanData (params, callback) {
// return; // return;
// } // }
// table.bootstrapTable('append', list); // table.bootstrapTable('append', list);
} else {
callback && callback([]);
} }
}) })
} }
......
src/main/webapp/webpage/modules/warehouse/qrcode/qrCodeList.jsp
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
var projectName = "${ctxStatic}"; var projectName = "${ctxStatic}";
</script> </script>
<script type="text/javascript" src="${ctxStatic}/common/js/LodopFuncs.js"></script> <script type="text/javascript" src="${ctxStatic}/common/js/LodopFuncs.js"></script>
<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0> <%--<object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
<embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed> <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
</object> </object>--%>
</head> </head>
<body> <body>
<div class="wrapper wrapper-content"> <div class="wrapper wrapper-content">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment