出入库报表增加供应商的栏目

src/main/webapp/pages/reports/customer_account.jsp

@@ -30,7 +30,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-					<td>单位名称：</td>
+					<td>客户：</td>
 					<td>
 						<input id="OrganId" name="OrganId" style="width:120px;" />
 					</td>

src/main/webapp/pages/reports/in_detail.jsp

@@ -30,6 +30,11 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
+					<td>供应商：</td>
+					<td>
+						<input id="OrganId" name="OrganId" style="width:120px;" />
+					</td>
+					<td>&nbsp;</td>
 					<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
@@ -62,6 +67,8 @@
 			var depotList = null;
 			var depotID = null;
 			var depotString = ""; //仓库列表
+			var path = "<%=path %>";
+			var supUrl = path + "/supplier/findBySelect_sup.action"; //供应商接口
 			//初始化界面
 			$(function()
 			{
@@ -71,6 +78,7 @@
 				$("#searchEndTime").val(thisDateTime);
 				var userBusinessList=null;
 				var userdepot=null;
+				initSupplier(); //初始化供应商信息
 				initSystemData_UB();
 				initSelectInfo_UB();
 				initSystemData_depot();
@@ -79,9 +87,20 @@
 				ininPager();
 				search();
 				print();
-			});	
-			
+			});
 
+			//初始化供应商
+			function initSupplier(){
+				$('#OrganId').combobox({
+					url: supUrl,
+					valueField:'id',
+					textField:'supplier',
+					filter: function(q, row){
+						var opts = $(this).combobox('options');
+						return row[opts.textField].indexOf(q) >-1;
+					}
+				});
+			}
 
 			//初始化系统基础信息
 			function initSystemData_UB(){
@@ -290,6 +309,7 @@
 					data: ({
 						pageNo:pageNo,
 						pageSize:pageSize,
+						OrganId: $('#OrganId').combobox('getValue'),
 						ProjectId: $.trim($("#searchProjectId").val()),
 						DepotIds: depotString,
 						BeginTime: $("#searchBeginTime").val(),

src/main/webapp/pages/reports/in_material_count.jsp

@@ -30,6 +30,11 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
+					<td>供应商：</td>
+					<td>
+						<input id="OrganId" name="OrganId" style="width:120px;" />
+					</td>
+					<td>&nbsp;</td>
 					<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
@@ -62,6 +67,8 @@
 			var depotList = null;
 			var depotID = null;
 			var depotString = ""; //仓库列表
+			var path = "<%=path %>";
+			var supUrl = path + "/supplier/findBySelect_sup.action"; //供应商接口
 			//初始化界面
 			$(function()
 			{
@@ -71,6 +78,7 @@
 				$("#searchEndTime").val(thisDateTime);
 				var userBusinessList=null;
 				var userdepot=null;
+				initSupplier(); //初始化供应商信息
 				initSystemData_UB();
 				initSelectInfo_UB();
 				initSystemData_depot();
@@ -79,8 +87,20 @@
 				ininPager();
 				search();
 				print();
-			});	
+			});
 
+			//初始化供应商
+			function initSupplier(){
+				$('#OrganId').combobox({
+					url: supUrl,
+					valueField:'id',
+					textField:'supplier',
+					filter: function(q, row){
+						var opts = $(this).combobox('options');
+						return row[opts.textField].indexOf(q) >-1;
+					}
+				});
+			}
 
 			//初始化系统基础信息
 			function initSystemData_UB(){
@@ -193,6 +213,7 @@
 						{ title: '商品名称',field: 'mName',width:150},
 						{ title: '商品型号',field: 'Model',width:150},
 						{ title: '商品类型',field: 'categoryName',width:120},
+						{ title: '入库数量',field: 'numSum',width:120},
 						{ title: '入库金额',field: 'priceSum',width:120}
 					]],
 					onLoadError:function()
@@ -284,6 +305,7 @@
 					data: ({
 						pageNo:pageNo,
 						pageSize:pageSize,
+						OrganId: $('#OrganId').combobox('getValue'),
 						ProjectId: $.trim($("#searchProjectId").val()),
 						DepotIds: depotString,
 						BeginTime: $("#searchBeginTime").val(),

src/main/webapp/pages/reports/out_detail.jsp

@@ -30,6 +30,11 @@
 	<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 		<table id="searchTable">
 			<tr>
+				<td>客户：</td>
+				<td>
+					<input id="OrganId" name="OrganId" style="width:120px;" />
+				</td>
+				<td>&nbsp;</td>
 				<td>仓库：</td>
 				<td>
 					<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
@@ -62,6 +67,8 @@
 		var depotList = null;
 		var depotID = null;
 		var depotString = ""; //仓库列表
+		var path = "<%=path %>";
+		var cusUrl = path + "/supplier/findBySelect_cus.action?UBType=UserCustomer&UBKeyId=" + uid; //客户接口
 		//初始化界面
 		$(function()
 		{
@@ -71,6 +78,7 @@
 			$("#searchEndTime").val(thisDateTime);
 			var userBusinessList=null;
 			var userdepot=null;
+			initSupplier(); //初始化客户信息
 			initSystemData_UB();
 			initSelectInfo_UB();
 			initSystemData_depot();
@@ -81,6 +89,18 @@
 			print();
 		});
 
+		//初始化客户
+		function initSupplier(){
+			$('#OrganId').combobox({
+				url: cusUrl,
+				valueField:'id',
+				textField:'supplier',
+				filter: function(q, row){
+					var opts = $(this).combobox('options');
+					return row[opts.textField].indexOf(q) >-1;
+				}
+			});
+		}
 
 		//初始化系统基础信息
 		function initSystemData_UB(){
@@ -196,7 +216,7 @@
 					{ title: '单价',field: 'unitPrice',width:60},
 					{ title: '出库数量',field: 'operNumber',width:60},
 					{ title: '金额',field: 'allPrice',width:60},
-					{ title: '供应商',field: 'supplierName',width:200},
+					{ title: '客户',field: 'supplierName',width:200},
 					{ title: '仓库',field: 'depotName',width:120},
 					{ title: '出库日期',field: 'operTime',width:80},
 				]],
@@ -289,6 +309,7 @@
 				data: ({
 					pageNo:pageNo,
 					pageSize:pageSize,
+					OrganId: $('#OrganId').combobox('getValue'),
 					ProjectId: $.trim($("#searchProjectId").val()),
 					DepotIds: depotString,
 					BeginTime: $("#searchBeginTime").val(),

src/main/webapp/pages/reports/out_material_count.jsp

@@ -22,7 +22,7 @@
 		<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
 		<script>
-			var kid = ${sessionScope.user.id};
+			var uid = ${sessionScope.user.id};
 		</script>
   	</head>
   	<body>
@@ -30,6 +30,11 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
+					<td>客户：</td>
+					<td>
+						<input id="OrganId" name="OrganId" style="width:120px;" />
+					</td>
+					<td>&nbsp;</td>
 					<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
@@ -62,6 +67,8 @@
 			var depotList = null;
 			var depotID = null;
 			var depotString = ""; //仓库列表
+			var path = "<%=path %>";
+			var cusUrl = path + "/supplier/findBySelect_cus.action?UBType=UserCustomer&UBKeyId=" + uid; //客户接口
 			//初始化界面
 			$(function()
 			{
@@ -71,6 +78,7 @@
 				$("#searchEndTime").val(thisDateTime);
 				var userBusinessList=null;
 				var userdepot=null;
+				initSupplier(); //初始化客户信息
 				initSystemData_UB();
 				initSelectInfo_UB();
 				initSystemData_depot();
@@ -79,8 +87,20 @@
 				ininPager();
 				search();
 				print();
-			});	
+			});
 
+			//初始化客户
+			function initSupplier(){
+				$('#OrganId').combobox({
+					url: cusUrl,
+					valueField:'id',
+					textField:'supplier',
+					filter: function(q, row){
+						var opts = $(this).combobox('options');
+						return row[opts.textField].indexOf(q) >-1;
+					}
+				});
+			}
 
 			//初始化系统基础信息
 			function initSystemData_UB(){
@@ -88,7 +108,7 @@
 					type:"post",
 					url: "<%=path %>/userBusiness/getBasicData.action",
 					data: ({
-						KeyId:kid,
+						KeyId:uid,
 						Type:"UserDepot"
 					}),
 					//设置为同步
@@ -193,6 +213,7 @@
 						{ title: '商品名称',field: 'mName',width:150},
 						{ title: '商品型号',field: 'Model',width:150},
 						{ title: '商品类型',field: 'categoryName',width:120},
+						{ title: '出库数量',field: 'numSum',width:120},
 						{ title: '出库金额',field: 'priceSum',width:120}
 					]],
 					onLoadError:function()
@@ -284,6 +305,7 @@
 					data: ({
 						pageNo:pageNo,
 						pageSize:pageSize,
+						OrganId: $('#OrganId').combobox('getValue'),
 						ProjectId: $.trim($("#searchProjectId").val()),
 						DepotIds: depotString,
 						BeginTime: $("#searchBeginTime").val(),

src/main/webapp/pages/reports/vendor_account.jsp

@@ -30,7 +30,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-					<td>单位名称：</td>
+					<td>供应商：</td>
 					<td>
 						<input id="OrganId" name="OrganId" style="width:120px;" />
 					</td>