Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy

src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js

@@ -303,6 +303,7 @@ $(document).ready(function() {
 								<th>货架</th>
 								<th>仓库</th>
 								<th>数量</th>
+								<th>总价</th>
 							</tr>
 						</thead>
 						<tbody id="ledgerChild-{{idx}}-1-List">
@@ -330,6 +331,9 @@ $(document).ready(function() {
 						{{row.warehouseNames}}
 					</td>
 					<td>
+						{{row.num}}
+					</td>
+						<td>
 						{{row.sum}}
 					</td>
 				</tr>//-->

src/main/webapp/webpage/modules/warehouse/profitwarehousing/profitWarehousingList.js

@@ -297,12 +297,12 @@ $(document).ready(function() {
 				initLodop();
 			}
 			if(LODOP){
-				jp.loading('loading...');
 				if(qrCodeStr){
 					var qrCode = JSON.parse(qrCodeStr);
 					preview_LODOP(qrCode);
 					jp.close();
 				}else{
+					jp.loading('loading...');
 					jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/printQr?profitWarehousingInfoId="+id, function (res) {
 						if(res.success){
 							var profitWarehousingInfo = res.body.profitWarehousingInfo;