Merge branch 'master' of http://gitlab.yqdchina.com/huyi/warehouse into zlt

src/main/webapp/webpage/modules/common/shelvesSelect.jsp

@@ -44,14 +44,7 @@
 			    // 获取当前节点
 			    var treeNode = e.node;
 			    var id = treeNode.id == '0' ? '' :treeNode.id;
-				if(treeNode.level == 0){//level=0 代表公司
-					$("#companyId").val(id);
-					$("#officeId").val("");
-				}else{
-					$("#companyId").val("");
-					$("#officeId").val(id);
-				}
-				
+				$("#warehouseId").val(id);
 				$('#table').bootstrapTable('refresh');
 			}).on('loaded.jstree', function() {
 				$("#jstree").jstree('open_all');
@@ -177,8 +170,7 @@
 			<div id="collapseTwo" class="accordion-body">
 				<div class="accordion-inner">
 					<form id="searchForm" class="form form-horizontal well clearfix" >
-					    <input type="hidden" id="companyId" name="company.id"/>
-					     <input type="hidden" id="officeId" name="office.id"/>
+					    <input type="hidden" id="warehouseId" name="warehouse.id"/>
 					    <div class="col-sm-4">
 					    	<label class="label-item single-overflow pull-left" title="货架名称：">货架名称：</label>
 					   		<input type="text" name="name" maxlength="100"  class=" form-control"/>

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

@@ -90,7 +90,7 @@ $(document).ready(function() {
 		    }
 			,{
 		        field: 'number',
-		        title: '盘盈入库单号',
+		        title: '单号',
 		        sortable: true,
 		        sortName: 'number'
 		        ,formatter:function(value, row , index){
@@ -110,10 +110,10 @@ $(document).ready(function() {
 		       
 		    }
 			,{
-		        field: 'operator',
+		        field: 'operator.name',
 		        title: '操作人',
 		        sortable: true,
-		        sortName: 'operator'
+		        sortName: 'operator.name'
 		       
 		    }
 			,{
@@ -122,6 +122,12 @@ $(document).ready(function() {
 		        sortable: true,
 		        sortName: 'time'
 		       
+		    },{
+		        field: 'sum',
+		        title: '总价',
+		        sortable: true,
+		        sortName: 'sum'
+
 		    }
 			,{
 		        field: 'remarks',
@@ -241,21 +247,21 @@ $(document).ready(function() {
   	$('#profitWarehousingTable').bootstrapTable('refresh');
   }
   function add(){
-		jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing/form/add");
+		jp.openSaveDialog("新增盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/add",'1200','800');
 	}
 
   function edit(id){
 	  if(id == undefined){
 		  id = getIdSelections();
 	  }
-	  jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing/form/edit?id=" + id);
+	  jp.openSaveDialog("编辑盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/edit?id=" + id,'1200','800');
   }
   
  function view(id){//没有权限时，不显示确定按钮
       if(id == undefined){
              id = getIdSelections();
       }
-         jp.go("${ctx}/warehouse/profitwarehousing/profitWarehousing/form/view?id=" + id);
+         jp.openViewDialog("查看盘盈入库单","${ctx}/warehouse/profitwarehousing/profitWarehousing/form/view?id=" + id,'1200','800');
  }
 
   
@@ -299,12 +305,13 @@ $(document).ready(function() {
 						<table class="ani table">
 						<thead>
 							<tr>
-								<th>盘盈入库主表ID</th>
 								<th>名称</th>
 								<th>类型</th>
 								<th>型号</th>
-								<th>货架ID</th>
-								<th>备注信息</th>
+								<th>仓库</th>
+								<th>货架</th>
+								<th>单价</th>
+								<th>备注</th>
 							</tr>
 						</thead>
 						<tbody id="profitWarehousingChild-{{idx}}-1-List">
@@ -316,19 +323,22 @@ $(document).ready(function() {
 	<script type="text/template" id="profitWarehousingChild1Tpl">//<!--
 				<tr>
 					<td>
-						{{row.profitWarehousing.id}}
-					</td>
-					<td>
 						{{row.name}}
 					</td>
 					<td>
-						{{row.type}}
+						{{row.type.name}}
 					</td>
 					<td>
 						{{row.marking}}
 					</td>
 					<td>
-						{{row.shelves.id}}
+						{{row.shelves.name}}
+					</td>
+					<td>
+						{{row.warehouse.name}}
+					</td>
+					<td>
+						{{row.amount}}
 					</td>
 					<td>
 						{{row.remarks}}