对接出库功能

src/main/webapp/webpage/modules/warehouse/materialrequisition/materialRequisitionForm.jsp

@@ -19,7 +19,7 @@
                                action="${ctx}/warehouse/materialrequisition/materialRequisition/save" method="post"
                                class="form-horizontal">
                         <form:hidden path="id"/>
-                        <h3 class="物资领用表"></h3>
+                        <h3 class="text-center">物资领用表</h3>
                         <table class="table table-bordered main-table">
                             <tr>
                                 <td> <font color="red">*</font>领用单号</td>

src/main/webapp/webpage/modules/warehouse/outbound/outboundList.js

@@ -110,13 +110,6 @@ $(document).ready(function() {
 		       
 		    }
 			,{
-		        field: 'relationId',
-		        title: '相关表单ID',
-		        sortable: true,
-		        sortName: 'relationId'
-		       
-		    }
-			,{
 		        field: 'outboundTime',
 		        title: '出库时间',
 		        sortable: true,
@@ -258,21 +251,21 @@ $(document).ready(function() {
   	$('#outboundTable').bootstrapTable('refresh');
   }
   function add(){
-		jp.go("${ctx}/warehouse/outbound/outbound/form/add");
+		jp.openSaveDialog("新增出库单","${ctx}/warehouse/outbound/outbound/form/add",'1200','800');
 	}
 
   function edit(id){
 	  if(id == undefined){
 		  id = getIdSelections();
 	  }
-	  jp.go("${ctx}/warehouse/outbound/outbound/form/edit?id=" + id);
+	  jp.openSaveDialog("编辑出库单","${ctx}/warehouse/outbound/outbound/form/edit?id=" + id,'1200','800');
   }
   
  function view(id){//没有权限时，不显示确定按钮
       if(id == undefined){
              id = getIdSelections();
       }
-         jp.go("${ctx}/warehouse/outbound/outbound/form/view?id=" + id);
+         jp.openViewDialog("查看出库单","${ctx}/warehouse/outbound/outbound/form/view?id=" + id, '1200','800');
  }
 
   
@@ -316,9 +309,11 @@ $(document).ready(function() {
 						<table class="ani table">
 						<thead>
 							<tr>
-								<th>出库单主表id</th>
-								<th>台账明细表id</th>
-								<th>备注信息</th>
+								<th>物资编码</th>
+								<th>物资名称</th>
+								<th>类型</th>
+								<th>型号</th>
+								<th>单价</th>
 							</tr>
 						</thead>
 						<tbody id="outboundChild-{{idx}}-1-List">
@@ -330,10 +325,19 @@ $(document).ready(function() {
 	<script type="text/template" id="outboundChild1Tpl">//<!--
 				<tr>
 					<td>
-						{{row.outbound.id}}
+						{{row.ledgerInfo.name}}
+					</td>
+					<td>
+						{{row.ledgerInfo.code}}
+					</td>
+					<td>
+						{{row.ledgerInfo.type.name}}
+					</td>
+					<td>
+						{{row.ledgerInfo.model}}
 					</td>
 					<td>
-						{{row.ledgerInfo.id}}
+						{{row.ledgerInfo.amount}}
 					</td>
 					<td>
 						{{row.remarks}}