优化界面，给商品和单位模块增加了部分字段

WebRoot/pages/materials/consuming_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -923,7 +923,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_allocation_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -125,7 +125,7 @@
                 <td style="padding:5px;width:120px;">
                 <span id="OperTimeShow"></span>
                 </td>
-	            <td>对方店面：</td>
+	            <td>对方仓库：</td>
 	            <td style="padding:5px;width:120px;">
 	            <span id="AllocationProjectIdShow"></span>
 	            </td>
@@ -849,7 +849,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_lease_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -848,7 +848,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_purchase_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -852,7 +852,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/fix_sale_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -848,7 +848,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/lease_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -873,7 +873,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/material.jsp

@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html>
   	<head>
-    	<title>物料管理</title>
+    	<title>商品信息</title>
         <meta charset="utf-8">
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -44,7 +44,7 @@
 		</div>
 		
 		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="物料列表" iconCls="icon-list" collapsible="true" closable="false">
+		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="商品列表" iconCls="icon-list" collapsible="true" closable="false">
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
@@ -75,6 +75,22 @@
 	            <tr>	          
 	            <td>单位</td>
 	            <td style="padding:5px"><input name="Unit" id="Unit" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
+	            </tr>
+	            <tr>
+                <td>零售价</td>
+                <td style="padding:5px"><input name="RetailPrice" id="RetailPrice" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
+                </tr>
+	            <tr>
+                <td>最低售价</td>
+                <td style="padding:5px"><input name="LowPrice" id="LowPrice" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
+                </tr>
+	            <tr>      
+                <td>预设售价一</td>
+                <td style="padding:5px"><input name="PresetPriceOne" id="PresetPriceOne" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
+                </tr>
+	            <tr>  
+                <td>预设售价二</td>
+                <td style="padding:5px"><input name="PresetPriceTwo" id="PresetPriceTwo" class="easyui-validatebox" data-options="required:true,validType:'length[1,30]'" style="width: 180px;height: 20px"/></td>
                 </tr>
 	            <tr>
 	            <td>备注</td>
@@ -127,7 +143,7 @@
 						var msgTip = systemInfo.showModel.msgTip;
 						if(msgTip == "exceptoin")
 						{
-							$.messager.alert('提示','查找物料异常,请与管理员联系！','error');
+							$.messager.alert('提示','查找商品异常,请与管理员联系！','error');
 							return;
 						}	
 					}
@@ -275,7 +291,7 @@
 			function initTableData()
 			{
 				$('#tableData').datagrid({
-					//title:'物料列表',
+					//title:'商品列表',
 					//iconCls:'icon-save',
 					//width:700,
 					height:heightInfo,
@@ -299,15 +315,19 @@
 					pageList: initPageNum,
 					columns:[[
 					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '名称',field: 'Name',width:150},
-			          { title: '款号',field: 'Model',width:150},
-    		          { title: '颜色',field: 'Color',width:150},
-			          { title: '单位',field: 'Unit',width:150},
-			          { title: '备注',field: 'Remark',width:150},
-			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
+			          { title: '名称',field: 'Name',width:80},
+			          { title: '款号',field: 'Model',width:80},
+    		          { title: '颜色',field: 'Color',width:40},
+			          { title: '单位',field: 'Unit',width:50},
+			          { title: '零售价',field: 'RetailPrice',width:50},
+			          { title: '最低售价',field: 'LowPrice',width:50},
+			          { title: '预设售价一',field: 'PresetPriceOne',width:80},
+			          { title: '预设售价二',field: 'PresetPriceTwo',width:80},
+			          { title: '备注',field: 'Remark',width:120},
+			          { title: '操作',field: 'op',align:"center",width:120,formatter:function(value,rec)
 			         	{
 							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model+ 'AaBb' + rec.Color+ 'AaBb' + rec.Unit+ 'AaBb' + rec.Remark;
+							var rowInfo = rec.Id + 'AaBb' + rec.Name+ 'AaBb' + rec.Model + 'AaBb' + rec.Color + 'AaBb' + rec.Unit + 'AaBb' + rec.RetailPrice + 'AaBb' + rec.LowPrice + 'AaBb' + rec.PresetPriceOne + 'AaBb' + rec.PresetPriceTwo + 'AaBb' + rec.Remark;
         					if(1 == value)
         					{
         						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editMaterial(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
@@ -391,10 +411,10 @@
 				}
 			}
 			
-			//删除物料信息
+			//删除商品信息
 			function deleteMaterial(materialID)
 			{
-				$.messager.confirm('删除确认','确定要删除此物料信息吗？',function(r)
+				$.messager.confirm('删除确认','确定要删除此商品信息吗？',function(r)
 			 	{
                     if (r)
                     {
@@ -415,12 +435,12 @@
 									$("#searchBtn").click();
 								}
 								else
-									$.messager.alert('删除提示','删除物料信息失败，请稍后再试！','error');
+									$.messager.alert('删除提示','删除商品信息失败，请稍后再试！','error');
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('删除提示','删除物料信息异常，请稍后再试！','error');
+				    			$.messager.alert('删除提示','删除商品信息异常，请稍后再试！','error');
 								return;
 							}
 						});			
@@ -428,7 +448,7 @@
                 });
 			}
 			
-			//批量删除物料
+			//批量删除商品
 			function batDeleteMaterial()
 			{
 				var row = $('#tableData').datagrid('getChecked');	
@@ -439,7 +459,7 @@
 				}
 				if(row.length > 0)
 				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料信息吗？',function(r)
+					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品信息吗？',function(r)
 				 	{
 	                    if (r)
 	                    {
@@ -473,12 +493,12 @@
 										$(":checkbox").attr("checked",false);
 									}
 									else
-										$.messager.alert('删除提示','删除物料信息失败，请稍后再试！','error');
+										$.messager.alert('删除提示','删除商品信息失败，请稍后再试！','error');
 								},
 								//此处添加错误处理
 					    		error:function()
 					    		{
-					    			$.messager.alert('删除提示','删除物料信息异常，请稍后再试！','error');
+					    			$.messager.alert('删除提示','删除商品信息异常，请稍后再试！','error');
 									return;
 								}
 							});	
@@ -497,7 +517,7 @@
 			{
 				$("#clientIp").val('<%=clientIp %>');
 				$('#materialFM').form('clear');
-				$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加物料信息');
+				$('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
 				$(".window-mask").css({ width: webW ,height: webH});
 	            $("#Name").val("").focus();
 	            
@@ -538,6 +558,10 @@
 								Model : $.trim($("#Model").val()),
 								Color : $.trim($("#Color").val()),
 								Unit : $.trim($("#Unit").val()),
+								RetailPrice : $.trim($("#RetailPrice").val()),
+								LowPrice : $.trim($("#LowPrice").val()),
+								PresetPriceOne : $.trim($("#PresetPriceOne").val()),
+								PresetPriceTwo : $.trim($("#PresetPriceTwo").val()),
 								Remark : $.trim($("#Remark").val()),
 								clientIp:'<%=clientIp %>'
 							}),
@@ -554,14 +578,14 @@
 								{
 									$.messager.show({
 			                            title: '错误提示',
-			                            msg: '保存物料信息失败，请稍后重试!'
+			                            msg: '保存商品信息失败，请稍后重试!'
 			                        });
 								}
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('提示','保存物料信息异常，请稍后再试！','error');
+				    			$.messager.alert('提示','保存商品信息异常，请稍后再试！','error');
 								return;
 							}
 						});	
@@ -579,10 +603,14 @@
 	            $("#Model").val(materialInfo[2]);
 	            $("#Color").val(materialInfo[3]);
 	            $("#Unit").val(materialInfo[4]);
-	            $("#Remark").val(materialInfo[5]);
+	            $("#RetailPrice").val(materialInfo[5]);
+	            $("#LowPrice").val(materialInfo[6]);
+	            $("#PresetPriceOne").val(materialInfo[7]);
+	            $("#PresetPriceTwo").val(materialInfo[8]);
+	            $("#Remark").val(materialInfo[9]);
 	            
 	            //orgMaterial = materialInfo[1];
-                $('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑物料信息');
+                $('#materialDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
                 $(".window-mask").css({ width: webW ,height: webH});
                 materialID = materialInfo[0];
                 //焦点在名称输入框==定焦在输入文字后面 

WebRoot/pages/materials/materialcategory.jsp

@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html>
   	<head>
-    	<title>物料类别管理</title>
+    	<title>商品类别管理</title>
         <meta charset="utf-8">
 		<!-- 指定以IE8的方式来渲染 -->
 		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
@@ -44,7 +44,7 @@
 		</div>
 		
 		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="物料类别列表" iconCls="icon-list" collapsible="true" closable="false">
+		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="商品类别列表" iconCls="icon-list" collapsible="true" closable="false">
 			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
 		</div>
 		
@@ -116,7 +116,7 @@
 						var msgTip = systemInfo.showModel.msgTip;
 						if(msgTip == "exceptoin")
 						{
-							$.messager.alert('提示','查找物料类别异常,请与管理员联系！','error');
+							$.messager.alert('提示','查找商品类别异常,请与管理员联系！','error');
 							return;
 						}	
 					}
@@ -229,7 +229,7 @@
 			function initTableData()
 			{
 				$('#tableData').datagrid({
-					//title:'物料类别列表',
+					//title:'商品类别列表',
 					//iconCls:'icon-save',
 					//width:700,
 					height:heightInfo,
@@ -341,10 +341,10 @@
 				}
 			}
 			
-			//删除物料类别信息
+			//删除商品类别信息
 			function deleteMaterialCategory(materialCategoryID)
 			{
-				$.messager.confirm('删除确认','确定要删除此物料类别信息吗？',function(r)
+				$.messager.confirm('删除确认','确定要删除此商品类别信息吗？',function(r)
 			 	{
                     if (r)
                     {
@@ -365,12 +365,12 @@
 									$("#searchBtn").click();
 								}
 								else
-									$.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error');
+									$.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error');
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error');
+				    			$.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error');
 								return;
 							}
 						});			
@@ -378,7 +378,7 @@
                 });
 			}
 			
-			//批量删除物料类别
+			//批量删除商品类别
 			function batDeleteMaterialCategory()
 			{
 				var row = $('#tableData').datagrid('getChecked');	
@@ -389,7 +389,7 @@
 				}
 				if(row.length > 0)
 				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条物料类别信息吗？',function(r)
+					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条商品类别信息吗？',function(r)
 				 	{
 	                    if (r)
 	                    {
@@ -423,12 +423,12 @@
 										$(":checkbox").attr("checked",false);
 									}
 									else
-										$.messager.alert('删除提示','删除物料类别信息失败，请稍后再试！','error');
+										$.messager.alert('删除提示','删除商品类别信息失败，请稍后再试！','error');
 								},
 								//此处添加错误处理
 					    		error:function()
 					    		{
-					    			$.messager.alert('删除提示','删除物料类别信息异常，请稍后再试！','error');
+					    			$.messager.alert('删除提示','删除商品类别信息异常，请稍后再试！','error');
 									return;
 								}
 							});	
@@ -447,7 +447,7 @@
 			{
 				$("#clientIp").val('<%=clientIp %>');
 				$('#materialCategoryFM').form('clear');
-				$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加物料类别信息');
+				$('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品类别信息');
 				$(".window-mask").css({ width: webW ,height: webH});
 	            $("#Name").val("").focus();
 	            
@@ -497,14 +497,14 @@
 								{
 									$.messager.show({
 			                            title: '错误提示',
-			                            msg: '保存物料类别信息失败，请稍后重试!'
+			                            msg: '保存商品类别信息失败，请稍后重试!'
 			                        });
 								}
 							},
 							//此处添加错误处理
 				    		error:function()
 				    		{
-				    			$.messager.alert('提示','保存物料类别信息异常，请稍后再试！','error');
+				    			$.messager.alert('提示','保存商品类别信息异常，请稍后再试！','error');
 								return;
 							}
 						});	
@@ -523,7 +523,7 @@
 	            $("#Name").val(materialCategoryInfo[3]);
 	            
 	            //orgMaterialCategory = materialCategoryInfo[1];
-                $('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑物料类别信息');
+                $('#materialCategoryDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品类别信息');
                 $(".window-mask").css({ width: webW ,height: webH});
                 materialCategoryID = materialCategoryInfo[0];
                 //焦点在名称输入框==定焦在输入文字后面 

WebRoot/pages/materials/other_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -859,7 +859,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/person.jsp

@@ -26,7 +26,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>
 						<select name="searchProjectId" id="searchProjectId"  style="width:230px;"></select>
 					</td>
@@ -60,7 +60,7 @@
 	        <form id="personFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>店面</td>
+	            <td>仓库</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
                 </td>
@@ -184,7 +184,7 @@
 					pageList: initPageNum,
 					columns:[[
 					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '店面',field: 'ProjectName',width:180},
+			          { title: '仓库',field: 'ProjectName',width:180},
 			          { title: '类型',field: 'Type',width:180},
 			          { title: '经手人',field: 'Name',width:180},
 			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)

WebRoot/pages/materials/purchase_in_list.jsp

@@ -27,25 +27,25 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
+						<select name="searchProjectId" id="searchProjectId"  style="width:80px;"></select>
 					</td>
 					<td>单据号：</td>
 					<td>
-						<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
 					</td>
 					<td>入库时间：</td>
 					<td>
-						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
 					</td>
 					<td>-</td>
 					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
 					</td>
 					<td>状态：</td>
 					<td>
-						<select name="searchState" id="searchState"  style="width:100px;">
+						<select name="searchState" id="searchState"  style="width:60px;">
 						<option value="">全部</option>
 						<option value="草稿">草稿</option>
 						<option value="待审核">待审核</option>
@@ -408,8 +408,8 @@
 			          { title: '入库时间 ',field: 'OperTime',width:100},
 			          { title: '创建时间',field: 'CreateTime',width:100},
 			          { title: '操作员',field: 'OperPersonName',width:100},
-			          { title: '备注',field: 'Remark',width:200},
-			          { title: '状态',field: 'State',width:100},
+			          { title: '备注',field: 'Remark',width:100},
+			          { title: '状态',field: 'State',width:50},
 			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
 			         	{
 							var str = '';
@@ -881,7 +881,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/recover_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -863,7 +863,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/return_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -869,7 +869,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/sale_out_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -868,7 +868,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/materials/supply_in_list.jsp

@@ -27,7 +27,7 @@
 		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
 			<table id="searchTable">
 				<tr>
-			    	<td>店面：</td>
+			    	<td>仓库：</td>
 					<td>
 						<select name="searchProjectId" id="searchProjectId"  style="width:100px;"></select>
 					</td>
@@ -866,7 +866,7 @@
 				{
 					if($("#searchProjectId").val()=="")
 					{
-						$.messager.alert('查询提示','请选择一个店面！','info');		
+						$.messager.alert('查询提示','请选择一个仓库！','info');		
 					}
 					else
 					{

WebRoot/pages/user/user.jsp

@@ -31,14 +31,13 @@
 				<tr>
 					<td>用户名称：</td>
 					<td>
-						<input type="text" name="searchUsername" id="searchUsername"  style="width:190px;"/>
+						<input type="text" name="searchUsername" id="searchUsername"  style="width:100px;"/>
 					</td>				
-				
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>
 					<td>登录名称：</td>
 					<td>
-						<input type="text" name="searchLoginame" id="searchLoginame"  style="width:190px;"/>
+						<input type="text" name="searchLoginame" id="searchLoginame"  style="width:100px;"/>
 					</td>
 					<td>&nbsp;</td>
 					<td>&nbsp;</td>

WebRoot/pages/visit/visitAccount.jsp

-<%@page import="com.jsh.util.common.Tools"%>
-<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
-<%
-	String path = request.getContextPath();
-	String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
-	String clientIp = Tools.getCurrentUserIP();
-%>
-<!DOCTYPE html>
-<html>
-  	<head>
-    	<title>回访管理</title>
-        <meta charset="utf-8">
-		<!-- 指定以IE8的方式来渲染 -->
-		<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
-    	<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
-    	<script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
-        <script type="text/javascript" src="<%=path %>/js/colorbox/jquery.colorbox-min.js"></script>
-        <script type="text/javascript" src="<%=path %>/js/colorbox/colorboxSet.js"></script>
-        <link href="<%=path %>/js/colorbox/colorbox.css" rel="stylesheet" type="text/css" />
-		<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
-		<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
-		<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
-		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
-  	</head>
-  	<body>
-  		<!-- 查询 -->
-		<div id = "searchPanel"	class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
-			<table id="searchTable">
-				<tr>
-			    	<td>店面：</td>
-					<td>
-						<select name="searchProjectId" id="searchProjectId"  style="width:230px;"></select>
-					</td>
-					<td>楼号：</td>
-					<td>
-						<input type="text" name="searchLouHao" id="searchLouHao"  style="width:230px;"/>
-					</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a> 
-					</td>
-				</tr>
-			</table>
-		</div>
-		
-		<!-- 数据显示table -->
-		<div id = "tablePanel"	class="easyui-panel" style="padding:1px;top:300px;" title="回访列表" iconCls="icon-list" collapsible="true" closable="false">
-			<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
-		</div>
-		
-	    <div id="visitAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
-	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-	        <form id="visitAccountFM" method="post"  novalidate>
-	            <table>
-	            <tr>
-	            <td>店面</td>
-	            <td style="padding:5px">
-                <select name="ProjectId" id="ProjectId" style="width:230px;height: 20px"></select>
-                </td>
-	            </tr>
-	            <tr>
-	            <td>楼号</td>
-	            <td style="padding:5px"><input name="LouHao" id="LouHao" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>户号</td>
-	            <td style="padding:5px"><input name="HuHao" id="HuHao" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>回访情况</td>
-	            <td style="padding:5px"><input name="HuiFang" id="HuiFang" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>落实情况</td>
-	            <td style="padding:5px"><input name="LuoShi" id="LuoShi" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>住户姓名</td>
-	            <td style="padding:5px"><input name="Name" id="Name" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            <tr>
-	            <td>电话</td>
-	            <td style="padding:5px"><input name="Tel" id="Tel" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/></td>
-	            </tr>
-	            </table>
-	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
-	        </form>
-	    </div>
-	    <div id="dlg-buttons">
-	        <a href="javascript:void(0)" id="saveVisitAccount" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-	        <a href="javascript:void(0)" id="cancelVisitAccount" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#visitAccountDlg').dialog('close')">取消</a>
-	    </div>
-	    
-		<script type="text/javascript">
-			var depotList = null;
-			var depotID = null;
-			//初始化界面
-			$(function()
-			{
-				//初始化系统基础信息
-				initSystemData();
-				initSelectInfo();
-				initTableData();
-				ininPager();
-				initForm();
-			});	
-		
-			//初始化系统基础信息
-			function initSystemData()
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/depot/getBasicData.action",
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						depotList = systemInfo.showModel.map.depotList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//初始化页面选项卡
-			function initSelectInfo()
-			{
-				var options = "";
-				
-				if(depotList !=null)
-				{
-					options = "";
-					for(var i = 0 ;i < depotList.length;i ++)
-					{
-						var depot = depotList[i];
-						if(0 == i)
-						{
-							depotID = depot.id;
-						}
-						options += '<option value="' + depot.id + '">' + depot.name + '</option>';
-					}	
-					$("#ProjectId").empty().append(options);
-					$("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
-				}
-			}
-			
-			//防止表单提交重复
-			function initForm()
-			{
-				$('#visitAccountFM').form({
-				    onSubmit: function(){
-				        return false;
-				    }
-				});
-			}
-			
-			//初始化表格数据
-			function initTableData()
-			{
-				$('#tableData').datagrid({
-					//title:'回访列表',
-					//iconCls:'icon-save',
-					//width:700,
-					height:heightInfo,
-					nowrap: false,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/visitAccount/findBy.action?pageSize=' + initPageSize,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					pageSize: initPageSize,
-					pageList: initPageNum,
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '店面',field: 'ProjectName',width:80},
-			          { title: '楼号',field: 'LouHao',width:80},
-			          { title: '户号',field: 'HuHao',width:80},
-			          { title: '回访情况',field: 'HuiFang',width:150},
-			          { title: '落实情况',field: 'LuoShi',width:150},
-			          { title: '住户姓名',field: 'Name',width:150},
-			          { title: '电话',field: 'Tel',width:80},
-			          { title: '操作',field: 'op',align:"center",width:130,formatter:function(value,rec)
-			         	{
-							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.ProjectId+ 'AaBb' + rec.LouHao+ 'AaBb' + rec.HuHao
-							+ 'AaBb' + rec.HuiFang+ 'AaBb' + rec.LuoShi+ 'AaBb' + rec.Name+ 'AaBb' + rec.Tel;
-        					if(1 == value)
-        					{
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editVisitAccount(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editVisitAccount(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteVisitAccount('+ rec.Id +');"/>&nbsp;<a onclick="deleteVisitAccount('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
-        					}
-        					return str;
-						}
-			          }
-					]],
-					toolbar:[
-						{
-							id:'addVisitAccount',
-							text:'增加',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								addVisitAccount();
-							}
-						},
-						{
-							id:'deleteVisitAccount',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								batDeleteVisitAccount();	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			//初始化键盘enter事件
-			$(document).keydown(function(event)
-			{  
-			   	//兼容 IE和firefox 事件 
-			    var e = window.event || event;  
-			    var k = e.keyCode||e.which||e.charCode;  
-			    //兼容 IE,firefox 兼容  
-			    var obj = e.srcElement ? e.srcElement : e.target;  
-			    //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-			    if(k == "13"&&(obj.id=="LouHao"||obj.id=="HuHao"|| obj.id=="HuiFang"|| obj.id=="LuoShi"|| obj.id=="Name"|| obj.id=="Tel" ))
-			    {  
-			        $("#saveVisitAccount").click();
-			    }
-			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchLouHao"))
-			    {  
-			        $("#searchBtn").click();
-			    }  
-			}); 
-			//分页信息处理
-			function ininPager()
-			{
-				try
-				{
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					pager.pagination({  
-						onSelectPage:function(pageNum, pageSize)
-						{  
-							opts.pageNumber = pageNum;  
-							opts.pageSize = pageSize;  
-							pager.pagination('refresh',
-							{  
-								pageNumber:pageNum,  
-								pageSize:pageSize  
-							});  
-							showVisitAccountDetails(pageNum,pageSize);
-						}  
-					}); 
-				}
-				catch (e) 
-				{
-					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
-				}
-			}
-			
-			//删除回访信息
-			function deleteVisitAccount(visitAccountID)
-			{
-				$.messager.confirm('删除确认','确定要删除此回访信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
-						$.ajax({
-							type:"post",
-							url: "<%=path %>/visitAccount/delete.action",
-							dataType: "json",
-							data: ({
-								visitAccountID : visitAccountID,
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								var msg = tipInfo.showModel.msgTip;
-								if(msg == '成功')
-								{
-									//加载完以后重新初始化
-									$("#searchBtn").click();
-								}
-								else
-									$.messager.alert('删除提示','删除回访信息失败，请稍后再试！','error');
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('删除提示','删除回访信息异常，请稍后再试！','error');
-								return;
-							}
-						});			
-                    }
-                });
-			}
-			
-			//批量删除回访
-			function batDeleteVisitAccount()
-			{
-				var row = $('#tableData').datagrid('getChecked');	
-				if(row.length == 0)
-				{
-					$.messager.alert('删除提示','没有记录被选中！','info');				
-					return;	
-				}
-				if(row.length > 0)
-				{
-					$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条回访信息吗？',function(r)
-				 	{
-	                    if (r)
-	                    {
-	                    	var ids = "";
-	                        for(var i = 0;i < row.length; i ++)
-	                        {
-	                        	if(i == row.length-1)
-	                        	{
-	                        		ids += row[i].Id;
-	                        		break;
-	                        	}
-	                        	//alert(row[i].id);
-	                        	ids += row[i].Id + ",";
-	                        }
-	                        $.ajax({
-								type:"post",
-								url: "<%=path %>/visitAccount/batchDelete.action",
-								dataType: "json",
-								async :  false,
-								data: ({
-									visitAccountIDs : ids,
-									clientIp:'<%=clientIp %>'
-								}),
-								success: function (tipInfo)
-								{
-									var msg = tipInfo.showModel.msgTip;
-									if(msg == '成功')
-									{
-										//加载完以后重新初始化
-										$("#searchBtn").click();
-										$(":checkbox").attr("checked",false);
-									}
-									else
-										$.messager.alert('删除提示','删除回访信息失败，请稍后再试！','error');
-								},
-								//此处添加错误处理
-					    		error:function()
-					    		{
-					    			$.messager.alert('删除提示','删除回访信息异常，请稍后再试！','error');
-									return;
-								}
-							});	
-	                    }
-	                });
-				 }
-			}
-			
-			//增加
-			var url;
-			var visitAccountID = 0;
-			//保存编辑前的名称
-			var orgVisitAccount = "";
-			
-			function addVisitAccount()
-			{
-				$("#clientIp").val('<%=clientIp %>');
-				$('#visitAccountFM').form('clear');
-				$('#visitAccountDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加回访信息');
-				$(".window-mask").css({ width: webW ,height: webH});
-	            $("#name").val("").focus();
-	            
-	            orgVisitAccount = "";
-	            visitAccountID = 0;
-	            url = '<%=path %>/visitAccount/create.action';
-			}
-			
-			//保存信息
-			$("#saveVisitAccount").unbind().bind({
-				click:function()
-				{
-					if(!$('#visitAccountFM').form('validate'))
-						return;
-					else 
-					{
-						$.ajax({
-							type:"post",
-							url: url,
-							dataType: "json",
-							async :  false,
-							data: ({
-								ProjectId : $.trim($("#ProjectId").val()),
-								LouHao : $.trim($("#LouHao").val()),
-								HuHao : $.trim($("#HuHao").val()),
-								HuiFang : $.trim($("#HuiFang").val()),
-								LuoShi : $.trim($("#LuoShi").val()),
-								Name : $.trim($("#Name").val()),
-								Tel : $.trim($("#Tel").val()),
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								if(tipInfo)
-								{
-									$('#visitAccountDlg').dialog('close');
-			                        
-									var opts = $("#tableData").datagrid('options'); 
-									showVisitAccountDetails(opts.pageNumber,opts.pageSize); 
-								}
-								else
-								{
-									$.messager.show({
-			                            title: '错误提示',
-			                            msg: '保存回访信息失败，请稍后重试!'
-			                        });
-								}
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('提示','保存回访信息异常，请稍后再试！','error');
-								return;
-							}
-						});	
-					}
-				}
-			});
-			
-			//编辑信息
-	        function editVisitAccount(visitAccountTotalInfo)
-	        {
-	        	var visitAccountInfo = visitAccountTotalInfo.split("AaBb");
-	            
-	            $("#clientIp").val('<%=clientIp %>');
-	            $("#ProjectId").focus().val(visitAccountInfo[1]);
-	            $("#LouHao").val(visitAccountInfo[2]);
-	            $("#HuHao").val(visitAccountInfo[3]);
-	            $("#HuiFang").val(visitAccountInfo[4]);
-	            $("#LuoShi").val(visitAccountInfo[5]);
-	            $("#Name").val(visitAccountInfo[6]);
-	            $("#Tel").val(visitAccountInfo[7]);
-	            
-	            //orgVisitAccount = visitAccountInfo[1];
-                $('#visitAccountDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑回访信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                visitAccountID = visitAccountInfo[0];
-                //焦点在名称输入框==定焦在输入文字后面 
-                $("#name").val("").focus().val(visitAccountInfo[1]);
-                url = '<%=path %>/visitAccount/update.action?visitAccountID=' + visitAccountInfo[0];
-	        }
-	        
-			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
-				{
-					showVisitAccountDetails(1,initPageSize);	
-					var opts = $("#tableData").datagrid('options');  
-					var pager = $("#tableData").datagrid('getPager'); 
-					opts.pageNumber = 1;  
-					opts.pageSize = initPageSize;  
-					pager.pagination('refresh',
-					{  
-						pageNumber:1,  
-						pageSize:initPageSize  
-					});  
-				}
-			});
-			
-			function showVisitAccountDetails(pageNo,pageSize)
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path %>/visitAccount/findBy.action",
-					dataType: "json",
-					data: ({
-						ProjectId:$.trim($("#searchProjectId").val()),
-						LouHao:$.trim($("#searchLouHao").val()),
-						pageNo:pageNo,
-						pageSize:pageSize
-					}),
-					success: function (data)
-					{
-						$("#tableData").datagrid('loadData',data);
-					},
-					//此处添加错误处理
-		    		error:function()
-		    		{
-		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
-						return;
-					}
-				});
-			}
-			
-			//重置按钮
-			$("#searchResetBtn").unbind().bind({
-				click:function(){
-					$("#searchProjectId").val("");
-					$("#searchLouHao").val("");
-					
-					//加载完以后重新初始化
-					$("#searchBtn").click();
-			    }	
-			});
-			
-		</script>
-	</body>
-</html>
\ No newline at end of file