Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy

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

@@ -291,7 +291,7 @@ $(document).ready(function() {
 		LODOP=getLodop(document.getElementById('LODOP_OB'),document.getElementById('LODOP_EM'));
 	}
 
-	function printQr(id, qrCodeStr) {
+	function printQr(id, qrCodeStr, rowIndex) {
 		try{
 			if(!LODOP){
 				initLodop();
@@ -307,6 +307,10 @@ $(document).ready(function() {
 						if(res.success){
 							var profitWarehousingInfo = res.body.profitWarehousingInfo;
 							preview_LODOP(profitWarehousingInfo.qrCode);
+							$('#profitWarehousingTable').bootstrapTable('collapseRow', rowIndex);
+							setTimeout(function (){
+								$('#profitWarehousingTable').bootstrapTable('expandRow', rowIndex);
+							},0)
 						}else {
 							jp.warning(res.msg);
 						}
@@ -414,7 +418,7 @@ $(document).ready(function() {
 						{{row.remarks}}
 					</td>
 					<td>
-						<button class="btn btn-primary btn-sm" onclick="printQr('{{row.id}}', '{{row.qrCodeStr}}')">
+						<button class="btn btn-primary btn-sm" onclick="printQr('{{row.id}}', '{{row.qrCodeStr}}',{{row.mainRowIndex}})">
 							打印二维码
 						</button>
 						<button class="btn btn-danger btn-sm" onclick="cleanQr('{{row.id}}')">
@@ -425,7 +429,7 @@ $(document).ready(function() {
 							  已入库
 							{{/row.status}}
 							{{^row.status}}
-							<button onclick="inLedgerInfo('{{row.id}}')" class="btn btn-primary btn-sm" onclick="cleanQr('{{row.id}}',{{row.mainRowIndex}})">
+							<button onclick="inLedgerInfo('{{row.id}}',{{row.mainRowIndex}})" class="btn btn-primary btn-sm">
 								入库
 							</button>
 							{{/row.status}}