将查询单据信息的两个接口合并为一个

erp_web/js/pages/materials/in_out.js

@@ -2676,56 +2676,33 @@
 	function showDepotHeadDetails(pageNo,pageSize){
 		var materialParam = $.trim($("#searchMaterial").val());
 		$.ajax({
-			type:"get",
-			url: "/depotItem/getHeaderIdByMaterial",
+			type: "get",
+			url: "/depotHead/list",
 			dataType: "json",
 			data: ({
-				materialParam: materialParam,
-				depotIds: depotString
+				search: JSON.stringify({
+					type: listType,
+					subType: listSubType,
+					state: $.trim($("#searchState").val()),
+					number: $.trim($("#searchNumber").val()),
+					beginTime: $("#searchBeginTime").val(),
+					endTime: $("#searchEndTime").val(),
+                    materialParam: materialParam,
+                    depotIds: depotString
+				}),
+				currentPage: pageNo,
+				pageSize: pageSize
 			}),
 			success: function (res) {
-				if(res && res.code === 200) {
-					var ids = res.data;
-					if(ids){
-						$.ajax({
-							type: "get",
-							url: "/depotHead/list",
-							dataType: "json",
-                            data: ({
-                                search: JSON.stringify({
-                                    type: listType,
-                                    subType: listSubType,
-                                    state: $.trim($("#searchState").val()),
-                                    number: $.trim($("#searchNumber").val()),
-                                    beginTime: $("#searchBeginTime").val(),
-                                    endTime: $("#searchEndTime").val(),
-                                    dhIds: ids
-                                }),
-                                currentPage: pageNo,
-                                pageSize: pageSize
-                            }),
-                            success: function (res) {
-                                if(res && res.code === 200){
-                                    if(res.data && res.data.page) {
-                                        $("#tableData").datagrid('loadData', res.data.page);
-                                    }
-                                }
-                            },
-							//此处添加错误处理
-							error: function () {
-								$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-								return;
-							}
-						});
-					}
-					else {
-						$("#tableData").datagrid('loadData', []);
+				if(res && res.code === 200){
+					if(res.data && res.data.page) {
+						$("#tableData").datagrid('loadData', res.data.page);
 					}
 				}
 			},
 			//此处添加错误处理
-			error:function() {
-				$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+			error: function () {
+				$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
 				return;
 			}
 		});

erp_web/login.html

@@ -4,7 +4,6 @@
     <title>ERP系统</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=8" >
-    <meta name="referrer" content="Webkit">
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <link type="text/css" rel="stylesheet" href="/css/css.css"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>