细节调整

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

@@ -270,6 +270,9 @@ $(document).ready(function() {
 		for (var i=0; i<data1.length; i++){
 			data1[i].dict = {};
 			data1[i].qrCodeStr = data1[i].qrCode && JSON.stringify(data1[i].qrCode);
+			data1[i].status = data1[i].qrCode.state === '2';
+			data1[i].hasQr = data1[i].qrCode;
+			data1[i].mainRowIndex = index;
 			addRow('#profitWarehousingChild-'+row.id+'-1-List', profitWarehousingChild1RowIdx, profitWarehousingChild1Tpl, data1[i]);
 			profitWarehousingChild1RowIdx = profitWarehousingChild1RowIdx + 1;
 		}
@@ -289,12 +292,12 @@ $(document).ready(function() {
 	}
 
 	function printQr(id, qrCodeStr) {
-		jp.loading('loading...');
 		try{
 			if(!LODOP){
 				initLodop();
 			}
 			if(LODOP){
+				jp.loading('loading...');
 				if(qrCodeStr){
 					var qrCode = JSON.parse(qrCodeStr);
 					preview_LODOP(qrCode);
@@ -336,6 +339,20 @@ $(document).ready(function() {
 			})
 		})
 	}
+
+	function inLedgerInfo(id, rowIndex ){
+	  jp.get("${ctx}/warehouse/profitwarehousing/profitWarehousing/inLedgerInfo?profitWarehousingInfoId="+ id, function (res){
+		  if(res.success){
+			  jp.success(res.msg);
+			  $('#profitWarehousingTable').bootstrapTable('collapseRow', rowIndex);
+			  setTimeout(function (){
+				  $('#profitWarehousingTable').bootstrapTable('expandRow', rowIndex);
+			  },0)
+		  }else{
+			  jp.error(res.msg);
+		  }
+	  })
+	}
 </script>
 <script type="text/template" id="profitWarehousingChildrenTpl">//<!--
 	<div class="tabs-container">
@@ -393,6 +410,16 @@ $(document).ready(function() {
 						<button class="btn btn-danger btn-sm" onclick="cleanQr('{{row.id}}')">
 							清除二维码
 						</button>
+						{{#row.hasQr}}
+							{{#row.status}}
+							  已入库
+							{{/row.status}}
+							{{^row.status}}
+							<button onclick="inLedgerInfo('{{row.id}}')" class="btn btn-primary btn-sm" onclick="cleanQr('{{row.id}}',{{row.mainRowIndex}})">
+								入库
+							</button>
+							{{/row.status}}
+						{{/row.hasQr}}
 					</td>
 				</tr>//-->
 	</script>