新增-根据商品信息查询单据

src/main/webapp/js/pages/materials/in_out.js

@@ -536,7 +536,7 @@
 			detailFormatter: function(rowIndex, rowData){
 				return '<table><tr>' +
 					'<td style="border:0">' +
-					'<p>商品信息: ' + rowData.MaterialsList + '</p>' +
+					'<p>商品信息： ' + rowData.MaterialsList + '</p>' +
 					'</td>' +
 					'</tr></table>';
 			},
@@ -2019,7 +2019,7 @@
 		        $("#saveDepotHead").click();
 		    }
 		    //搜索按钮添加快捷键
-		    if(k == "13"&&(obj.id=="searchState"||obj.id=="searchNumber"))
+		    if(k == "13"&&(obj.id=="searchState"||obj.id=="searchNumber"||obj.id=="searchMaterial"))
 		    {
 		        $("#searchBtn").click();
 		    }
@@ -2441,27 +2441,50 @@
 	}
 
 	function showDepotHeadDetails(pageNo,pageSize){
+		var materialParam = $.trim($("#searchMaterial").val());
 		$.ajax({
 			type:"post",
-			url: path + "/depotHead/findBy.action",
+			url: path + "/depotHead/getHeaderIdByMaterial.action",
 			dataType: "json",
 			data: ({
-				Type: listType,
-				SubType:listSubType,
-				State:$.trim($("#searchState").val()),
-				Number:$.trim($("#searchNumber").val()),
-				BeginTime:$("#searchBeginTime").val(),
-				EndTime:$("#searchEndTime").val(),
-				pageNo:pageNo,
-				pageSize:pageSize
+				MaterialParam: materialParam
 			}),
-			success: function (data)
-			{
-				$("#tableData").datagrid('loadData',data);
+			success: function (res) {
+				if(res) {
+					var ids = res.ret;
+					if(ids){
+						$.ajax({
+							type: "post",
+							url: path + "/depotHead/findBy.action",
+							dataType: "json",
+							data: ({
+								Type: listType,
+								SubType: listSubType,
+								State: $.trim($("#searchState").val()),
+								Number: $.trim($("#searchNumber").val()),
+								BeginTime: $("#searchBeginTime").val(),
+								EndTime: $("#searchEndTime").val(),
+								dhIds: ids,
+								pageNo: pageNo,
+								pageSize: pageSize
+							}),
+							success: function (data) {
+								$("#tableData").datagrid('loadData', data);
+							},
+							//此处添加错误处理
+							error: function () {
+								$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+								return;
+							}
+						});
+					}
+					else {
+						$("#tableData").datagrid('loadData', []);
+					}
+				}
 			},
 			//此处添加错误处理
-			error:function()
-			{
+			error:function() {
 				$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
 				return;
 			}

src/main/webapp/pages/materials/allocation_out_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/gift_out_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/gift_recharge_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/other_in_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/other_out_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/purchase_back_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/purchase_in_list.jsp

@@ -38,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/retail_back_list.jsp

@@ -19,6 +19,7 @@
 	<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 	<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 	<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+	<script src="<%=path %>/js/datagrid-detailview.js"></script>
 	<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 	<script src="<%=path %>/js/common/common.js"></script>
 	<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 				<td>
 					<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 				</td>
+				<td>商品信息：</td>
+				<td>
+					<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+				</td>
 				<td>单据日期：</td>
 				<td>
 					<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/retail_out_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/sale_back_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>

src/main/webapp/pages/materials/sale_out_list.jsp

@@ -19,6 +19,7 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
@@ -37,6 +38,10 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
 					</td>
+					<td>商品信息：</td>
+					<td>
+						<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号，制造商" style="width:120px;"/>
+					</td>
 					<td>单据日期：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>