From 77e30a07c852abcb2a07882b3d885d83dc2f3e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 18 Dec 2016 22:02:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9A=84=E5=89=8D=E7=AB=AFUI=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsh/action/basic/AccountAction.class  |  Bin 10547 -> 10572 bytes
 .../jsh/action/basic/InOutItemAction.class    |  Bin 9644 -> 9833 bytes
 .../jsh/action/materials/PersonAction.class   |  Bin 9170 -> 9170 bytes
 WebRoot/pages/financial/giro.jsp              | 1870 ++++++++---------
 WebRoot/pages/financial/item_in.jsp           |    6 +-
 WebRoot/pages/financial/item_out.jsp          |    8 +-
 WebRoot/pages/financial/money_in.jsp          | 1870 ++++++++---------
 WebRoot/pages/financial/money_out.jsp         | 1870 ++++++++---------
 .../pages/materials/allocation_out_list.jsp   |   10 +-
 WebRoot/pages/materials/other_in_list.jsp     |    6 +-
 WebRoot/pages/materials/other_out_list.jsp    |    6 +-
 .../pages/materials/purchase_back_list.jsp    |    6 +-
 WebRoot/pages/materials/purchase_in_list.jsp  |    6 +-
 WebRoot/pages/materials/sale_back_list.jsp    |   10 +-
 WebRoot/pages/materials/sale_out_list.jsp     |    6 +-
 src/com/jsh/action/basic/AccountAction.java   |    4 +-
 src/com/jsh/action/basic/InOutItemAction.java |    6 +
 .../action/materials/AccountItemAction.java   |    7 -
 .../jsh/action/materials/PersonAction.java    |    4 -
 src/com/jsh/base/Log.java                     |    2 +-
 20 files changed, 2846 insertions(+), 2851 deletions(-)

diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/AccountAction.class
index a9588a4844a4868456bad25f4e0bb67b8480d24d..2c96015747ec259d8be89833fa243977c539c2f1 100644
GIT binary patch
delta 413
zcmYk2OG^TA6vgiuQ-(1S5tRWKEt1SIAzHO-r;$P~l2$V4NRzJ^HG<mo2?~Z@W^YUF
zZN`KJLEGrd^aZNF8RF`2ejE<>+*b56Dtvsuyb;j^9-BhKA@bM(aiJuSJ&<`ik;s>F
z#fX%ZwX7qYIt1C4q!lSpDk_;kP%12jrDXvXvhX-z`5X(z3-OGSmU*0ktOZ$Bq)a5=
zgH@14m9vtX?x9PNpd^{it4UeqQP+l?8>YKKG;r0bIo;OrZE-+HO2>RmG}*D+aZ1Pe
zMU#%zm}qQc9aR2#_xW|~x4t|<#L8?GhXXP*t&)K_rZcaoEIi|AcFc}r-xJw%Dz$0S
zKrseRyI`#c&bwf<2QKWWX<H+S;r?#<zuVQ<{TFn3=L~FtmiA5=u5qK)y&+cvGO;(Y
ZQ#?$;)acW3tMQ|5>pgQE9?&gs{sQu8Zd?EW

delta 351
zcmX>Tv^j|D)W2Q(7#J9g7}ss&N*0~mChDs<laWC%E3qt5zqBMXN8cl{IKwxwfQxYk
z11|^T97YE2yu{qp_~Q7S%<NPS#(9$&#Y9vVFf#BKrRF9UWy2*FF*0yvrU1G5MJcI8
z9E?jQTZ%QZt>R%^%D8Ov0WleVer-vXZH#H#7{kIP*@PK2C%;yeW1KqqkFxw`O*Ku%
z@M%D2F)>bO;0Dr57?>HDfV9_c#u<^@8E5%u3p38v+QJ~XjiGcWg9$T3I8b0NM4%cj
zFdrh&4;NS{%(!^+O7&zFWV2JDW{V@44OVEN5y%X5?Bo^=E9T{lD<&V*@DyLln92YQ
h0-#e=fixqKX4TrpxN@?hrVRgTAdiW04I{+xwE*MvTQL9t

diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/basic/InOutItemAction.class
index 967d6eedb2170d8cbd13a7a154cfc28691710c90..1c3dcddcb705e8b3400b785b5aa828965c105726 100644
GIT binary patch
delta 425
zcmX|*+be@{9LAq#GkZ6a>77%_p}e)YSX{7(J2mVIkqha)SenBao0`*{<}~NmjZ&`U
zMj@I|%B{b_E#+?@`P!DN=lgq}@9*<{F1tSc_Sc`sX8;X6zOnmVy21s*6b#uJ=dzVc
zgmXln(LG~&XxP&enF@x69bBQ0$PI*}`q;F>HNqB&O$LUhhXP@R>k@q&r`{9i3O5P!
zL^PssJ8fRQZ#)`(uBF@q2b0{neRG`__+DU!NgDJ%adhCG<Nn$^6sAzGaz4ey6R346
zS5+n+IB7=z1*-n@jdbqJ<XcBIrSTl7LaKljU?UVZp_E>@*$gjR(9TwLvkflUDbCzP
zkxYOBKVzH)IVdj&n04l4IupkR(>L5!hRbC|nv0z$wnvnrmcL5Zfbmt6U)G-H|1l)U
r^2uH98P%F*>41fuMweDul9Xl{jP{R7ao<?h$_ozVuZc$trq%cb3eHts

delta 232
zcmaFqv&Nh2)W2Q(7#J9g7+W`T`G`#3F4Dl($irB}Si9L)bPj(`Dg!eE6Hs1!H)D3>
zcE(&EZDGbzVaD>Ej0MaL;o2L3Qp^m(K#~tgGccMla4?!Ph%#C*hycaJAX*tjfh-0F
z4hDY4O2#S%M#fkmkB5N~DpCz(F@kKIyiip|(jKf6B+J0S3f0NTSjSjD`JSpOt1|;D
sqswFtHF@zGpdE}1+(1>TApIcKTH6>KCfljW@HYW@OpMKpnP9pF0P>3@kpKVy

diff --git a/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class b/WebRoot/WEB-INF/classes/com/jsh/action/materials/PersonAction.class
index 40b85e989b932c734ce722a7ec56df8bc42f8cad..01a4b7580aeeac75e2d126146303fb0c7e52b4ff 100644
GIT binary patch
delta 128
zcmccQe#w19m}1~-23v+V3_c9+7(yA|Gek0cWGG<x%uvbjg`u6{E5i(iZwxCLzB6oR
z_`z_L;U~i-hF=V~fNGvF`~~Xx&+wCxk>M93Gb0NlD-g0X@-T94UaqLb$ScCY!6?cg
f!6?R{!6-iYno<O#++=-aTUI3oRz~H?h02Kl3tuHf

delta 128
zcmWN{Jr2QO0LS6qKfFQcUQBHhY);U*i^V_~-JnJ%aDaDl1F=aAPT&IXU@)5zBD6lj
zGe0hI$$A*{&%|8lab>`bF?UiP%y=><V?oY}7hB%!_~7_*_@AT1Nd+<)a+Oq6MMhQC
g<ZYHgD9@*?I=&io)U^9>q|kPw*t9Te+i5iU0jx43wg3PC

diff --git a/WebRoot/pages/financial/giro.jsp b/WebRoot/pages/financial/giro.jsp
index 3678a121..5be78fb4 100644
--- a/WebRoot/pages/financial/giro.jsp
+++ b/WebRoot/pages/financial/giro.jsp
@@ -1,935 +1,935 @@
-<%@page import="com.jsh.util.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>
-		<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/My97DatePicker/WdatePicker.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
-  	</head>
-  	<body>
-  		<!-- 查询 -->
-		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
-			<table id="searchTable">
-				<tr>
-					<td>单据号：</td>
-					<td>
-						<input type="text" name="searchBillNo" id="searchBillNo" 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:80px;"/>
-					</td>
-					<td>-</td>
-					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
-					</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&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="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
-	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-	        <form id="accountHeadFM" method="post"  novalidate>
-	            <table>
-	            <tr>	
-	            <td>单据编号：</td>
-	            <td style="padding:5px"><input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
-	            </td>            
-                <td>单据日期：</td>
-                <td style="padding:5px">
-                <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
-                </td>         
-	            <td>账户：</td>
-	            <td style="padding:5px">
-	            <select id="AccountId" name="AccountId" style="width:120px;"></select>
-	            </td>
-	            <td>金额：</td>
-				<td>
-					<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
-				</td>
-	            </tr>
-	            <tr>
-	            <td>单位：</td>
-	            <td style="padding:5px">
-                <select name="OrganId" id="OrganId" style="width:120px;"></select>
-                </td>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
-	            </td>
-	            <td>备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
-	            </td>
-	            <td></td>
-	            <td></td>
-	            </tr>
-	            <tr>
-	            <td>单据明细：</td>
-	            <td colspan="7">
-			    <!-- 单据列表table -->
-				<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
-	            </td>
-	            </tr>
-	            </table>
-	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
-	        </form>
-	    </div>
-	    <div id="dlg-buttons">
-	        <a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-	        <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
-	    </div>
-	    <div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
-	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
-	            <table>
-	            <tr>
-	            <td>单据编号：</td>
-                <td style="padding:5px;width:120px;">
-                <span id="BillNoShow"></span>
-                </td>
-	            <td>单据日期：</td>
-	            <td style="padding:5px;width:120px;">
-                <span id="BillTimeShow"></span>
-                </td>                
-	            <td>账户：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="AccountIdShow"></span>
-	            </td>
-	            <td>金额：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="ChangeAmountShow"></span>
-	            </td>
-	            </tr>
-	            <tr>
-	            <td>单位：</td>
-	            <td style="padding:5px">
-	            <span id="OrganIdShow"></span>
-	            </td>
-	            <td>经手人：</td>
-				<td style="padding:5px">
-				<span id="HandsPersonIdShow"></span>
-				</td>
-	            <td>备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>
-	            <td></td>	            
-	            <td></td>
-	            </tr>
-	            <tr>
-	            <td>单据明细：</td>
-	            <td colspan="7">
-			    <!-- 单据列表table -->
-				<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
-	            </td>
-	            </tr>
-	            </table>
-	    </div>
-	    
-		<script type="text/javascript">
-			var accountList = null;
-			var accountID = null;
-			var supplierList = null;
-			var supplierID = null;
-			var personList = null;
-			var personID = null;
-			var ProjectSearch=null;
-			var kid=${sessionScope.user.id};
-			var accountHeadMaxId=null; //获取最大的Id
-			var accepId=null; //保存的主表id
-			//初始化界面
-			$(function()
-			{
-				initSystemData_person(); //经手人数据
-				initSelectInfo_person(); //经手人信息
-				initSystemData_account(); //账户数据
-				initSelectInfo_account(); //账户信息
-				initSupplier(); //供应商
-				initTableData();
-				ininPager();
-				initForm();			
-				$("#searchBtn").click();	
-			});	
-			
-			//获取账户信息
-			function initSystemData_account()
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/account/getAccount.action",
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						accountList = systemInfo.showModel.map.accountList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//获取账户信息
-			function initSelectInfo_account()
-			{
-				var options = "";				
-				if(accountList !=null)
-				{
-					options = "";
-					for(var i = 0 ;i < accountList.length;i ++)
-					{
-						var account = accountList[i];
-						options += '<option value="' + account.id + '">' + account.name + '</option>';
-					}	
-					$("#AccountId").empty().append(options);
-				}
-			}
-			
-			//初始化单位信息
-			function initSupplier()
-			{
-				$('#OrganId').combobox({    
-					url: "<%=path%>/supplier/findBySelect_sup.action",
-				    valueField:'id',    
-				    textField:'supplier'
-				});  
-			}
-			
-			//获取财务员
-			function initSystemData_person()
-			{
-				var type = "财务员";
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/person/getPersonByType.action",
-					data: {
-						Type: type
-					},
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						personList = systemInfo.showModel.map.personList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//获取财务员
-			function initSelectInfo_person()
-			{
-				var options = "";
-				
-				if(personList !=null)
-				{
-					for(var i = 0 ;i < personList.length;i ++)
-					{
-						var person = personList[i];
-						if(0 == i)
-						{
-							personID = person.id;
-						}
-						if(person.type=="财务员")
-						{
-							options += '<option value="' + person.id + '">' + person.name + '</option>';
-						}		
-					}
-					$("#HandsPersonId").empty().append(options);
-				}
-			}
-			
-			//防止表单提交重复
-			function initForm()
-			{
-				$('#accountHeadFM').form({
-				    onSubmit: function(){
-				        return false;
-				    }
-				});
-			}
-			
-			//初始化表格数据
-			function initTableData()
-			{
-				$('#tableData').datagrid({
-					//width:700,
-					height:heightInfo,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					//url:'<%=path %>/accountHead/findBy.action?pageSize=' + initPageSize,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					pageSize: 5,
-					pageList: initPageNum,
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '单据编号',field: 'BillNo',width:100},
-			          { title: '单据时间 ',field: 'BillTime',width:100},
-			          { title: '备注',field: 'Remark',width:100},
-			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
-			         	{
-							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
-							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName 
-							+ 'AaBb' + rec.HandsPersonId + 'AaBb' + rec.HandsPersonName + 'AaBb' + rec.ChangeAmount;
-        					if(1 == value)
-        					{
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountHead(\'' + 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/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccountHead(\'' + 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="deleteAccountHead('+ rec.Id +');"/>&nbsp;<a onclick="deleteAccountHead('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>';
-        					}
-        					return str;
-						}
-			          }
-					]],
-					toolbar:[
-						{
-							id:'addAccountHead',
-							text:'增加',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								addAccountHead();
-							}
-						},
-						{
-							id:'deleteAccountHead',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								batDeleteAccountHead();	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			//初始化表格数据-明细列表-编辑状态
-			function initTableData_account()
-			{
-				$('#accountData').datagrid({
-					height:300,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					onClickRow: onClickRow,
-					pageSize: 50,
-					pageList: [50,100,150],
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemId',width:230,
-						  formatter:function(value,row,index){
-								  return row.InOutItemName;
-	                      },
-						  editor:{
-                          type:'combobox',
-                          options:{
-                              valueField:'Id',
-                              textField:'InOutItemName',
-                              method:'get',
-                              url: "<%=path%>/inOutItem/findBySelect.action"
-                          }
-			            }
-					  },
-			          { title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
-			          { title: '备注',field: 'Remark',editor:'validatebox',width:150}
-					]],
-					toolbar:[
-						{
-							id:'append',
-							text:'新增',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								append(); //新增
-							}
-						},
-						{
-							id:'delete',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								removeit(); //删除	
-							}
-						},
-						{
-							id:'reject',
-							text:'撤销',
-							iconCls:'icon-undo',
-							handler:function()
-							{
-								reject(); //撤销	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			
-			//初始化表格数据-明细列表-查看状态
-			function initTableData_account_show()
-			{
-				$('#accountDataShow').datagrid({
-					height:300,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					onClickRow: onClickRow,
-					pageSize: 50,
-					pageList: [50,100,150],
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemName',width:230},
-			          { title: '金额',field: 'EachAmount',width:50},
-			          { title: '备注',field: 'Remark',width:150}
-					]],
-					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=="BillNo"||obj.id=="BillTime"))
-			    {  
-			        $("#saveAccountHead").click();
-			    }
-			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchBillNo"))
-			    {  
-			        $("#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  
-							});  
-							showAccountHeadDetails(pageNum,pageSize);
-						}  
-					}); 
-				}
-				catch (e) 
-				{
-					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
-				}
-			}
-			
-			//删除财务信息
-			function deleteAccountHead(accountHeadID)
-			{
-				$.messager.confirm('删除确认','确定要删除此财务信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
-						$.ajax({
-							type:"post",
-							url: "<%=path %>/accountHead/delete.action",
-							dataType: "json",
-							data: ({
-								accountHeadID : accountHeadID,
-								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 batDeleteAccountHead()
-			{
-				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 %>/accountHead/batchDelete.action",
-								dataType: "json",
-								async :  false,
-								data: ({
-									accountHeadIDs : 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 accountHeadID = 0;
-			//保存编辑前的名称
-			var orgAccountHead = "";
-			
-			function addAccountHead()
-			{
-				$("#clientIp").val('<%=clientIp %>');
-				$('#accountHeadFM').form('clear');
-				$('#accountHeadDlg').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});
-	            $("#BillNo").val("").focus();
-	            
-	            orgAccountHead = "";
-	            accountHeadID = 0;
-	            initTableData_account(); //明细列表
-	            reject(); //撤销下、刷新材料列表
-	            url = '<%=path %>/accountHead/create.action';
-			}
-			
-			//保存信息
-			$("#saveAccountHead").unbind().bind({
-				click:function()
-				{
-					if(!$('#accountHeadFM').form('validate'))
-						return;
-					else 
-					{
-						$.ajax({
-							type:"post",
-							url: url,
-							dataType: "json",
-							async :  false,
-							data: ({
-								Type: "转账",
-								BillNo : $.trim($("#BillNo").val()),
-								BillTime : $.trim($("#BillTime").val()),
-								AccountId: $.trim($("#AccountId").val()),
-								ChangeAmount: $.trim($("#ChangeAmount").val()),
-								OrganId: $('#OrganId').combobox('getValue'),
-								HandsPersonId: $.trim($("#HandsPersonId").val()),
-								Remark: $.trim($("#Remark").val()),
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								if(tipInfo)
-								{
-									//保存明细记录
-									if(accountHeadID ==0)
-									{
-										getMaxId(); //查找最大的Id
-										accept(accountHeadMaxId); //新增
-									}
-									else
-									{
-										accept(accountHeadID); //修改
-									}
-									
-									
-									$('#accountHeadDlg').dialog('close');
-									var opts = $("#tableData").datagrid('options'); 
-									showAccountHeadDetails(opts.pageNumber,opts.pageSize); 
-								}
-								else
-								{
-									$.messager.show({
-			                            title: '错误提示',
-			                            msg: '保存信息失败，请稍后重试!'
-			                        });
-								}
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('提示','保存信息异常，请稍后再试！','error');
-								return;
-							}
-						});	
-					}
-				}
-			});
-			
-			//编辑信息
-	        function editAccountHead(accountHeadTotalInfo)
-	        {
-	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
-	            $("#clientIp").val('<%=clientIp %>');
-	            $("#BillNo").val(accountHeadInfo[1]);
-	            $("#BillTime").val(accountHeadInfo[2]);
-	            $("#Remark").val(accountHeadInfo[3]);
-	            $("#AccountId").val(accountHeadInfo[4]);
-	            $('#OrganId').combobox('setValue', accountHeadInfo[6]);
-	            $("#HandsPersonId").val(accountHeadInfo[8]);
-	            $("#ChangeAmount").val(accountHeadInfo[10]);	            	            
-                $('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑财务信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                accountHeadID = accountHeadInfo[0];
-                
-                initTableData_account(); //明细列表
-                reject(); //撤销下、刷新材料列表                
-                url = '<%=path %>/accountHead/update.action?accountHeadID=' + accountHeadInfo[0];
-	        }
-	        
-	        //查看信息
-	        function showAccountHead(accountHeadTotalInfo)
-	        {
-	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
-	            $("#BillNoShow").text(accountHeadInfo[1]);
-	            $("#BillTimeShow").text(accountHeadInfo[2]);	     
-	            $("#RemarkShow").text(accountHeadInfo[3]);       
-	            $("#AccountIdShow").text(accountHeadInfo[5]);
-	            $('#OrganIdShow').text(accountHeadInfo[7]);
-	            $("#HandsPersonIdShow").text(accountHeadInfo[9]);	            
-	            $("#ChangeAmountShow").text(accountHeadInfo[10]);
-	            $('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看财务信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                
-                accountHeadID = accountHeadInfo[0];
-                initTableData_account_show(); //明细列表-查看状态
-	        }
-	        
-			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
-				{
-					showAccountHeadDetails(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 showAccountHeadDetails(pageNo,pageSize)
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path %>/accountHead/findBy.action",
-					dataType: "json",
-					data: ({
-						Type:"转账",
-						BillNo:$.trim($("#searchBillNo").val()),
-						BeginTime:$("#searchBeginTime").val(),
-						EndTime:$("#searchEndTime").val(),
-						pageNo:pageNo,
-						pageSize:pageSize
-					}),
-					success: function (data)
-					{
-						$("#tableData").datagrid('loadData',data);
-					},
-					//此处添加错误处理
-		    		error:function()
-		    		{
-		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
-						return;
-					}
-				});
-			}
-			//重置按钮
-			$("#searchResetBtn").unbind().bind({
-				click:function(){
-					$("#searchBillNo").val("");
-					$("#searchBeginTime").val("");
-					$("#searchEndTime").val("");
-					//加载完以后重新初始化
-					$("#searchBtn").click();
-			    }	
-			});
-			
-			//结束编辑
-			var editIndex = undefined;
-	        function endEditing() {
-	            if (editIndex == undefined) { return true }
-	            if ($('#accountData').datagrid('validateRow', editIndex)) {
-	            	var ed = $('#accountData').datagrid('getEditor', {index:editIndex,field:'InOutItemId'});
-	                var InOutItemName = $(ed.target).combobox('getText');
-	                $('#accountData').datagrid('getRows')[editIndex]['InOutItemName'] = InOutItemName;
-	                $('#accountData').datagrid('endEdit', editIndex);
-	                editIndex = undefined;
-	                return true;
-	            } else {
-	                return false;
-	            }
-	        }
-	        //单击
-	        function onClickRow(index) {
-	            if (editIndex != index) {
-	                if (endEditing()) {
-	                    $('#accountData').datagrid('selectRow', index)
-	                            .datagrid('beginEdit', index);
-	                    editIndex = index;
-	                } else {
-	                    $('#accountData').datagrid('selectRow', editIndex);
-	                }
-	            }
-	        }
-			//新增
-			function append()  
-			{
-	            if (endEditing()) {
-	                $('#accountData').datagrid('appendRow', {});
-	                editIndex = $('#accountData').datagrid('getRows').length - 1;
-	                $('#accountData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
-	            }
-			}
-			//删除
-	        function removeit() {
-	            if (editIndex == undefined) { return }
-	            $('#accountData').datagrid('cancelEdit', editIndex)
-	                    .datagrid('deleteRow', editIndex);
-	            editIndex = undefined;
-	        }
-	        //撤销
-	        function reject() {
-	            $('#accountData').datagrid('rejectChanges');
-	            editIndex = undefined;
-	        }
-	        //判断
-	        function CheckData() {
-	            var row = $('#accountData').datagrid('getRows');
-	            var totalRowNum = "";
-	            for (var i = 0; i < row.length; i++) {
-	                if (row[i].InOutItemId == "") {
-	                    totalRowNum += (i + 1) + "、";
-	                }
-	            }
-	            if (totalRowNum != "") {
-	                var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
-	                $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
-	                return false;
-	            }
-	            return true;
-	        }
-	        //保存
-	        function accept(accepId) {
-	            append();
-	            removeit();
-	            if ($("#accountData").datagrid('getChanges').length) {
-	                if (!CheckData())
-	                    return false;
-	                var inserted = $("#accountData").datagrid('getChanges', "inserted");
-	                var deleted = $("#accountData").datagrid('getChanges', "deleted");
-	                var updated = $("#accountData").datagrid('getChanges', "updated");
-	                $.ajax({
-	                    type: "post",
-	                    url: "<%=path%>/accountItem/saveDetials.action",
-	                    data: {
-	                        Inserted: JSON.stringify(inserted),
-	                        Deleted: JSON.stringify(deleted),
-	                        Updated: JSON.stringify(updated),
-	                        HeaderId:accepId,
-	                        clientIp:'<%=clientIp %>'
-	                    },
-	                    success: function (tipInfo) 
-	                    { 
-	                        if (tipInfo) {
-	                            $.messager.alert('提示','保存成功！','info');	
-	                        }
-	                        else
-	                        	$.messager.alert('提示','保存失败！','error');	
-
-	                    },
-	                    error: function (XmlHttpRequest, textStatus, errorThrown) 
-	                    {
-	                        $.messager.alert('提示',XmlHttpRequest.responseText,'error');	
-	                    }
-	                });
-	            }
-	            if (endEditing()) {
-	                $('#accountData').datagrid('acceptChanges');
-	            }
-	        }
-	        //获取MaxId
-	        function getMaxId()
-	        {
-	    	    var accountHeadMax=null;
-	        	$.ajax({
-	        		type:"post",
-	        		url: "<%=path%>/accountHead/getMaxId.action",
-	        		//设置为同步
-	        		async:false,
-	        		dataType: "json",
-	        		success: function (systemInfo)
-	        		{
-	        			if(systemInfo)
-	        			{
-	        				accountHeadMax = systemInfo.showModel.map.accountHeadMax;
-	        				var msgTip = systemInfo.showModel.msgTip;
-	        				if(msgTip == "exceptoin")
-	        				{
-	        					$.messager.alert('提示','查找最大的Id异常,请与管理员联系！','error');
-	        					return;
-	        				}
-	        			}
-	        			else
-	        			{
-	        				accountHeadMax=null;
-	        			}
-	        		}
-	        	});
-	        	
-	        	if(accountHeadMax !=null)
-	        	{
-	        		if(accountHeadMax.length>0)
-	        		{
-	        			accountHeadMaxId=accountHeadMax[0];
-	        		}
-	        	}
-	        }
-		</script>
-	</body>
-</html>
+<%@page import="com.jsh.util.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>
+		<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/My97DatePicker/WdatePicker.js"></script>
+		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
+  	</head>
+  	<body>
+  		<!-- 查询 -->
+		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
+			<table id="searchTable">
+				<tr>
+					<td>单据号：</td>
+					<td>
+						<input type="text" name="searchBillNo" id="searchBillNo" 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:80px;"/>
+					</td>
+					<td>-</td>
+					<td>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>
+						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&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="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+	        <form id="accountHeadFM" method="post"  novalidate>
+	            <table>
+	            <tr>	
+	            <td>单据编号：</td>
+	            <td style="padding:5px"><input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
+	            </td>            
+                <td>单据日期：</td>
+                <td style="padding:5px">
+                <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
+                </td>         
+	            <td>账户：</td>
+	            <td style="padding:5px">
+	            <select id="AccountId" name="AccountId" style="width:120px;"></select>
+	            </td>
+	            <td>金额：</td>
+				<td>
+					<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
+				</td>
+	            </tr>
+	            <tr>
+	            <td>单位：</td>
+	            <td style="padding:5px">
+                <select name="OrganId" id="OrganId" style="width:120px;"></select>
+                </td>
+	            <td>经手人：</td>
+	            <td style="padding:5px">
+	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
+	            </td>
+	            <td>备注：</td>
+	            <td style="padding:5px">
+	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
+	            </td>
+	            <td></td>
+	            <td></td>
+	            </tr>
+	            <tr>
+	            <td>单据明细：</td>
+	            <td colspan="7">
+			    <!-- 单据列表table -->
+				<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
+	            </td>
+	            </tr>
+	            </table>
+	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+	        </form>
+	    </div>
+	    <div id="dlg-buttons">
+	        <a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+	        <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
+	    </div>
+	    <div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
+	            <table>
+	            <tr>
+	            <td>单据编号：</td>
+                <td style="padding:5px;width:120px;">
+                <span id="BillNoShow"></span>
+                </td>
+	            <td>单据日期：</td>
+	            <td style="padding:5px;width:120px;">
+                <span id="BillTimeShow"></span>
+                </td>                
+	            <td>账户：</td>
+	            <td style="padding:5px;width:120px;">
+	            <span id="AccountIdShow"></span>
+	            </td>
+	            <td>金额：</td>
+	            <td style="padding:5px;width:120px;">
+	            <span id="ChangeAmountShow"></span>
+	            </td>
+	            </tr>
+	            <tr>
+	            <td>单位：</td>
+	            <td style="padding:5px">
+	            <span id="OrganIdShow"></span>
+	            </td>
+	            <td>经手人：</td>
+				<td style="padding:5px">
+				<span id="HandsPersonIdShow"></span>
+				</td>
+	            <td>备注：</td>
+	            <td style="padding:5px">
+	            <span id="RemarkShow"></span>
+	            </td>
+	            <td></td>	            
+	            <td></td>
+	            </tr>
+	            <tr>
+	            <td>单据明细：</td>
+	            <td colspan="7">
+			    <!-- 单据列表table -->
+				<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+	            </td>
+	            </tr>
+	            </table>
+	    </div>
+	    
+		<script type="text/javascript">
+			var accountList = null;
+			var accountID = null;
+			var supplierList = null;
+			var supplierID = null;
+			var personList = null;
+			var personID = null;
+			var ProjectSearch=null;
+			var kid=${sessionScope.user.id};
+			var accountHeadMaxId=null; //获取最大的Id
+			var accepId=null; //保存的主表id
+			//初始化界面
+			$(function()
+			{
+				initSystemData_person(); //经手人数据
+				initSelectInfo_person(); //经手人信息
+				initSystemData_account(); //账户数据
+				initSelectInfo_account(); //账户信息
+				initSupplier(); //供应商
+				initTableData();
+				ininPager();
+				initForm();			
+				$("#searchBtn").click();	
+			});	
+			
+			//获取账户信息
+			function initSystemData_account()
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path%>/account/getAccount.action",
+					//设置为同步
+					async:false,
+					dataType: "json",
+					success: function (systemInfo)
+					{
+						accountList = systemInfo.showModel.map.accountList;
+						var msgTip = systemInfo.showModel.msgTip;
+						if(msgTip == "exceptoin")
+						{
+							$.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
+							return;
+						}	
+					}
+				});				
+			}
+			//获取账户信息
+			function initSelectInfo_account()
+			{
+				var options = "";				
+				if(accountList !=null)
+				{
+					options = "";
+					for(var i = 0 ;i < accountList.length;i ++)
+					{
+						var account = accountList[i];
+						options += '<option value="' + account.id + '">' + account.name + '</option>';
+					}	
+					$("#AccountId").empty().append(options);
+				}
+			}
+			
+			//初始化单位信息
+			function initSupplier()
+			{
+				$('#OrganId').combobox({    
+					url: "<%=path%>/supplier/findBySelect_sup.action",
+				    valueField:'id',    
+				    textField:'supplier'
+				});  
+			}
+			
+			//获取财务员
+			function initSystemData_person()
+			{
+				var type = "财务员";
+				$.ajax({
+					type:"post",
+					url: "<%=path%>/person/getPersonByType.action",
+					data: {
+						Type: type
+					},
+					//设置为同步
+					async:false,
+					dataType: "json",
+					success: function (systemInfo)
+					{
+						personList = systemInfo.showModel.map.personList;
+						var msgTip = systemInfo.showModel.msgTip;
+						if(msgTip == "exceptoin")
+						{
+							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
+							return;
+						}	
+					}
+				});				
+			}
+			//获取财务员
+			function initSelectInfo_person()
+			{
+				var options = "";
+				
+				if(personList !=null)
+				{
+					for(var i = 0 ;i < personList.length;i ++)
+					{
+						var person = personList[i];
+						if(0 == i)
+						{
+							personID = person.id;
+						}
+						if(person.type=="财务员")
+						{
+							options += '<option value="' + person.id + '">' + person.name + '</option>';
+						}		
+					}
+					$("#HandsPersonId").empty().append(options);
+				}
+			}
+			
+			//防止表单提交重复
+			function initForm()
+			{
+				$('#accountHeadFM').form({
+				    onSubmit: function(){
+				        return false;
+				    }
+				});
+			}
+			
+			//初始化表格数据
+			function initTableData()
+			{
+				$('#tableData').datagrid({
+					//width:700,
+					height:heightInfo,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					//url:'<%=path %>/accountHead/findBy.action?pageSize=' + initPageSize,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					pageSize: 5,
+					pageList: initPageNum,
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '单据编号',field: 'BillNo',width:100},
+			          { title: '单据时间 ',field: 'BillTime',width:100},
+			          { title: '备注',field: 'Remark',width:100},
+			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
+			         	{
+							var str = '';
+							var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
+							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName 
+							+ 'AaBb' + rec.HandsPersonId + 'AaBb' + rec.HandsPersonName + 'AaBb' + rec.ChangeAmount;
+        					if(1 == value)
+        					{
+        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountHead(\'' + 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/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccountHead(\'' + 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="deleteAccountHead('+ rec.Id +');"/>&nbsp;<a onclick="deleteAccountHead('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>';
+        					}
+        					return str;
+						}
+			          }
+					]],
+					toolbar:[
+						{
+							id:'addAccountHead',
+							text:'增加',
+							iconCls:'icon-add',
+							handler:function()
+							{
+								addAccountHead();
+							}
+						},
+						{
+							id:'deleteAccountHead',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function()
+							{
+								batDeleteAccountHead();	
+							}
+						}
+					],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}    
+				});
+			}
+			
+			//初始化表格数据-明细列表-编辑状态
+			function initTableData_account()
+			{
+				$('#accountData').datagrid({
+					height:300,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					onClickRow: onClickRow,
+					pageSize: 50,
+					pageList: [50,100,150],
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '账户名称',field: 'AccountId',width:230,
+						  formatter:function(value,row,index){
+								  return row.AccountName;
+	                      },
+						  editor:{
+                          type:'combobox',
+                          options:{
+                              valueField:'Id',
+                              textField:'AccountName',
+                              method:'get',
+                              url: "<%=path%>/account/findBySelect.action"
+                          }
+			            }
+					  },
+			          { title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
+			          { title: '备注',field: 'Remark',editor:'validatebox',width:150}
+					]],
+					toolbar:[
+						{
+							id:'append',
+							text:'新增',
+							iconCls:'icon-add',
+							handler:function()
+							{
+								append(); //新增
+							}
+						},
+						{
+							id:'delete',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function()
+							{
+								removeit(); //删除	
+							}
+						},
+						{
+							id:'reject',
+							text:'撤销',
+							iconCls:'icon-undo',
+							handler:function()
+							{
+								reject(); //撤销	
+							}
+						}
+					],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}    
+				});
+			}
+			
+			
+			//初始化表格数据-明细列表-查看状态
+			function initTableData_account_show()
+			{
+				$('#accountDataShow').datagrid({
+					height:300,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					onClickRow: onClickRow,
+					pageSize: 50,
+					pageList: [50,100,150],
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '账户名称',field: 'AccountName',width:230},
+			          { title: '金额',field: 'EachAmount',width:50},
+			          { title: '备注',field: 'Remark',width:150}
+					]],
+					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=="BillNo"||obj.id=="BillTime"))
+			    {  
+			        $("#saveAccountHead").click();
+			    }
+			    //搜索按钮添加快捷键
+			    if(k == "13"&&(obj.id=="searchBillNo"))
+			    {  
+			        $("#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  
+							});  
+							showAccountHeadDetails(pageNum,pageSize);
+						}  
+					}); 
+				}
+				catch (e) 
+				{
+					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
+				}
+			}
+			
+			//删除财务信息
+			function deleteAccountHead(accountHeadID)
+			{
+				$.messager.confirm('删除确认','确定要删除此财务信息吗？',function(r)
+			 	{
+                    if (r)
+                    {
+						$.ajax({
+							type:"post",
+							url: "<%=path %>/accountHead/delete.action",
+							dataType: "json",
+							data: ({
+								accountHeadID : accountHeadID,
+								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 batDeleteAccountHead()
+			{
+				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 %>/accountHead/batchDelete.action",
+								dataType: "json",
+								async :  false,
+								data: ({
+									accountHeadIDs : 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 accountHeadID = 0;
+			//保存编辑前的名称
+			var orgAccountHead = "";
+			
+			function addAccountHead()
+			{
+				$("#clientIp").val('<%=clientIp %>');
+				$('#accountHeadFM').form('clear');
+				$('#accountHeadDlg').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});
+	            $("#BillNo").val("").focus();
+	            
+	            orgAccountHead = "";
+	            accountHeadID = 0;
+	            initTableData_account(); //明细列表
+	            reject(); //撤销下、刷新材料列表
+	            url = '<%=path %>/accountHead/create.action';
+			}
+			
+			//保存信息
+			$("#saveAccountHead").unbind().bind({
+				click:function()
+				{
+					if(!$('#accountHeadFM').form('validate'))
+						return;
+					else 
+					{
+						$.ajax({
+							type:"post",
+							url: url,
+							dataType: "json",
+							async :  false,
+							data: ({
+								Type: "转账",
+								BillNo : $.trim($("#BillNo").val()),
+								BillTime : $.trim($("#BillTime").val()),
+								AccountId: $.trim($("#AccountId").val()),
+								ChangeAmount: $.trim($("#ChangeAmount").val()),
+								OrganId: $('#OrganId').combobox('getValue'),
+								HandsPersonId: $.trim($("#HandsPersonId").val()),
+								Remark: $.trim($("#Remark").val()),
+								clientIp:'<%=clientIp %>'
+							}),
+							success: function (tipInfo)
+							{
+								if(tipInfo)
+								{
+									//保存明细记录
+									if(accountHeadID ==0)
+									{
+										getMaxId(); //查找最大的Id
+										accept(accountHeadMaxId); //新增
+									}
+									else
+									{
+										accept(accountHeadID); //修改
+									}
+									
+									
+									$('#accountHeadDlg').dialog('close');
+									var opts = $("#tableData").datagrid('options'); 
+									showAccountHeadDetails(opts.pageNumber,opts.pageSize); 
+								}
+								else
+								{
+									$.messager.show({
+			                            title: '错误提示',
+			                            msg: '保存信息失败，请稍后重试!'
+			                        });
+								}
+							},
+							//此处添加错误处理
+				    		error:function()
+				    		{
+				    			$.messager.alert('提示','保存信息异常，请稍后再试！','error');
+								return;
+							}
+						});	
+					}
+				}
+			});
+			
+			//编辑信息
+	        function editAccountHead(accountHeadTotalInfo)
+	        {
+	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
+	            $("#clientIp").val('<%=clientIp %>');
+	            $("#BillNo").val(accountHeadInfo[1]);
+	            $("#BillTime").val(accountHeadInfo[2]);
+	            $("#Remark").val(accountHeadInfo[3]);
+	            $("#AccountId").val(accountHeadInfo[4]);
+	            $('#OrganId').combobox('setValue', accountHeadInfo[6]);
+	            $("#HandsPersonId").val(accountHeadInfo[8]);
+	            $("#ChangeAmount").val(accountHeadInfo[10]);	            	            
+                $('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑财务信息');
+                $(".window-mask").css({ width: webW ,height: webH});
+                accountHeadID = accountHeadInfo[0];
+                
+                initTableData_account(); //明细列表
+                reject(); //撤销下、刷新材料列表                
+                url = '<%=path %>/accountHead/update.action?accountHeadID=' + accountHeadInfo[0];
+	        }
+	        
+	        //查看信息
+	        function showAccountHead(accountHeadTotalInfo)
+	        {
+	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
+	            $("#BillNoShow").text(accountHeadInfo[1]);
+	            $("#BillTimeShow").text(accountHeadInfo[2]);	     
+	            $("#RemarkShow").text(accountHeadInfo[3]);       
+	            $("#AccountIdShow").text(accountHeadInfo[5]);
+	            $('#OrganIdShow').text(accountHeadInfo[7]);
+	            $("#HandsPersonIdShow").text(accountHeadInfo[9]);	            
+	            $("#ChangeAmountShow").text(accountHeadInfo[10]);
+	            $('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看财务信息');
+                $(".window-mask").css({ width: webW ,height: webH});
+                
+                accountHeadID = accountHeadInfo[0];
+                initTableData_account_show(); //明细列表-查看状态
+	        }
+	        
+			//搜索处理
+			$("#searchBtn").unbind().bind({
+				click:function()
+				{
+					showAccountHeadDetails(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 showAccountHeadDetails(pageNo,pageSize)
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path %>/accountHead/findBy.action",
+					dataType: "json",
+					data: ({
+						Type:"转账",
+						BillNo:$.trim($("#searchBillNo").val()),
+						BeginTime:$("#searchBeginTime").val(),
+						EndTime:$("#searchEndTime").val(),
+						pageNo:pageNo,
+						pageSize:pageSize
+					}),
+					success: function (data)
+					{
+						$("#tableData").datagrid('loadData',data);
+					},
+					//此处添加错误处理
+		    		error:function()
+		    		{
+		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+						return;
+					}
+				});
+			}
+			//重置按钮
+			$("#searchResetBtn").unbind().bind({
+				click:function(){
+					$("#searchBillNo").val("");
+					$("#searchBeginTime").val("");
+					$("#searchEndTime").val("");
+					//加载完以后重新初始化
+					$("#searchBtn").click();
+			    }	
+			});
+			
+			//结束编辑
+			var editIndex = undefined;
+	        function endEditing() {
+	            if (editIndex == undefined) { return true }
+	            if ($('#accountData').datagrid('validateRow', editIndex)) {
+	            	var ed = $('#accountData').datagrid('getEditor', {index:editIndex,field:'AccountId'});
+	                var AccountName = $(ed.target).combobox('getText');
+	                $('#accountData').datagrid('getRows')[editIndex]['AccountName'] = AccountName;
+	                $('#accountData').datagrid('endEdit', editIndex);
+	                editIndex = undefined;
+	                return true;
+	            } else {
+	                return false;
+	            }
+	        }
+	        //单击
+	        function onClickRow(index) {
+	            if (editIndex != index) {
+	                if (endEditing()) {
+	                    $('#accountData').datagrid('selectRow', index)
+	                            .datagrid('beginEdit', index);
+	                    editIndex = index;
+	                } else {
+	                    $('#accountData').datagrid('selectRow', editIndex);
+	                }
+	            }
+	        }
+			//新增
+			function append()  
+			{
+	            if (endEditing()) {
+	                $('#accountData').datagrid('appendRow', {});
+	                editIndex = $('#accountData').datagrid('getRows').length - 1;
+	                $('#accountData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
+	            }
+			}
+			//删除
+	        function removeit() {
+	            if (editIndex == undefined) { return }
+	            $('#accountData').datagrid('cancelEdit', editIndex)
+	                    .datagrid('deleteRow', editIndex);
+	            editIndex = undefined;
+	        }
+	        //撤销
+	        function reject() {
+	            $('#accountData').datagrid('rejectChanges');
+	            editIndex = undefined;
+	        }
+	        //判断
+	        function CheckData() {
+	            var row = $('#accountData').datagrid('getRows');
+	            var totalRowNum = "";
+	            for (var i = 0; i < row.length; i++) {
+	                if (row[i].AccountId == "") {
+	                    totalRowNum += (i + 1) + "、";
+	                }
+	            }
+	            if (totalRowNum != "") {
+	                var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
+	                $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
+	                return false;
+	            }
+	            return true;
+	        }
+	        //保存
+	        function accept(accepId) {
+	            append();
+	            removeit();
+	            if ($("#accountData").datagrid('getChanges').length) {
+	                if (!CheckData())
+	                    return false;
+	                var inserted = $("#accountData").datagrid('getChanges', "inserted");
+	                var deleted = $("#accountData").datagrid('getChanges', "deleted");
+	                var updated = $("#accountData").datagrid('getChanges', "updated");
+	                $.ajax({
+	                    type: "post",
+	                    url: "<%=path%>/accountItem/saveDetials.action",
+	                    data: {
+	                        Inserted: JSON.stringify(inserted),
+	                        Deleted: JSON.stringify(deleted),
+	                        Updated: JSON.stringify(updated),
+	                        HeaderId:accepId,
+	                        clientIp:'<%=clientIp %>'
+	                    },
+	                    success: function (tipInfo) 
+	                    { 
+	                        if (tipInfo) {
+	                            $.messager.alert('提示','保存成功！','info');	
+	                        }
+	                        else
+	                        	$.messager.alert('提示','保存失败！','error');	
+
+	                    },
+	                    error: function (XmlHttpRequest, textStatus, errorThrown) 
+	                    {
+	                        $.messager.alert('提示',XmlHttpRequest.responseText,'error');	
+	                    }
+	                });
+	            }
+	            if (endEditing()) {
+	                $('#accountData').datagrid('acceptChanges');
+	            }
+	        }
+	        //获取MaxId
+	        function getMaxId()
+	        {
+	    	    var accountHeadMax=null;
+	        	$.ajax({
+	        		type:"post",
+	        		url: "<%=path%>/accountHead/getMaxId.action",
+	        		//设置为同步
+	        		async:false,
+	        		dataType: "json",
+	        		success: function (systemInfo)
+	        		{
+	        			if(systemInfo)
+	        			{
+	        				accountHeadMax = systemInfo.showModel.map.accountHeadMax;
+	        				var msgTip = systemInfo.showModel.msgTip;
+	        				if(msgTip == "exceptoin")
+	        				{
+	        					$.messager.alert('提示','查找最大的Id异常,请与管理员联系！','error');
+	        					return;
+	        				}
+	        			}
+	        			else
+	        			{
+	        				accountHeadMax=null;
+	        			}
+	        		}
+	        	});
+	        	
+	        	if(accountHeadMax !=null)
+	        	{
+	        		if(accountHeadMax.length>0)
+	        		{
+	        			accountHeadMaxId=accountHeadMax[0];
+	        		}
+	        	}
+	        }
+		</script>
+	</body>
+</html>
diff --git a/WebRoot/pages/financial/item_in.jsp b/WebRoot/pages/financial/item_in.jsp
index c80f3ba0..cf257664 100644
--- a/WebRoot/pages/financial/item_in.jsp
+++ b/WebRoot/pages/financial/item_in.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"/>
@@ -49,7 +49,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>
 		
@@ -389,7 +389,7 @@
                               valueField:'Id',
                               textField:'InOutItemName',
                               method:'get',
-                              url: "<%=path%>/inOutItem/findBySelect.action"
+                              url: "<%=path%>/inOutItem/findBySelect.action?type=in"
                           }
 			            }
 					  },
diff --git a/WebRoot/pages/financial/item_out.jsp b/WebRoot/pages/financial/item_out.jsp
index 9703b335..8f2284c8 100644
--- a/WebRoot/pages/financial/item_out.jsp
+++ b/WebRoot/pages/financial/item_out.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"/>
@@ -49,7 +49,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>
 		
@@ -379,7 +379,7 @@
 					pageList: [50,100,150],
 					columns:[[
 					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemId',width:230,
+			          { title: '支出项目',field: 'InOutItemId',width:230,
 						  formatter:function(value,row,index){
 								  return row.InOutItemName;
 	                      },
@@ -389,7 +389,7 @@
                               valueField:'Id',
                               textField:'InOutItemName',
                               method:'get',
-                              url: "<%=path%>/inOutItem/findBySelect.action"
+                              url: "<%=path%>/inOutItem/findBySelect.action?type=out"
                           }
 			            }
 					  },
diff --git a/WebRoot/pages/financial/money_in.jsp b/WebRoot/pages/financial/money_in.jsp
index d2370a9c..b61ebf26 100644
--- a/WebRoot/pages/financial/money_in.jsp
+++ b/WebRoot/pages/financial/money_in.jsp
@@ -1,935 +1,935 @@
-<%@page import="com.jsh.util.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>
-		<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/My97DatePicker/WdatePicker.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
-  	</head>
-  	<body>
-  		<!-- 查询 -->
-		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
-			<table id="searchTable">
-				<tr>
-					<td>单据号：</td>
-					<td>
-						<input type="text" name="searchBillNo" id="searchBillNo" 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:80px;"/>
-					</td>
-					<td>-</td>
-					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
-					</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&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="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
-	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-	        <form id="accountHeadFM" method="post"  novalidate>
-	            <table>
-	            <tr>	
-	            <td>单据编号：</td>
-	            <td style="padding:5px"><input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
-	            </td>            
-                <td>单据日期：</td>
-                <td style="padding:5px">
-                <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
-                </td>         
-	            <td>账户：</td>
-	            <td style="padding:5px">
-	            <select id="AccountId" name="AccountId" style="width:120px;"></select>
-	            </td>
-	            <td>金额：</td>
-				<td>
-					<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
-				</td>
-	            </tr>
-	            <tr>
-	            <td>单位：</td>
-	            <td style="padding:5px">
-                <select name="OrganId" id="OrganId" style="width:120px;"></select>
-                </td>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
-	            </td>
-	            <td>备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
-	            </td>
-	            <td></td>
-	            <td></td>
-	            </tr>
-	            <tr>
-	            <td>单据明细：</td>
-	            <td colspan="7">
-			    <!-- 单据列表table -->
-				<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
-	            </td>
-	            </tr>
-	            </table>
-	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
-	        </form>
-	    </div>
-	    <div id="dlg-buttons">
-	        <a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-	        <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
-	    </div>
-	    <div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
-	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
-	            <table>
-	            <tr>
-	            <td>单据编号：</td>
-                <td style="padding:5px;width:120px;">
-                <span id="BillNoShow"></span>
-                </td>
-	            <td>单据日期：</td>
-	            <td style="padding:5px;width:120px;">
-                <span id="BillTimeShow"></span>
-                </td>                
-	            <td>账户：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="AccountIdShow"></span>
-	            </td>
-	            <td>金额：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="ChangeAmountShow"></span>
-	            </td>
-	            </tr>
-	            <tr>
-	            <td>单位：</td>
-	            <td style="padding:5px">
-	            <span id="OrganIdShow"></span>
-	            </td>
-	            <td>经手人：</td>
-				<td style="padding:5px">
-				<span id="HandsPersonIdShow"></span>
-				</td>
-	            <td>备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>
-	            <td></td>	            
-	            <td></td>
-	            </tr>
-	            <tr>
-	            <td>单据明细：</td>
-	            <td colspan="7">
-			    <!-- 单据列表table -->
-				<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
-	            </td>
-	            </tr>
-	            </table>
-	    </div>
-	    
-		<script type="text/javascript">
-			var accountList = null;
-			var accountID = null;
-			var supplierList = null;
-			var supplierID = null;
-			var personList = null;
-			var personID = null;
-			var ProjectSearch=null;
-			var kid=${sessionScope.user.id};
-			var accountHeadMaxId=null; //获取最大的Id
-			var accepId=null; //保存的主表id
-			//初始化界面
-			$(function()
-			{
-				initSystemData_person(); //经手人数据
-				initSelectInfo_person(); //经手人信息
-				initSystemData_account(); //账户数据
-				initSelectInfo_account(); //账户信息
-				initSupplier(); //供应商
-				initTableData();
-				ininPager();
-				initForm();			
-				$("#searchBtn").click();	
-			});	
-			
-			//获取账户信息
-			function initSystemData_account()
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/account/getAccount.action",
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						accountList = systemInfo.showModel.map.accountList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//获取账户信息
-			function initSelectInfo_account()
-			{
-				var options = "";				
-				if(accountList !=null)
-				{
-					options = "";
-					for(var i = 0 ;i < accountList.length;i ++)
-					{
-						var account = accountList[i];
-						options += '<option value="' + account.id + '">' + account.name + '</option>';
-					}	
-					$("#AccountId").empty().append(options);
-				}
-			}
-			
-			//初始化单位信息
-			function initSupplier()
-			{
-				$('#OrganId').combobox({    
-					url: "<%=path%>/supplier/findBySelect_sup.action",
-				    valueField:'id',    
-				    textField:'supplier'
-				});  
-			}
-			
-			//获取财务员
-			function initSystemData_person()
-			{
-				var type = "财务员";
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/person/getPersonByType.action",
-					data: {
-						Type: type
-					},
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						personList = systemInfo.showModel.map.personList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//获取财务员
-			function initSelectInfo_person()
-			{
-				var options = "";
-				
-				if(personList !=null)
-				{
-					for(var i = 0 ;i < personList.length;i ++)
-					{
-						var person = personList[i];
-						if(0 == i)
-						{
-							personID = person.id;
-						}
-						if(person.type=="财务员")
-						{
-							options += '<option value="' + person.id + '">' + person.name + '</option>';
-						}		
-					}
-					$("#HandsPersonId").empty().append(options);
-				}
-			}
-			
-			//防止表单提交重复
-			function initForm()
-			{
-				$('#accountHeadFM').form({
-				    onSubmit: function(){
-				        return false;
-				    }
-				});
-			}
-			
-			//初始化表格数据
-			function initTableData()
-			{
-				$('#tableData').datagrid({
-					//width:700,
-					height:heightInfo,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					//url:'<%=path %>/accountHead/findBy.action?pageSize=' + initPageSize,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					pageSize: 5,
-					pageList: initPageNum,
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '单据编号',field: 'BillNo',width:100},
-			          { title: '单据时间 ',field: 'BillTime',width:100},
-			          { title: '备注',field: 'Remark',width:100},
-			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
-			         	{
-							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
-							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName 
-							+ 'AaBb' + rec.HandsPersonId + 'AaBb' + rec.HandsPersonName + 'AaBb' + rec.ChangeAmount;
-        					if(1 == value)
-        					{
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountHead(\'' + 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/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccountHead(\'' + 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="deleteAccountHead('+ rec.Id +');"/>&nbsp;<a onclick="deleteAccountHead('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>';
-        					}
-        					return str;
-						}
-			          }
-					]],
-					toolbar:[
-						{
-							id:'addAccountHead',
-							text:'增加',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								addAccountHead();
-							}
-						},
-						{
-							id:'deleteAccountHead',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								batDeleteAccountHead();	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			//初始化表格数据-明细列表-编辑状态
-			function initTableData_account()
-			{
-				$('#accountData').datagrid({
-					height:300,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					onClickRow: onClickRow,
-					pageSize: 50,
-					pageList: [50,100,150],
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemId',width:230,
-						  formatter:function(value,row,index){
-								  return row.InOutItemName;
-	                      },
-						  editor:{
-                          type:'combobox',
-                          options:{
-                              valueField:'Id',
-                              textField:'InOutItemName',
-                              method:'get',
-                              url: "<%=path%>/inOutItem/findBySelect.action"
-                          }
-			            }
-					  },
-			          { title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
-			          { title: '备注',field: 'Remark',editor:'validatebox',width:150}
-					]],
-					toolbar:[
-						{
-							id:'append',
-							text:'新增',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								append(); //新增
-							}
-						},
-						{
-							id:'delete',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								removeit(); //删除	
-							}
-						},
-						{
-							id:'reject',
-							text:'撤销',
-							iconCls:'icon-undo',
-							handler:function()
-							{
-								reject(); //撤销	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			
-			//初始化表格数据-明细列表-查看状态
-			function initTableData_account_show()
-			{
-				$('#accountDataShow').datagrid({
-					height:300,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					onClickRow: onClickRow,
-					pageSize: 50,
-					pageList: [50,100,150],
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemName',width:230},
-			          { title: '金额',field: 'EachAmount',width:50},
-			          { title: '备注',field: 'Remark',width:150}
-					]],
-					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=="BillNo"||obj.id=="BillTime"))
-			    {  
-			        $("#saveAccountHead").click();
-			    }
-			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchBillNo"))
-			    {  
-			        $("#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  
-							});  
-							showAccountHeadDetails(pageNum,pageSize);
-						}  
-					}); 
-				}
-				catch (e) 
-				{
-					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
-				}
-			}
-			
-			//删除财务信息
-			function deleteAccountHead(accountHeadID)
-			{
-				$.messager.confirm('删除确认','确定要删除此财务信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
-						$.ajax({
-							type:"post",
-							url: "<%=path %>/accountHead/delete.action",
-							dataType: "json",
-							data: ({
-								accountHeadID : accountHeadID,
-								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 batDeleteAccountHead()
-			{
-				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 %>/accountHead/batchDelete.action",
-								dataType: "json",
-								async :  false,
-								data: ({
-									accountHeadIDs : 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 accountHeadID = 0;
-			//保存编辑前的名称
-			var orgAccountHead = "";
-			
-			function addAccountHead()
-			{
-				$("#clientIp").val('<%=clientIp %>');
-				$('#accountHeadFM').form('clear');
-				$('#accountHeadDlg').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});
-	            $("#BillNo").val("").focus();
-	            
-	            orgAccountHead = "";
-	            accountHeadID = 0;
-	            initTableData_account(); //明细列表
-	            reject(); //撤销下、刷新材料列表
-	            url = '<%=path %>/accountHead/create.action';
-			}
-			
-			//保存信息
-			$("#saveAccountHead").unbind().bind({
-				click:function()
-				{
-					if(!$('#accountHeadFM').form('validate'))
-						return;
-					else 
-					{
-						$.ajax({
-							type:"post",
-							url: url,
-							dataType: "json",
-							async :  false,
-							data: ({
-								Type: "收款",
-								BillNo : $.trim($("#BillNo").val()),
-								BillTime : $.trim($("#BillTime").val()),
-								AccountId: $.trim($("#AccountId").val()),
-								ChangeAmount: $.trim($("#ChangeAmount").val()),
-								OrganId: $('#OrganId').combobox('getValue'),
-								HandsPersonId: $.trim($("#HandsPersonId").val()),
-								Remark: $.trim($("#Remark").val()),
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								if(tipInfo)
-								{
-									//保存明细记录
-									if(accountHeadID ==0)
-									{
-										getMaxId(); //查找最大的Id
-										accept(accountHeadMaxId); //新增
-									}
-									else
-									{
-										accept(accountHeadID); //修改
-									}
-									
-									
-									$('#accountHeadDlg').dialog('close');
-									var opts = $("#tableData").datagrid('options'); 
-									showAccountHeadDetails(opts.pageNumber,opts.pageSize); 
-								}
-								else
-								{
-									$.messager.show({
-			                            title: '错误提示',
-			                            msg: '保存信息失败，请稍后重试!'
-			                        });
-								}
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('提示','保存信息异常，请稍后再试！','error');
-								return;
-							}
-						});	
-					}
-				}
-			});
-			
-			//编辑信息
-	        function editAccountHead(accountHeadTotalInfo)
-	        {
-	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
-	            $("#clientIp").val('<%=clientIp %>');
-	            $("#BillNo").val(accountHeadInfo[1]);
-	            $("#BillTime").val(accountHeadInfo[2]);
-	            $("#Remark").val(accountHeadInfo[3]);
-	            $("#AccountId").val(accountHeadInfo[4]);
-	            $('#OrganId').combobox('setValue', accountHeadInfo[6]);
-	            $("#HandsPersonId").val(accountHeadInfo[8]);
-	            $("#ChangeAmount").val(accountHeadInfo[10]);	            	            
-                $('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑财务信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                accountHeadID = accountHeadInfo[0];
-                
-                initTableData_account(); //明细列表
-                reject(); //撤销下、刷新材料列表                
-                url = '<%=path %>/accountHead/update.action?accountHeadID=' + accountHeadInfo[0];
-	        }
-	        
-	        //查看信息
-	        function showAccountHead(accountHeadTotalInfo)
-	        {
-	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
-	            $("#BillNoShow").text(accountHeadInfo[1]);
-	            $("#BillTimeShow").text(accountHeadInfo[2]);	     
-	            $("#RemarkShow").text(accountHeadInfo[3]);       
-	            $("#AccountIdShow").text(accountHeadInfo[5]);
-	            $('#OrganIdShow').text(accountHeadInfo[7]);
-	            $("#HandsPersonIdShow").text(accountHeadInfo[9]);	            
-	            $("#ChangeAmountShow").text(accountHeadInfo[10]);
-	            $('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看财务信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                
-                accountHeadID = accountHeadInfo[0];
-                initTableData_account_show(); //明细列表-查看状态
-	        }
-	        
-			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
-				{
-					showAccountHeadDetails(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 showAccountHeadDetails(pageNo,pageSize)
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path %>/accountHead/findBy.action",
-					dataType: "json",
-					data: ({
-						Type:"收款",
-						BillNo:$.trim($("#searchBillNo").val()),
-						BeginTime:$("#searchBeginTime").val(),
-						EndTime:$("#searchEndTime").val(),
-						pageNo:pageNo,
-						pageSize:pageSize
-					}),
-					success: function (data)
-					{
-						$("#tableData").datagrid('loadData',data);
-					},
-					//此处添加错误处理
-		    		error:function()
-		    		{
-		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
-						return;
-					}
-				});
-			}
-			//重置按钮
-			$("#searchResetBtn").unbind().bind({
-				click:function(){
-					$("#searchBillNo").val("");
-					$("#searchBeginTime").val("");
-					$("#searchEndTime").val("");
-					//加载完以后重新初始化
-					$("#searchBtn").click();
-			    }	
-			});
-			
-			//结束编辑
-			var editIndex = undefined;
-	        function endEditing() {
-	            if (editIndex == undefined) { return true }
-	            if ($('#accountData').datagrid('validateRow', editIndex)) {
-	            	var ed = $('#accountData').datagrid('getEditor', {index:editIndex,field:'InOutItemId'});
-	                var InOutItemName = $(ed.target).combobox('getText');
-	                $('#accountData').datagrid('getRows')[editIndex]['InOutItemName'] = InOutItemName;
-	                $('#accountData').datagrid('endEdit', editIndex);
-	                editIndex = undefined;
-	                return true;
-	            } else {
-	                return false;
-	            }
-	        }
-	        //单击
-	        function onClickRow(index) {
-	            if (editIndex != index) {
-	                if (endEditing()) {
-	                    $('#accountData').datagrid('selectRow', index)
-	                            .datagrid('beginEdit', index);
-	                    editIndex = index;
-	                } else {
-	                    $('#accountData').datagrid('selectRow', editIndex);
-	                }
-	            }
-	        }
-			//新增
-			function append()  
-			{
-	            if (endEditing()) {
-	                $('#accountData').datagrid('appendRow', {});
-	                editIndex = $('#accountData').datagrid('getRows').length - 1;
-	                $('#accountData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
-	            }
-			}
-			//删除
-	        function removeit() {
-	            if (editIndex == undefined) { return }
-	            $('#accountData').datagrid('cancelEdit', editIndex)
-	                    .datagrid('deleteRow', editIndex);
-	            editIndex = undefined;
-	        }
-	        //撤销
-	        function reject() {
-	            $('#accountData').datagrid('rejectChanges');
-	            editIndex = undefined;
-	        }
-	        //判断
-	        function CheckData() {
-	            var row = $('#accountData').datagrid('getRows');
-	            var totalRowNum = "";
-	            for (var i = 0; i < row.length; i++) {
-	                if (row[i].InOutItemId == "") {
-	                    totalRowNum += (i + 1) + "、";
-	                }
-	            }
-	            if (totalRowNum != "") {
-	                var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
-	                $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
-	                return false;
-	            }
-	            return true;
-	        }
-	        //保存
-	        function accept(accepId) {
-	            append();
-	            removeit();
-	            if ($("#accountData").datagrid('getChanges').length) {
-	                if (!CheckData())
-	                    return false;
-	                var inserted = $("#accountData").datagrid('getChanges', "inserted");
-	                var deleted = $("#accountData").datagrid('getChanges', "deleted");
-	                var updated = $("#accountData").datagrid('getChanges', "updated");
-	                $.ajax({
-	                    type: "post",
-	                    url: "<%=path%>/accountItem/saveDetials.action",
-	                    data: {
-	                        Inserted: JSON.stringify(inserted),
-	                        Deleted: JSON.stringify(deleted),
-	                        Updated: JSON.stringify(updated),
-	                        HeaderId:accepId,
-	                        clientIp:'<%=clientIp %>'
-	                    },
-	                    success: function (tipInfo) 
-	                    { 
-	                        if (tipInfo) {
-	                            $.messager.alert('提示','保存成功！','info');	
-	                        }
-	                        else
-	                        	$.messager.alert('提示','保存失败！','error');	
-
-	                    },
-	                    error: function (XmlHttpRequest, textStatus, errorThrown) 
-	                    {
-	                        $.messager.alert('提示',XmlHttpRequest.responseText,'error');	
-	                    }
-	                });
-	            }
-	            if (endEditing()) {
-	                $('#accountData').datagrid('acceptChanges');
-	            }
-	        }
-	        //获取MaxId
-	        function getMaxId()
-	        {
-	    	    var accountHeadMax=null;
-	        	$.ajax({
-	        		type:"post",
-	        		url: "<%=path%>/accountHead/getMaxId.action",
-	        		//设置为同步
-	        		async:false,
-	        		dataType: "json",
-	        		success: function (systemInfo)
-	        		{
-	        			if(systemInfo)
-	        			{
-	        				accountHeadMax = systemInfo.showModel.map.accountHeadMax;
-	        				var msgTip = systemInfo.showModel.msgTip;
-	        				if(msgTip == "exceptoin")
-	        				{
-	        					$.messager.alert('提示','查找最大的Id异常,请与管理员联系！','error');
-	        					return;
-	        				}
-	        			}
-	        			else
-	        			{
-	        				accountHeadMax=null;
-	        			}
-	        		}
-	        	});
-	        	
-	        	if(accountHeadMax !=null)
-	        	{
-	        		if(accountHeadMax.length>0)
-	        		{
-	        			accountHeadMaxId=accountHeadMax[0];
-	        		}
-	        	}
-	        }
-		</script>
-	</body>
-</html>
+<%@page import="com.jsh.util.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>
+		<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/My97DatePicker/WdatePicker.js"></script>
+		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
+  	</head>
+  	<body>
+  		<!-- 查询 -->
+		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
+			<table id="searchTable">
+				<tr>
+					<td>单据号：</td>
+					<td>
+						<input type="text" name="searchBillNo" id="searchBillNo" 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:80px;"/>
+					</td>
+					<td>-</td>
+					<td>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>
+						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&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="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+	        <form id="accountHeadFM" method="post"  novalidate>
+	            <table>
+	            <tr>	
+	            <td>单据编号：</td>
+	            <td style="padding:5px"><input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
+	            </td>            
+                <td>单据日期：</td>
+                <td style="padding:5px">
+                <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
+                </td>         
+	            <td>账户：</td>
+	            <td style="padding:5px">
+	            <select id="AccountId" name="AccountId" style="width:120px;"></select>
+	            </td>
+	            <td>金额：</td>
+				<td>
+					<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
+				</td>
+	            </tr>
+	            <tr>
+	            <td>单位：</td>
+	            <td style="padding:5px">
+                <select name="OrganId" id="OrganId" style="width:120px;"></select>
+                </td>
+	            <td>经手人：</td>
+	            <td style="padding:5px">
+	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
+	            </td>
+	            <td>备注：</td>
+	            <td style="padding:5px">
+	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
+	            </td>
+	            <td></td>
+	            <td></td>
+	            </tr>
+	            <tr>
+	            <td>单据明细：</td>
+	            <td colspan="7">
+			    <!-- 单据列表table -->
+				<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
+	            </td>
+	            </tr>
+	            </table>
+	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+	        </form>
+	    </div>
+	    <div id="dlg-buttons">
+	        <a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+	        <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
+	    </div>
+	    <div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
+	            <table>
+	            <tr>
+	            <td>单据编号：</td>
+                <td style="padding:5px;width:120px;">
+                <span id="BillNoShow"></span>
+                </td>
+	            <td>单据日期：</td>
+	            <td style="padding:5px;width:120px;">
+                <span id="BillTimeShow"></span>
+                </td>                
+	            <td>账户：</td>
+	            <td style="padding:5px;width:120px;">
+	            <span id="AccountIdShow"></span>
+	            </td>
+	            <td>金额：</td>
+	            <td style="padding:5px;width:120px;">
+	            <span id="ChangeAmountShow"></span>
+	            </td>
+	            </tr>
+	            <tr>
+	            <td>单位：</td>
+	            <td style="padding:5px">
+	            <span id="OrganIdShow"></span>
+	            </td>
+	            <td>经手人：</td>
+				<td style="padding:5px">
+				<span id="HandsPersonIdShow"></span>
+				</td>
+	            <td>备注：</td>
+	            <td style="padding:5px">
+	            <span id="RemarkShow"></span>
+	            </td>
+	            <td></td>	            
+	            <td></td>
+	            </tr>
+	            <tr>
+	            <td>单据明细：</td>
+	            <td colspan="7">
+			    <!-- 单据列表table -->
+				<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+	            </td>
+	            </tr>
+	            </table>
+	    </div>
+	    
+		<script type="text/javascript">
+			var accountList = null;
+			var accountID = null;
+			var supplierList = null;
+			var supplierID = null;
+			var personList = null;
+			var personID = null;
+			var ProjectSearch=null;
+			var kid=${sessionScope.user.id};
+			var accountHeadMaxId=null; //获取最大的Id
+			var accepId=null; //保存的主表id
+			//初始化界面
+			$(function()
+			{
+				initSystemData_person(); //经手人数据
+				initSelectInfo_person(); //经手人信息
+				initSystemData_account(); //账户数据
+				initSelectInfo_account(); //账户信息
+				initSupplier(); //供应商
+				initTableData();
+				ininPager();
+				initForm();			
+				$("#searchBtn").click();	
+			});	
+			
+			//获取账户信息
+			function initSystemData_account()
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path%>/account/getAccount.action",
+					//设置为同步
+					async:false,
+					dataType: "json",
+					success: function (systemInfo)
+					{
+						accountList = systemInfo.showModel.map.accountList;
+						var msgTip = systemInfo.showModel.msgTip;
+						if(msgTip == "exceptoin")
+						{
+							$.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
+							return;
+						}	
+					}
+				});				
+			}
+			//获取账户信息
+			function initSelectInfo_account()
+			{
+				var options = "";				
+				if(accountList !=null)
+				{
+					options = "";
+					for(var i = 0 ;i < accountList.length;i ++)
+					{
+						var account = accountList[i];
+						options += '<option value="' + account.id + '">' + account.name + '</option>';
+					}	
+					$("#AccountId").empty().append(options);
+				}
+			}
+			
+			//初始化单位信息
+			function initSupplier()
+			{
+				$('#OrganId').combobox({    
+					url: "<%=path%>/supplier/findBySelect_sup.action",
+				    valueField:'id',    
+				    textField:'supplier'
+				});  
+			}
+			
+			//获取财务员
+			function initSystemData_person()
+			{
+				var type = "财务员";
+				$.ajax({
+					type:"post",
+					url: "<%=path%>/person/getPersonByType.action",
+					data: {
+						Type: type
+					},
+					//设置为同步
+					async:false,
+					dataType: "json",
+					success: function (systemInfo)
+					{
+						personList = systemInfo.showModel.map.personList;
+						var msgTip = systemInfo.showModel.msgTip;
+						if(msgTip == "exceptoin")
+						{
+							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
+							return;
+						}	
+					}
+				});				
+			}
+			//获取财务员
+			function initSelectInfo_person()
+			{
+				var options = "";
+				
+				if(personList !=null)
+				{
+					for(var i = 0 ;i < personList.length;i ++)
+					{
+						var person = personList[i];
+						if(0 == i)
+						{
+							personID = person.id;
+						}
+						if(person.type=="财务员")
+						{
+							options += '<option value="' + person.id + '">' + person.name + '</option>';
+						}		
+					}
+					$("#HandsPersonId").empty().append(options);
+				}
+			}
+			
+			//防止表单提交重复
+			function initForm()
+			{
+				$('#accountHeadFM').form({
+				    onSubmit: function(){
+				        return false;
+				    }
+				});
+			}
+			
+			//初始化表格数据
+			function initTableData()
+			{
+				$('#tableData').datagrid({
+					//width:700,
+					height:heightInfo,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					//url:'<%=path %>/accountHead/findBy.action?pageSize=' + initPageSize,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					pageSize: 5,
+					pageList: initPageNum,
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '单据编号',field: 'BillNo',width:100},
+			          { title: '单据时间 ',field: 'BillTime',width:100},
+			          { title: '备注',field: 'Remark',width:100},
+			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
+			         	{
+							var str = '';
+							var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
+							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName 
+							+ 'AaBb' + rec.HandsPersonId + 'AaBb' + rec.HandsPersonName + 'AaBb' + rec.ChangeAmount;
+        					if(1 == value)
+        					{
+        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountHead(\'' + 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/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccountHead(\'' + 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="deleteAccountHead('+ rec.Id +');"/>&nbsp;<a onclick="deleteAccountHead('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>';
+        					}
+        					return str;
+						}
+			          }
+					]],
+					toolbar:[
+						{
+							id:'addAccountHead',
+							text:'增加',
+							iconCls:'icon-add',
+							handler:function()
+							{
+								addAccountHead();
+							}
+						},
+						{
+							id:'deleteAccountHead',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function()
+							{
+								batDeleteAccountHead();	
+							}
+						}
+					],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}    
+				});
+			}
+			
+			//初始化表格数据-明细列表-编辑状态
+			function initTableData_account()
+			{
+				$('#accountData').datagrid({
+					height:300,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					onClickRow: onClickRow,
+					pageSize: 50,
+					pageList: [50,100,150],
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '账户名称',field: 'AccountId',width:230,
+						  formatter:function(value,row,index){
+								  return row.AccountName;
+	                      },
+						  editor:{
+                          type:'combobox',
+                          options:{
+                              valueField:'Id',
+                              textField:'AccountName',
+                              method:'get',
+                              url: "<%=path%>/account/findBySelect.action"
+                          }
+			            }
+					  },
+			          { title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
+			          { title: '备注',field: 'Remark',editor:'validatebox',width:150}
+					]],
+					toolbar:[
+						{
+							id:'append',
+							text:'新增',
+							iconCls:'icon-add',
+							handler:function()
+							{
+								append(); //新增
+							}
+						},
+						{
+							id:'delete',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function()
+							{
+								removeit(); //删除	
+							}
+						},
+						{
+							id:'reject',
+							text:'撤销',
+							iconCls:'icon-undo',
+							handler:function()
+							{
+								reject(); //撤销	
+							}
+						}
+					],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}    
+				});
+			}
+			
+			
+			//初始化表格数据-明细列表-查看状态
+			function initTableData_account_show()
+			{
+				$('#accountDataShow').datagrid({
+					height:300,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					onClickRow: onClickRow,
+					pageSize: 50,
+					pageList: [50,100,150],
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '账户名称',field: 'AccountName',width:230},
+			          { title: '金额',field: 'EachAmount',width:50},
+			          { title: '备注',field: 'Remark',width:150}
+					]],
+					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=="BillNo"||obj.id=="BillTime"))
+			    {  
+			        $("#saveAccountHead").click();
+			    }
+			    //搜索按钮添加快捷键
+			    if(k == "13"&&(obj.id=="searchBillNo"))
+			    {  
+			        $("#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  
+							});  
+							showAccountHeadDetails(pageNum,pageSize);
+						}  
+					}); 
+				}
+				catch (e) 
+				{
+					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
+				}
+			}
+			
+			//删除财务信息
+			function deleteAccountHead(accountHeadID)
+			{
+				$.messager.confirm('删除确认','确定要删除此财务信息吗？',function(r)
+			 	{
+                    if (r)
+                    {
+						$.ajax({
+							type:"post",
+							url: "<%=path %>/accountHead/delete.action",
+							dataType: "json",
+							data: ({
+								accountHeadID : accountHeadID,
+								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 batDeleteAccountHead()
+			{
+				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 %>/accountHead/batchDelete.action",
+								dataType: "json",
+								async :  false,
+								data: ({
+									accountHeadIDs : 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 accountHeadID = 0;
+			//保存编辑前的名称
+			var orgAccountHead = "";
+			
+			function addAccountHead()
+			{
+				$("#clientIp").val('<%=clientIp %>');
+				$('#accountHeadFM').form('clear');
+				$('#accountHeadDlg').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});
+	            $("#BillNo").val("").focus();
+	            
+	            orgAccountHead = "";
+	            accountHeadID = 0;
+	            initTableData_account(); //明细列表
+	            reject(); //撤销下、刷新材料列表
+	            url = '<%=path %>/accountHead/create.action';
+			}
+			
+			//保存信息
+			$("#saveAccountHead").unbind().bind({
+				click:function()
+				{
+					if(!$('#accountHeadFM').form('validate'))
+						return;
+					else 
+					{
+						$.ajax({
+							type:"post",
+							url: url,
+							dataType: "json",
+							async :  false,
+							data: ({
+								Type: "收款",
+								BillNo : $.trim($("#BillNo").val()),
+								BillTime : $.trim($("#BillTime").val()),
+								AccountId: $.trim($("#AccountId").val()),
+								ChangeAmount: $.trim($("#ChangeAmount").val()),
+								OrganId: $('#OrganId').combobox('getValue'),
+								HandsPersonId: $.trim($("#HandsPersonId").val()),
+								Remark: $.trim($("#Remark").val()),
+								clientIp:'<%=clientIp %>'
+							}),
+							success: function (tipInfo)
+							{
+								if(tipInfo)
+								{
+									//保存明细记录
+									if(accountHeadID ==0)
+									{
+										getMaxId(); //查找最大的Id
+										accept(accountHeadMaxId); //新增
+									}
+									else
+									{
+										accept(accountHeadID); //修改
+									}
+									
+									
+									$('#accountHeadDlg').dialog('close');
+									var opts = $("#tableData").datagrid('options'); 
+									showAccountHeadDetails(opts.pageNumber,opts.pageSize); 
+								}
+								else
+								{
+									$.messager.show({
+			                            title: '错误提示',
+			                            msg: '保存信息失败，请稍后重试!'
+			                        });
+								}
+							},
+							//此处添加错误处理
+				    		error:function()
+				    		{
+				    			$.messager.alert('提示','保存信息异常，请稍后再试！','error');
+								return;
+							}
+						});	
+					}
+				}
+			});
+			
+			//编辑信息
+	        function editAccountHead(accountHeadTotalInfo)
+	        {
+	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
+	            $("#clientIp").val('<%=clientIp %>');
+	            $("#BillNo").val(accountHeadInfo[1]);
+	            $("#BillTime").val(accountHeadInfo[2]);
+	            $("#Remark").val(accountHeadInfo[3]);
+	            $("#AccountId").val(accountHeadInfo[4]);
+	            $('#OrganId').combobox('setValue', accountHeadInfo[6]);
+	            $("#HandsPersonId").val(accountHeadInfo[8]);
+	            $("#ChangeAmount").val(accountHeadInfo[10]);	            	            
+                $('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑财务信息');
+                $(".window-mask").css({ width: webW ,height: webH});
+                accountHeadID = accountHeadInfo[0];
+                
+                initTableData_account(); //明细列表
+                reject(); //撤销下、刷新材料列表                
+                url = '<%=path %>/accountHead/update.action?accountHeadID=' + accountHeadInfo[0];
+	        }
+	        
+	        //查看信息
+	        function showAccountHead(accountHeadTotalInfo)
+	        {
+	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
+	            $("#BillNoShow").text(accountHeadInfo[1]);
+	            $("#BillTimeShow").text(accountHeadInfo[2]);	     
+	            $("#RemarkShow").text(accountHeadInfo[3]);       
+	            $("#AccountIdShow").text(accountHeadInfo[5]);
+	            $('#OrganIdShow').text(accountHeadInfo[7]);
+	            $("#HandsPersonIdShow").text(accountHeadInfo[9]);	            
+	            $("#ChangeAmountShow").text(accountHeadInfo[10]);
+	            $('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看财务信息');
+                $(".window-mask").css({ width: webW ,height: webH});
+                
+                accountHeadID = accountHeadInfo[0];
+                initTableData_account_show(); //明细列表-查看状态
+	        }
+	        
+			//搜索处理
+			$("#searchBtn").unbind().bind({
+				click:function()
+				{
+					showAccountHeadDetails(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 showAccountHeadDetails(pageNo,pageSize)
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path %>/accountHead/findBy.action",
+					dataType: "json",
+					data: ({
+						Type:"收款",
+						BillNo:$.trim($("#searchBillNo").val()),
+						BeginTime:$("#searchBeginTime").val(),
+						EndTime:$("#searchEndTime").val(),
+						pageNo:pageNo,
+						pageSize:pageSize
+					}),
+					success: function (data)
+					{
+						$("#tableData").datagrid('loadData',data);
+					},
+					//此处添加错误处理
+		    		error:function()
+		    		{
+		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+						return;
+					}
+				});
+			}
+			//重置按钮
+			$("#searchResetBtn").unbind().bind({
+				click:function(){
+					$("#searchBillNo").val("");
+					$("#searchBeginTime").val("");
+					$("#searchEndTime").val("");
+					//加载完以后重新初始化
+					$("#searchBtn").click();
+			    }	
+			});
+			
+			//结束编辑
+			var editIndex = undefined;
+	        function endEditing() {
+	            if (editIndex == undefined) { return true }
+	            if ($('#accountData').datagrid('validateRow', editIndex)) {
+	            	var ed = $('#accountData').datagrid('getEditor', {index:editIndex,field:'AccountId'});
+	                var AccountName = $(ed.target).combobox('getText');
+	                $('#accountData').datagrid('getRows')[editIndex]['AccountName'] = AccountName;
+	                $('#accountData').datagrid('endEdit', editIndex);
+	                editIndex = undefined;
+	                return true;
+	            } else {
+	                return false;
+	            }
+	        }
+	        //单击
+	        function onClickRow(index) {
+	            if (editIndex != index) {
+	                if (endEditing()) {
+	                    $('#accountData').datagrid('selectRow', index)
+	                            .datagrid('beginEdit', index);
+	                    editIndex = index;
+	                } else {
+	                    $('#accountData').datagrid('selectRow', editIndex);
+	                }
+	            }
+	        }
+			//新增
+			function append()  
+			{
+	            if (endEditing()) {
+	                $('#accountData').datagrid('appendRow', {});
+	                editIndex = $('#accountData').datagrid('getRows').length - 1;
+	                $('#accountData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
+	            }
+			}
+			//删除
+	        function removeit() {
+	            if (editIndex == undefined) { return }
+	            $('#accountData').datagrid('cancelEdit', editIndex)
+	                    .datagrid('deleteRow', editIndex);
+	            editIndex = undefined;
+	        }
+	        //撤销
+	        function reject() {
+	            $('#accountData').datagrid('rejectChanges');
+	            editIndex = undefined;
+	        }
+	        //判断
+	        function CheckData() {
+	            var row = $('#accountData').datagrid('getRows');
+	            var totalRowNum = "";
+	            for (var i = 0; i < row.length; i++) {
+	                if (row[i].AccountId == "") {
+	                    totalRowNum += (i + 1) + "、";
+	                }
+	            }
+	            if (totalRowNum != "") {
+	                var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
+	                $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
+	                return false;
+	            }
+	            return true;
+	        }
+	        //保存
+	        function accept(accepId) {
+	            append();
+	            removeit();
+	            if ($("#accountData").datagrid('getChanges').length) {
+	                if (!CheckData())
+	                    return false;
+	                var inserted = $("#accountData").datagrid('getChanges', "inserted");
+	                var deleted = $("#accountData").datagrid('getChanges', "deleted");
+	                var updated = $("#accountData").datagrid('getChanges', "updated");
+	                $.ajax({
+	                    type: "post",
+	                    url: "<%=path%>/accountItem/saveDetials.action",
+	                    data: {
+	                        Inserted: JSON.stringify(inserted),
+	                        Deleted: JSON.stringify(deleted),
+	                        Updated: JSON.stringify(updated),
+	                        HeaderId:accepId,
+	                        clientIp:'<%=clientIp %>'
+	                    },
+	                    success: function (tipInfo) 
+	                    { 
+	                        if (tipInfo) {
+	                            $.messager.alert('提示','保存成功！','info');	
+	                        }
+	                        else
+	                        	$.messager.alert('提示','保存失败！','error');	
+
+	                    },
+	                    error: function (XmlHttpRequest, textStatus, errorThrown) 
+	                    {
+	                        $.messager.alert('提示',XmlHttpRequest.responseText,'error');	
+	                    }
+	                });
+	            }
+	            if (endEditing()) {
+	                $('#accountData').datagrid('acceptChanges');
+	            }
+	        }
+	        //获取MaxId
+	        function getMaxId()
+	        {
+	    	    var accountHeadMax=null;
+	        	$.ajax({
+	        		type:"post",
+	        		url: "<%=path%>/accountHead/getMaxId.action",
+	        		//设置为同步
+	        		async:false,
+	        		dataType: "json",
+	        		success: function (systemInfo)
+	        		{
+	        			if(systemInfo)
+	        			{
+	        				accountHeadMax = systemInfo.showModel.map.accountHeadMax;
+	        				var msgTip = systemInfo.showModel.msgTip;
+	        				if(msgTip == "exceptoin")
+	        				{
+	        					$.messager.alert('提示','查找最大的Id异常,请与管理员联系！','error');
+	        					return;
+	        				}
+	        			}
+	        			else
+	        			{
+	        				accountHeadMax=null;
+	        			}
+	        		}
+	        	});
+	        	
+	        	if(accountHeadMax !=null)
+	        	{
+	        		if(accountHeadMax.length>0)
+	        		{
+	        			accountHeadMaxId=accountHeadMax[0];
+	        		}
+	        	}
+	        }
+		</script>
+	</body>
+</html>
diff --git a/WebRoot/pages/financial/money_out.jsp b/WebRoot/pages/financial/money_out.jsp
index d3171173..8c199f61 100644
--- a/WebRoot/pages/financial/money_out.jsp
+++ b/WebRoot/pages/financial/money_out.jsp
@@ -1,935 +1,935 @@
-<%@page import="com.jsh.util.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>
-		<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/My97DatePicker/WdatePicker.js"></script>
-		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
-  	</head>
-  	<body>
-  		<!-- 查询 -->
-		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
-			<table id="searchTable">
-				<tr>
-					<td>单据号：</td>
-					<td>
-						<input type="text" name="searchBillNo" id="searchBillNo" 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:80px;"/>
-					</td>
-					<td>-</td>
-					<td>
-						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
-					</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&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="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
-	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
-	        <form id="accountHeadFM" method="post"  novalidate>
-	            <table>
-	            <tr>	
-	            <td>单据编号：</td>
-	            <td style="padding:5px"><input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
-	            </td>            
-                <td>单据日期：</td>
-                <td style="padding:5px">
-                <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
-                </td>         
-	            <td>账户：</td>
-	            <td style="padding:5px">
-	            <select id="AccountId" name="AccountId" style="width:120px;"></select>
-	            </td>
-	            <td>金额：</td>
-				<td>
-					<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
-				</td>
-	            </tr>
-	            <tr>
-	            <td>单位：</td>
-	            <td style="padding:5px">
-                <select name="OrganId" id="OrganId" style="width:120px;"></select>
-                </td>
-	            <td>经手人：</td>
-	            <td style="padding:5px">
-	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
-	            </td>
-	            <td>备注：</td>
-	            <td style="padding:5px">
-	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
-	            </td>
-	            <td></td>
-	            <td></td>
-	            </tr>
-	            <tr>
-	            <td>单据明细：</td>
-	            <td colspan="7">
-			    <!-- 单据列表table -->
-				<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
-	            </td>
-	            </tr>
-	            </table>
-	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
-	        </form>
-	    </div>
-	    <div id="dlg-buttons">
-	        <a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-	        <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
-	    </div>
-	    <div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
-	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
-	            <table>
-	            <tr>
-	            <td>单据编号：</td>
-                <td style="padding:5px;width:120px;">
-                <span id="BillNoShow"></span>
-                </td>
-	            <td>单据日期：</td>
-	            <td style="padding:5px;width:120px;">
-                <span id="BillTimeShow"></span>
-                </td>                
-	            <td>账户：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="AccountIdShow"></span>
-	            </td>
-	            <td>金额：</td>
-	            <td style="padding:5px;width:120px;">
-	            <span id="ChangeAmountShow"></span>
-	            </td>
-	            </tr>
-	            <tr>
-	            <td>单位：</td>
-	            <td style="padding:5px">
-	            <span id="OrganIdShow"></span>
-	            </td>
-	            <td>经手人：</td>
-				<td style="padding:5px">
-				<span id="HandsPersonIdShow"></span>
-				</td>
-	            <td>备注：</td>
-	            <td style="padding:5px">
-	            <span id="RemarkShow"></span>
-	            </td>
-	            <td></td>	            
-	            <td></td>
-	            </tr>
-	            <tr>
-	            <td>单据明细：</td>
-	            <td colspan="7">
-			    <!-- 单据列表table -->
-				<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
-	            </td>
-	            </tr>
-	            </table>
-	    </div>
-	    
-		<script type="text/javascript">
-			var accountList = null;
-			var accountID = null;
-			var supplierList = null;
-			var supplierID = null;
-			var personList = null;
-			var personID = null;
-			var ProjectSearch=null;
-			var kid=${sessionScope.user.id};
-			var accountHeadMaxId=null; //获取最大的Id
-			var accepId=null; //保存的主表id
-			//初始化界面
-			$(function()
-			{
-				initSystemData_person(); //经手人数据
-				initSelectInfo_person(); //经手人信息
-				initSystemData_account(); //账户数据
-				initSelectInfo_account(); //账户信息
-				initSupplier(); //供应商
-				initTableData();
-				ininPager();
-				initForm();			
-				$("#searchBtn").click();	
-			});	
-			
-			//获取账户信息
-			function initSystemData_account()
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/account/getAccount.action",
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						accountList = systemInfo.showModel.map.accountList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//获取账户信息
-			function initSelectInfo_account()
-			{
-				var options = "";				
-				if(accountList !=null)
-				{
-					options = "";
-					for(var i = 0 ;i < accountList.length;i ++)
-					{
-						var account = accountList[i];
-						options += '<option value="' + account.id + '">' + account.name + '</option>';
-					}	
-					$("#AccountId").empty().append(options);
-				}
-			}
-			
-			//初始化单位信息
-			function initSupplier()
-			{
-				$('#OrganId').combobox({    
-					url: "<%=path%>/supplier/findBySelect_sup.action",
-				    valueField:'id',    
-				    textField:'supplier'
-				});  
-			}
-			
-			//获取财务员
-			function initSystemData_person()
-			{
-				var type = "财务员";
-				$.ajax({
-					type:"post",
-					url: "<%=path%>/person/getPersonByType.action",
-					data: {
-						Type: type
-					},
-					//设置为同步
-					async:false,
-					dataType: "json",
-					success: function (systemInfo)
-					{
-						personList = systemInfo.showModel.map.personList;
-						var msgTip = systemInfo.showModel.msgTip;
-						if(msgTip == "exceptoin")
-						{
-							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
-							return;
-						}	
-					}
-				});				
-			}
-			//获取财务员
-			function initSelectInfo_person()
-			{
-				var options = "";
-				
-				if(personList !=null)
-				{
-					for(var i = 0 ;i < personList.length;i ++)
-					{
-						var person = personList[i];
-						if(0 == i)
-						{
-							personID = person.id;
-						}
-						if(person.type=="财务员")
-						{
-							options += '<option value="' + person.id + '">' + person.name + '</option>';
-						}		
-					}
-					$("#HandsPersonId").empty().append(options);
-				}
-			}
-			
-			//防止表单提交重复
-			function initForm()
-			{
-				$('#accountHeadFM').form({
-				    onSubmit: function(){
-				        return false;
-				    }
-				});
-			}
-			
-			//初始化表格数据
-			function initTableData()
-			{
-				$('#tableData').datagrid({
-					//width:700,
-					height:heightInfo,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					//url:'<%=path %>/accountHead/findBy.action?pageSize=' + initPageSize,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					pageSize: 5,
-					pageList: initPageNum,
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '单据编号',field: 'BillNo',width:100},
-			          { title: '单据时间 ',field: 'BillTime',width:100},
-			          { title: '备注',field: 'Remark',width:100},
-			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
-			         	{
-							var str = '';
-							var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
-							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName 
-							+ 'AaBb' + rec.HandsPersonId + 'AaBb' + rec.HandsPersonName + 'AaBb' + rec.ChangeAmount;
-        					if(1 == value)
-        					{
-        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountHead(\'' + 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/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccountHead(\'' + 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="deleteAccountHead('+ rec.Id +');"/>&nbsp;<a onclick="deleteAccountHead('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>';
-        					}
-        					return str;
-						}
-			          }
-					]],
-					toolbar:[
-						{
-							id:'addAccountHead',
-							text:'增加',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								addAccountHead();
-							}
-						},
-						{
-							id:'deleteAccountHead',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								batDeleteAccountHead();	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			//初始化表格数据-明细列表-编辑状态
-			function initTableData_account()
-			{
-				$('#accountData').datagrid({
-					height:300,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					onClickRow: onClickRow,
-					pageSize: 50,
-					pageList: [50,100,150],
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemId',width:230,
-						  formatter:function(value,row,index){
-								  return row.InOutItemName;
-	                      },
-						  editor:{
-                          type:'combobox',
-                          options:{
-                              valueField:'Id',
-                              textField:'InOutItemName',
-                              method:'get',
-                              url: "<%=path%>/inOutItem/findBySelect.action"
-                          }
-			            }
-					  },
-			          { title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
-			          { title: '备注',field: 'Remark',editor:'validatebox',width:150}
-					]],
-					toolbar:[
-						{
-							id:'append',
-							text:'新增',
-							iconCls:'icon-add',
-							handler:function()
-							{
-								append(); //新增
-							}
-						},
-						{
-							id:'delete',
-							text:'删除',
-							iconCls:'icon-remove',
-							handler:function()
-							{
-								removeit(); //删除	
-							}
-						},
-						{
-							id:'reject',
-							text:'撤销',
-							iconCls:'icon-undo',
-							handler:function()
-							{
-								reject(); //撤销	
-							}
-						}
-					],
-					onLoadError:function()
-					{
-						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
-						return;
-					}    
-				});
-			}
-			
-			
-			//初始化表格数据-明细列表-查看状态
-			function initTableData_account_show()
-			{
-				$('#accountDataShow').datagrid({
-					height:300,
-					rownumbers: false,
-					//动画效果
-					animate:false,
-					//选中单行
-					singleSelect : true,
-					collapsible:false,
-					selectOnCheck:false,
-					//fitColumns:true,
-					//单击行是否选中
-					//checkOnSelect : false,
-					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
-					pagination: true,
-					//交替出现背景
-					striped : true,
-					//loadFilter: pagerFilter,
-					onClickRow: onClickRow,
-					pageSize: 50,
-					pageList: [50,100,150],
-					columns:[[
-					  { field: 'Id',width:35,align:"center",checkbox:true},
-			          { title: '收入项目',field: 'InOutItemName',width:230},
-			          { title: '金额',field: 'EachAmount',width:50},
-			          { title: '备注',field: 'Remark',width:150}
-					]],
-					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=="BillNo"||obj.id=="BillTime"))
-			    {  
-			        $("#saveAccountHead").click();
-			    }
-			    //搜索按钮添加快捷键
-			    if(k == "13"&&(obj.id=="searchBillNo"))
-			    {  
-			        $("#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  
-							});  
-							showAccountHeadDetails(pageNum,pageSize);
-						}  
-					}); 
-				}
-				catch (e) 
-				{
-					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
-				}
-			}
-			
-			//删除财务信息
-			function deleteAccountHead(accountHeadID)
-			{
-				$.messager.confirm('删除确认','确定要删除此财务信息吗？',function(r)
-			 	{
-                    if (r)
-                    {
-						$.ajax({
-							type:"post",
-							url: "<%=path %>/accountHead/delete.action",
-							dataType: "json",
-							data: ({
-								accountHeadID : accountHeadID,
-								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 batDeleteAccountHead()
-			{
-				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 %>/accountHead/batchDelete.action",
-								dataType: "json",
-								async :  false,
-								data: ({
-									accountHeadIDs : 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 accountHeadID = 0;
-			//保存编辑前的名称
-			var orgAccountHead = "";
-			
-			function addAccountHead()
-			{
-				$("#clientIp").val('<%=clientIp %>');
-				$('#accountHeadFM').form('clear');
-				$('#accountHeadDlg').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});
-	            $("#BillNo").val("").focus();
-	            
-	            orgAccountHead = "";
-	            accountHeadID = 0;
-	            initTableData_account(); //明细列表
-	            reject(); //撤销下、刷新材料列表
-	            url = '<%=path %>/accountHead/create.action';
-			}
-			
-			//保存信息
-			$("#saveAccountHead").unbind().bind({
-				click:function()
-				{
-					if(!$('#accountHeadFM').form('validate'))
-						return;
-					else 
-					{
-						$.ajax({
-							type:"post",
-							url: url,
-							dataType: "json",
-							async :  false,
-							data: ({
-								Type: "付款",
-								BillNo : $.trim($("#BillNo").val()),
-								BillTime : $.trim($("#BillTime").val()),
-								AccountId: $.trim($("#AccountId").val()),
-								ChangeAmount: $.trim($("#ChangeAmount").val()),
-								OrganId: $('#OrganId').combobox('getValue'),
-								HandsPersonId: $.trim($("#HandsPersonId").val()),
-								Remark: $.trim($("#Remark").val()),
-								clientIp:'<%=clientIp %>'
-							}),
-							success: function (tipInfo)
-							{
-								if(tipInfo)
-								{
-									//保存明细记录
-									if(accountHeadID ==0)
-									{
-										getMaxId(); //查找最大的Id
-										accept(accountHeadMaxId); //新增
-									}
-									else
-									{
-										accept(accountHeadID); //修改
-									}
-									
-									
-									$('#accountHeadDlg').dialog('close');
-									var opts = $("#tableData").datagrid('options'); 
-									showAccountHeadDetails(opts.pageNumber,opts.pageSize); 
-								}
-								else
-								{
-									$.messager.show({
-			                            title: '错误提示',
-			                            msg: '保存信息失败，请稍后重试!'
-			                        });
-								}
-							},
-							//此处添加错误处理
-				    		error:function()
-				    		{
-				    			$.messager.alert('提示','保存信息异常，请稍后再试！','error');
-								return;
-							}
-						});	
-					}
-				}
-			});
-			
-			//编辑信息
-	        function editAccountHead(accountHeadTotalInfo)
-	        {
-	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
-	            $("#clientIp").val('<%=clientIp %>');
-	            $("#BillNo").val(accountHeadInfo[1]);
-	            $("#BillTime").val(accountHeadInfo[2]);
-	            $("#Remark").val(accountHeadInfo[3]);
-	            $("#AccountId").val(accountHeadInfo[4]);
-	            $('#OrganId').combobox('setValue', accountHeadInfo[6]);
-	            $("#HandsPersonId").val(accountHeadInfo[8]);
-	            $("#ChangeAmount").val(accountHeadInfo[10]);	            	            
-                $('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑财务信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                accountHeadID = accountHeadInfo[0];
-                
-                initTableData_account(); //明细列表
-                reject(); //撤销下、刷新材料列表                
-                url = '<%=path %>/accountHead/update.action?accountHeadID=' + accountHeadInfo[0];
-	        }
-	        
-	        //查看信息
-	        function showAccountHead(accountHeadTotalInfo)
-	        {
-	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
-	            $("#BillNoShow").text(accountHeadInfo[1]);
-	            $("#BillTimeShow").text(accountHeadInfo[2]);	     
-	            $("#RemarkShow").text(accountHeadInfo[3]);       
-	            $("#AccountIdShow").text(accountHeadInfo[5]);
-	            $('#OrganIdShow').text(accountHeadInfo[7]);
-	            $("#HandsPersonIdShow").text(accountHeadInfo[9]);	            
-	            $("#ChangeAmountShow").text(accountHeadInfo[10]);
-	            $('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看财务信息');
-                $(".window-mask").css({ width: webW ,height: webH});
-                
-                accountHeadID = accountHeadInfo[0];
-                initTableData_account_show(); //明细列表-查看状态
-	        }
-	        
-			//搜索处理
-			$("#searchBtn").unbind().bind({
-				click:function()
-				{
-					showAccountHeadDetails(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 showAccountHeadDetails(pageNo,pageSize)
-			{
-				$.ajax({
-					type:"post",
-					url: "<%=path %>/accountHead/findBy.action",
-					dataType: "json",
-					data: ({
-						Type:"付款",
-						BillNo:$.trim($("#searchBillNo").val()),
-						BeginTime:$("#searchBeginTime").val(),
-						EndTime:$("#searchEndTime").val(),
-						pageNo:pageNo,
-						pageSize:pageSize
-					}),
-					success: function (data)
-					{
-						$("#tableData").datagrid('loadData',data);
-					},
-					//此处添加错误处理
-		    		error:function()
-		    		{
-		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
-						return;
-					}
-				});
-			}
-			//重置按钮
-			$("#searchResetBtn").unbind().bind({
-				click:function(){
-					$("#searchBillNo").val("");
-					$("#searchBeginTime").val("");
-					$("#searchEndTime").val("");
-					//加载完以后重新初始化
-					$("#searchBtn").click();
-			    }	
-			});
-			
-			//结束编辑
-			var editIndex = undefined;
-	        function endEditing() {
-	            if (editIndex == undefined) { return true }
-	            if ($('#accountData').datagrid('validateRow', editIndex)) {
-	            	var ed = $('#accountData').datagrid('getEditor', {index:editIndex,field:'InOutItemId'});
-	                var InOutItemName = $(ed.target).combobox('getText');
-	                $('#accountData').datagrid('getRows')[editIndex]['InOutItemName'] = InOutItemName;
-	                $('#accountData').datagrid('endEdit', editIndex);
-	                editIndex = undefined;
-	                return true;
-	            } else {
-	                return false;
-	            }
-	        }
-	        //单击
-	        function onClickRow(index) {
-	            if (editIndex != index) {
-	                if (endEditing()) {
-	                    $('#accountData').datagrid('selectRow', index)
-	                            .datagrid('beginEdit', index);
-	                    editIndex = index;
-	                } else {
-	                    $('#accountData').datagrid('selectRow', editIndex);
-	                }
-	            }
-	        }
-			//新增
-			function append()  
-			{
-	            if (endEditing()) {
-	                $('#accountData').datagrid('appendRow', {});
-	                editIndex = $('#accountData').datagrid('getRows').length - 1;
-	                $('#accountData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
-	            }
-			}
-			//删除
-	        function removeit() {
-	            if (editIndex == undefined) { return }
-	            $('#accountData').datagrid('cancelEdit', editIndex)
-	                    .datagrid('deleteRow', editIndex);
-	            editIndex = undefined;
-	        }
-	        //撤销
-	        function reject() {
-	            $('#accountData').datagrid('rejectChanges');
-	            editIndex = undefined;
-	        }
-	        //判断
-	        function CheckData() {
-	            var row = $('#accountData').datagrid('getRows');
-	            var totalRowNum = "";
-	            for (var i = 0; i < row.length; i++) {
-	                if (row[i].InOutItemId == "") {
-	                    totalRowNum += (i + 1) + "、";
-	                }
-	            }
-	            if (totalRowNum != "") {
-	                var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
-	                $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
-	                return false;
-	            }
-	            return true;
-	        }
-	        //保存
-	        function accept(accepId) {
-	            append();
-	            removeit();
-	            if ($("#accountData").datagrid('getChanges').length) {
-	                if (!CheckData())
-	                    return false;
-	                var inserted = $("#accountData").datagrid('getChanges', "inserted");
-	                var deleted = $("#accountData").datagrid('getChanges', "deleted");
-	                var updated = $("#accountData").datagrid('getChanges', "updated");
-	                $.ajax({
-	                    type: "post",
-	                    url: "<%=path%>/accountItem/saveDetials.action",
-	                    data: {
-	                        Inserted: JSON.stringify(inserted),
-	                        Deleted: JSON.stringify(deleted),
-	                        Updated: JSON.stringify(updated),
-	                        HeaderId:accepId,
-	                        clientIp:'<%=clientIp %>'
-	                    },
-	                    success: function (tipInfo) 
-	                    { 
-	                        if (tipInfo) {
-	                            $.messager.alert('提示','保存成功！','info');	
-	                        }
-	                        else
-	                        	$.messager.alert('提示','保存失败！','error');	
-
-	                    },
-	                    error: function (XmlHttpRequest, textStatus, errorThrown) 
-	                    {
-	                        $.messager.alert('提示',XmlHttpRequest.responseText,'error');	
-	                    }
-	                });
-	            }
-	            if (endEditing()) {
-	                $('#accountData').datagrid('acceptChanges');
-	            }
-	        }
-	        //获取MaxId
-	        function getMaxId()
-	        {
-	    	    var accountHeadMax=null;
-	        	$.ajax({
-	        		type:"post",
-	        		url: "<%=path%>/accountHead/getMaxId.action",
-	        		//设置为同步
-	        		async:false,
-	        		dataType: "json",
-	        		success: function (systemInfo)
-	        		{
-	        			if(systemInfo)
-	        			{
-	        				accountHeadMax = systemInfo.showModel.map.accountHeadMax;
-	        				var msgTip = systemInfo.showModel.msgTip;
-	        				if(msgTip == "exceptoin")
-	        				{
-	        					$.messager.alert('提示','查找最大的Id异常,请与管理员联系！','error');
-	        					return;
-	        				}
-	        			}
-	        			else
-	        			{
-	        				accountHeadMax=null;
-	        			}
-	        		}
-	        	});
-	        	
-	        	if(accountHeadMax !=null)
-	        	{
-	        		if(accountHeadMax.length>0)
-	        		{
-	        			accountHeadMaxId=accountHeadMax[0];
-	        		}
-	        	}
-	        }
-		</script>
-	</body>
-</html>
+<%@page import="com.jsh.util.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>
+		<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/My97DatePicker/WdatePicker.js"></script>
+		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
+  	</head>
+  	<body>
+  		<!-- 查询 -->
+		<div id = "searchPanel"	class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
+			<table id="searchTable">
+				<tr>
+					<td>单据号：</td>
+					<td>
+						<input type="text" name="searchBillNo" id="searchBillNo" 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:80px;"/>
+					</td>
+					<td>-</td>
+					<td>
+						<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
+					</td>
+					<td>&nbsp;</td>
+					<td>
+						<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&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="accountHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	            closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
+	        <form id="accountHeadFM" method="post"  novalidate>
+	            <table>
+	            <tr>	
+	            <td>单据编号：</td>
+	            <td style="padding:5px"><input name="BillNo" id="BillNo" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 120px;"/>
+	            </td>            
+                <td>单据日期：</td>
+                <td style="padding:5px">
+                <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
+                </td>         
+	            <td>账户：</td>
+	            <td style="padding:5px">
+	            <select id="AccountId" name="AccountId" style="width:120px;"></select>
+	            </td>
+	            <td>金额：</td>
+				<td>
+					<input type="text" name="ChangeAmount" id="ChangeAmount" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 60px;"></input>
+				</td>
+	            </tr>
+	            <tr>
+	            <td>单位：</td>
+	            <td style="padding:5px">
+                <select name="OrganId" id="OrganId" style="width:120px;"></select>
+                </td>
+	            <td>经手人：</td>
+	            <td style="padding:5px">
+	            <select name="HandsPersonId" id="HandsPersonId" style="width:120px;"></select>
+	            </td>
+	            <td>备注：</td>
+	            <td style="padding:5px">
+	            <input name="Remark" id="Remark" class="easyui-validatebox" style="width: 120px;"/>
+	            </td>
+	            <td></td>
+	            <td></td>
+	            </tr>
+	            <tr>
+	            <td>单据明细：</td>
+	            <td colspan="7">
+			    <!-- 单据列表table -->
+				<table id="accountData" style="top:100px;border-bottom-color:#FFFFFF"></table>
+	            </td>
+	            </tr>
+	            </table>
+	            <input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
+	        </form>
+	    </div>
+	    <div id="dlg-buttons">
+	        <a href="javascript:void(0)" id="saveAccountHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
+	        <a href="javascript:void(0)" id="cancelAccountHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#accountHeadDlg').dialog('close')">取消</a>
+	    </div>
+	    <div id="accountHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
+	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
+	            <table>
+	            <tr>
+	            <td>单据编号：</td>
+                <td style="padding:5px;width:120px;">
+                <span id="BillNoShow"></span>
+                </td>
+	            <td>单据日期：</td>
+	            <td style="padding:5px;width:120px;">
+                <span id="BillTimeShow"></span>
+                </td>                
+	            <td>账户：</td>
+	            <td style="padding:5px;width:120px;">
+	            <span id="AccountIdShow"></span>
+	            </td>
+	            <td>金额：</td>
+	            <td style="padding:5px;width:120px;">
+	            <span id="ChangeAmountShow"></span>
+	            </td>
+	            </tr>
+	            <tr>
+	            <td>单位：</td>
+	            <td style="padding:5px">
+	            <span id="OrganIdShow"></span>
+	            </td>
+	            <td>经手人：</td>
+				<td style="padding:5px">
+				<span id="HandsPersonIdShow"></span>
+				</td>
+	            <td>备注：</td>
+	            <td style="padding:5px">
+	            <span id="RemarkShow"></span>
+	            </td>
+	            <td></td>	            
+	            <td></td>
+	            </tr>
+	            <tr>
+	            <td>单据明细：</td>
+	            <td colspan="7">
+			    <!-- 单据列表table -->
+				<table id="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+	            </td>
+	            </tr>
+	            </table>
+	    </div>
+	    
+		<script type="text/javascript">
+			var accountList = null;
+			var accountID = null;
+			var supplierList = null;
+			var supplierID = null;
+			var personList = null;
+			var personID = null;
+			var ProjectSearch=null;
+			var kid=${sessionScope.user.id};
+			var accountHeadMaxId=null; //获取最大的Id
+			var accepId=null; //保存的主表id
+			//初始化界面
+			$(function()
+			{
+				initSystemData_person(); //经手人数据
+				initSelectInfo_person(); //经手人信息
+				initSystemData_account(); //账户数据
+				initSelectInfo_account(); //账户信息
+				initSupplier(); //供应商
+				initTableData();
+				ininPager();
+				initForm();			
+				$("#searchBtn").click();	
+			});	
+			
+			//获取账户信息
+			function initSystemData_account()
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path%>/account/getAccount.action",
+					//设置为同步
+					async:false,
+					dataType: "json",
+					success: function (systemInfo)
+					{
+						accountList = systemInfo.showModel.map.accountList;
+						var msgTip = systemInfo.showModel.msgTip;
+						if(msgTip == "exceptoin")
+						{
+							$.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
+							return;
+						}	
+					}
+				});				
+			}
+			//获取账户信息
+			function initSelectInfo_account()
+			{
+				var options = "";				
+				if(accountList !=null)
+				{
+					options = "";
+					for(var i = 0 ;i < accountList.length;i ++)
+					{
+						var account = accountList[i];
+						options += '<option value="' + account.id + '">' + account.name + '</option>';
+					}	
+					$("#AccountId").empty().append(options);
+				}
+			}
+			
+			//初始化单位信息
+			function initSupplier()
+			{
+				$('#OrganId').combobox({    
+					url: "<%=path%>/supplier/findBySelect_sup.action",
+				    valueField:'id',    
+				    textField:'supplier'
+				});  
+			}
+			
+			//获取财务员
+			function initSystemData_person()
+			{
+				var type = "财务员";
+				$.ajax({
+					type:"post",
+					url: "<%=path%>/person/getPersonByType.action",
+					data: {
+						Type: type
+					},
+					//设置为同步
+					async:false,
+					dataType: "json",
+					success: function (systemInfo)
+					{
+						personList = systemInfo.showModel.map.personList;
+						var msgTip = systemInfo.showModel.msgTip;
+						if(msgTip == "exceptoin")
+						{
+							$.messager.alert('提示','查找系统基础信息异常,请与管理员联系！','error');
+							return;
+						}	
+					}
+				});				
+			}
+			//获取财务员
+			function initSelectInfo_person()
+			{
+				var options = "";
+				
+				if(personList !=null)
+				{
+					for(var i = 0 ;i < personList.length;i ++)
+					{
+						var person = personList[i];
+						if(0 == i)
+						{
+							personID = person.id;
+						}
+						if(person.type=="财务员")
+						{
+							options += '<option value="' + person.id + '">' + person.name + '</option>';
+						}		
+					}
+					$("#HandsPersonId").empty().append(options);
+				}
+			}
+			
+			//防止表单提交重复
+			function initForm()
+			{
+				$('#accountHeadFM').form({
+				    onSubmit: function(){
+				        return false;
+				    }
+				});
+			}
+			
+			//初始化表格数据
+			function initTableData()
+			{
+				$('#tableData').datagrid({
+					//width:700,
+					height:heightInfo,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					//url:'<%=path %>/accountHead/findBy.action?pageSize=' + initPageSize,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					pageSize: 5,
+					pageList: initPageNum,
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '单据编号',field: 'BillNo',width:100},
+			          { title: '单据时间 ',field: 'BillTime',width:100},
+			          { title: '备注',field: 'Remark',width:100},
+			          { title: '操作',field: 'op',align:"center",width:180,formatter:function(value,rec)
+			         	{
+							var str = '';
+							var rowInfo = rec.Id + 'AaBb' + rec.BillNo+ 'AaBb' + rec.BillTime+ 'AaBb' + rec.Remark
+							+ 'AaBb' + rec.AccountId+ 'AaBb' + rec.AccountName + 'AaBb' + rec.OrganId + 'AaBb' + rec.OrganName 
+							+ 'AaBb' + rec.HandsPersonId + 'AaBb' + rec.HandsPersonName + 'AaBb' + rec.ChangeAmount;
+        					if(1 == value)
+        					{
+        						str += '<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="showAccountHead(\'' + 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/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editAccountHead(\'' + 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="deleteAccountHead('+ rec.Id +');"/>&nbsp;<a onclick="deleteAccountHead('+ rec.Id +');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>';
+        					}
+        					return str;
+						}
+			          }
+					]],
+					toolbar:[
+						{
+							id:'addAccountHead',
+							text:'增加',
+							iconCls:'icon-add',
+							handler:function()
+							{
+								addAccountHead();
+							}
+						},
+						{
+							id:'deleteAccountHead',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function()
+							{
+								batDeleteAccountHead();	
+							}
+						}
+					],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}    
+				});
+			}
+			
+			//初始化表格数据-明细列表-编辑状态
+			function initTableData_account()
+			{
+				$('#accountData').datagrid({
+					height:300,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					onClickRow: onClickRow,
+					pageSize: 50,
+					pageList: [50,100,150],
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '账户名称',field: 'AccountId',width:230,
+						  formatter:function(value,row,index){
+								  return row.AccountName;
+	                      },
+						  editor:{
+                          type:'combobox',
+                          options:{
+                              valueField:'Id',
+                              textField:'AccountName',
+                              method:'get',
+                              url: "<%=path%>/account/findBySelect.action"
+                          }
+			            }
+					  },
+			          { title: '金额',field: 'EachAmount',editor:'validatebox',width:50},
+			          { title: '备注',field: 'Remark',editor:'validatebox',width:150}
+					]],
+					toolbar:[
+						{
+							id:'append',
+							text:'新增',
+							iconCls:'icon-add',
+							handler:function()
+							{
+								append(); //新增
+							}
+						},
+						{
+							id:'delete',
+							text:'删除',
+							iconCls:'icon-remove',
+							handler:function()
+							{
+								removeit(); //删除	
+							}
+						},
+						{
+							id:'reject',
+							text:'撤销',
+							iconCls:'icon-undo',
+							handler:function()
+							{
+								reject(); //撤销	
+							}
+						}
+					],
+					onLoadError:function()
+					{
+						$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+						return;
+					}    
+				});
+			}
+			
+			
+			//初始化表格数据-明细列表-查看状态
+			function initTableData_account_show()
+			{
+				$('#accountDataShow').datagrid({
+					height:300,
+					rownumbers: false,
+					//动画效果
+					animate:false,
+					//选中单行
+					singleSelect : true,
+					collapsible:false,
+					selectOnCheck:false,
+					//fitColumns:true,
+					//单击行是否选中
+					//checkOnSelect : false,
+					url:'<%=path %>/accountItem/findBy.action?HeaderId=' + accountHeadID,
+					pagination: true,
+					//交替出现背景
+					striped : true,
+					//loadFilter: pagerFilter,
+					onClickRow: onClickRow,
+					pageSize: 50,
+					pageList: [50,100,150],
+					columns:[[
+					  { field: 'Id',width:35,align:"center",checkbox:true},
+			          { title: '账户名称',field: 'AccountName',width:230},
+			          { title: '金额',field: 'EachAmount',width:50},
+			          { title: '备注',field: 'Remark',width:150}
+					]],
+					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=="BillNo"||obj.id=="BillTime"))
+			    {  
+			        $("#saveAccountHead").click();
+			    }
+			    //搜索按钮添加快捷键
+			    if(k == "13"&&(obj.id=="searchBillNo"))
+			    {  
+			        $("#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  
+							});  
+							showAccountHeadDetails(pageNum,pageSize);
+						}  
+					}); 
+				}
+				catch (e) 
+				{
+					$.messager.alert('异常处理提示',"分页信息异常 :  " + e.name + ": " + e.message,'error');
+				}
+			}
+			
+			//删除财务信息
+			function deleteAccountHead(accountHeadID)
+			{
+				$.messager.confirm('删除确认','确定要删除此财务信息吗？',function(r)
+			 	{
+                    if (r)
+                    {
+						$.ajax({
+							type:"post",
+							url: "<%=path %>/accountHead/delete.action",
+							dataType: "json",
+							data: ({
+								accountHeadID : accountHeadID,
+								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 batDeleteAccountHead()
+			{
+				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 %>/accountHead/batchDelete.action",
+								dataType: "json",
+								async :  false,
+								data: ({
+									accountHeadIDs : 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 accountHeadID = 0;
+			//保存编辑前的名称
+			var orgAccountHead = "";
+			
+			function addAccountHead()
+			{
+				$("#clientIp").val('<%=clientIp %>');
+				$('#accountHeadFM').form('clear');
+				$('#accountHeadDlg').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});
+	            $("#BillNo").val("").focus();
+	            
+	            orgAccountHead = "";
+	            accountHeadID = 0;
+	            initTableData_account(); //明细列表
+	            reject(); //撤销下、刷新材料列表
+	            url = '<%=path %>/accountHead/create.action';
+			}
+			
+			//保存信息
+			$("#saveAccountHead").unbind().bind({
+				click:function()
+				{
+					if(!$('#accountHeadFM').form('validate'))
+						return;
+					else 
+					{
+						$.ajax({
+							type:"post",
+							url: url,
+							dataType: "json",
+							async :  false,
+							data: ({
+								Type: "付款",
+								BillNo : $.trim($("#BillNo").val()),
+								BillTime : $.trim($("#BillTime").val()),
+								AccountId: $.trim($("#AccountId").val()),
+								ChangeAmount: $.trim($("#ChangeAmount").val()),
+								OrganId: $('#OrganId').combobox('getValue'),
+								HandsPersonId: $.trim($("#HandsPersonId").val()),
+								Remark: $.trim($("#Remark").val()),
+								clientIp:'<%=clientIp %>'
+							}),
+							success: function (tipInfo)
+							{
+								if(tipInfo)
+								{
+									//保存明细记录
+									if(accountHeadID ==0)
+									{
+										getMaxId(); //查找最大的Id
+										accept(accountHeadMaxId); //新增
+									}
+									else
+									{
+										accept(accountHeadID); //修改
+									}
+									
+									
+									$('#accountHeadDlg').dialog('close');
+									var opts = $("#tableData").datagrid('options'); 
+									showAccountHeadDetails(opts.pageNumber,opts.pageSize); 
+								}
+								else
+								{
+									$.messager.show({
+			                            title: '错误提示',
+			                            msg: '保存信息失败，请稍后重试!'
+			                        });
+								}
+							},
+							//此处添加错误处理
+				    		error:function()
+				    		{
+				    			$.messager.alert('提示','保存信息异常，请稍后再试！','error');
+								return;
+							}
+						});	
+					}
+				}
+			});
+			
+			//编辑信息
+	        function editAccountHead(accountHeadTotalInfo)
+	        {
+	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
+	            $("#clientIp").val('<%=clientIp %>');
+	            $("#BillNo").val(accountHeadInfo[1]);
+	            $("#BillTime").val(accountHeadInfo[2]);
+	            $("#Remark").val(accountHeadInfo[3]);
+	            $("#AccountId").val(accountHeadInfo[4]);
+	            $('#OrganId').combobox('setValue', accountHeadInfo[6]);
+	            $("#HandsPersonId").val(accountHeadInfo[8]);
+	            $("#ChangeAmount").val(accountHeadInfo[10]);	            	            
+                $('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑财务信息');
+                $(".window-mask").css({ width: webW ,height: webH});
+                accountHeadID = accountHeadInfo[0];
+                
+                initTableData_account(); //明细列表
+                reject(); //撤销下、刷新材料列表                
+                url = '<%=path %>/accountHead/update.action?accountHeadID=' + accountHeadInfo[0];
+	        }
+	        
+	        //查看信息
+	        function showAccountHead(accountHeadTotalInfo)
+	        {
+	        	var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
+	            $("#BillNoShow").text(accountHeadInfo[1]);
+	            $("#BillTimeShow").text(accountHeadInfo[2]);	     
+	            $("#RemarkShow").text(accountHeadInfo[3]);       
+	            $("#AccountIdShow").text(accountHeadInfo[5]);
+	            $('#OrganIdShow').text(accountHeadInfo[7]);
+	            $("#HandsPersonIdShow").text(accountHeadInfo[9]);	            
+	            $("#ChangeAmountShow").text(accountHeadInfo[10]);
+	            $('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="<%=path%>/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看财务信息');
+                $(".window-mask").css({ width: webW ,height: webH});
+                
+                accountHeadID = accountHeadInfo[0];
+                initTableData_account_show(); //明细列表-查看状态
+	        }
+	        
+			//搜索处理
+			$("#searchBtn").unbind().bind({
+				click:function()
+				{
+					showAccountHeadDetails(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 showAccountHeadDetails(pageNo,pageSize)
+			{
+				$.ajax({
+					type:"post",
+					url: "<%=path %>/accountHead/findBy.action",
+					dataType: "json",
+					data: ({
+						Type:"付款",
+						BillNo:$.trim($("#searchBillNo").val()),
+						BeginTime:$("#searchBeginTime").val(),
+						EndTime:$("#searchEndTime").val(),
+						pageNo:pageNo,
+						pageSize:pageSize
+					}),
+					success: function (data)
+					{
+						$("#tableData").datagrid('loadData',data);
+					},
+					//此处添加错误处理
+		    		error:function()
+		    		{
+		    			$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+						return;
+					}
+				});
+			}
+			//重置按钮
+			$("#searchResetBtn").unbind().bind({
+				click:function(){
+					$("#searchBillNo").val("");
+					$("#searchBeginTime").val("");
+					$("#searchEndTime").val("");
+					//加载完以后重新初始化
+					$("#searchBtn").click();
+			    }	
+			});
+			
+			//结束编辑
+			var editIndex = undefined;
+	        function endEditing() {
+	            if (editIndex == undefined) { return true }
+	            if ($('#accountData').datagrid('validateRow', editIndex)) {
+	            	var ed = $('#accountData').datagrid('getEditor', {index:editIndex,field:'AccountId'});
+	                var AccountName = $(ed.target).combobox('getText');
+	                $('#accountData').datagrid('getRows')[editIndex]['AccountName'] = AccountName;
+	                $('#accountData').datagrid('endEdit', editIndex);
+	                editIndex = undefined;
+	                return true;
+	            } else {
+	                return false;
+	            }
+	        }
+	        //单击
+	        function onClickRow(index) {
+	            if (editIndex != index) {
+	                if (endEditing()) {
+	                    $('#accountData').datagrid('selectRow', index)
+	                            .datagrid('beginEdit', index);
+	                    editIndex = index;
+	                } else {
+	                    $('#accountData').datagrid('selectRow', editIndex);
+	                }
+	            }
+	        }
+			//新增
+			function append()  
+			{
+	            if (endEditing()) {
+	                $('#accountData').datagrid('appendRow', {});
+	                editIndex = $('#accountData').datagrid('getRows').length - 1;
+	                $('#accountData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
+	            }
+			}
+			//删除
+	        function removeit() {
+	            if (editIndex == undefined) { return }
+	            $('#accountData').datagrid('cancelEdit', editIndex)
+	                    .datagrid('deleteRow', editIndex);
+	            editIndex = undefined;
+	        }
+	        //撤销
+	        function reject() {
+	            $('#accountData').datagrid('rejectChanges');
+	            editIndex = undefined;
+	        }
+	        //判断
+	        function CheckData() {
+	            var row = $('#accountData').datagrid('getRows');
+	            var totalRowNum = "";
+	            for (var i = 0; i < row.length; i++) {
+	                if (row[i].AccountId == "") {
+	                    totalRowNum += (i + 1) + "、";
+	                }
+	            }
+	            if (totalRowNum != "") {
+	                var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
+	                $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');	
+	                return false;
+	            }
+	            return true;
+	        }
+	        //保存
+	        function accept(accepId) {
+	            append();
+	            removeit();
+	            if ($("#accountData").datagrid('getChanges').length) {
+	                if (!CheckData())
+	                    return false;
+	                var inserted = $("#accountData").datagrid('getChanges', "inserted");
+	                var deleted = $("#accountData").datagrid('getChanges', "deleted");
+	                var updated = $("#accountData").datagrid('getChanges', "updated");
+	                $.ajax({
+	                    type: "post",
+	                    url: "<%=path%>/accountItem/saveDetials.action",
+	                    data: {
+	                        Inserted: JSON.stringify(inserted),
+	                        Deleted: JSON.stringify(deleted),
+	                        Updated: JSON.stringify(updated),
+	                        HeaderId:accepId,
+	                        clientIp:'<%=clientIp %>'
+	                    },
+	                    success: function (tipInfo) 
+	                    { 
+	                        if (tipInfo) {
+	                            $.messager.alert('提示','保存成功！','info');	
+	                        }
+	                        else
+	                        	$.messager.alert('提示','保存失败！','error');	
+
+	                    },
+	                    error: function (XmlHttpRequest, textStatus, errorThrown) 
+	                    {
+	                        $.messager.alert('提示',XmlHttpRequest.responseText,'error');	
+	                    }
+	                });
+	            }
+	            if (endEditing()) {
+	                $('#accountData').datagrid('acceptChanges');
+	            }
+	        }
+	        //获取MaxId
+	        function getMaxId()
+	        {
+	    	    var accountHeadMax=null;
+	        	$.ajax({
+	        		type:"post",
+	        		url: "<%=path%>/accountHead/getMaxId.action",
+	        		//设置为同步
+	        		async:false,
+	        		dataType: "json",
+	        		success: function (systemInfo)
+	        		{
+	        			if(systemInfo)
+	        			{
+	        				accountHeadMax = systemInfo.showModel.map.accountHeadMax;
+	        				var msgTip = systemInfo.showModel.msgTip;
+	        				if(msgTip == "exceptoin")
+	        				{
+	        					$.messager.alert('提示','查找最大的Id异常,请与管理员联系！','error');
+	        					return;
+	        				}
+	        			}
+	        			else
+	        			{
+	        				accountHeadMax=null;
+	        			}
+	        		}
+	        	});
+	        	
+	        	if(accountHeadMax !=null)
+	        	{
+	        		if(accountHeadMax.length>0)
+	        		{
+	        			accountHeadMaxId=accountHeadMax[0];
+	        		}
+	        	}
+	        }
+		</script>
+	</body>
+</html>
diff --git a/WebRoot/pages/materials/allocation_out_list.jsp b/WebRoot/pages/materials/allocation_out_list.jsp
index 09fb3900..784828b8 100644
--- a/WebRoot/pages/materials/allocation_out_list.jsp
+++ b/WebRoot/pages/materials/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:80px;"></select>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -70,7 +70,7 @@
                 <td style="padding:5px">
                 <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
                 </td>
-	            <td>对方仓库：</td>
+	            <td>收货仓库：</td>
 	            <td style="padding:5px">
 	            <select name="AllocationProjectId" id="AllocationProjectId" style="width:120px;"></select>
 	            </td>
@@ -111,7 +111,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
@@ -119,7 +119,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>
diff --git a/WebRoot/pages/materials/other_in_list.jsp b/WebRoot/pages/materials/other_in_list.jsp
index edc889b6..de2dfa79 100644
--- a/WebRoot/pages/materials/other_in_list.jsp
+++ b/WebRoot/pages/materials/other_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:80px;"></select>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>收货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -118,7 +118,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>收货仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
diff --git a/WebRoot/pages/materials/other_out_list.jsp b/WebRoot/pages/materials/other_out_list.jsp
index c51c389b..40401ef5 100644
--- a/WebRoot/pages/materials/other_out_list.jsp
+++ b/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:80px;"></select>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -111,7 +111,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
diff --git a/WebRoot/pages/materials/purchase_back_list.jsp b/WebRoot/pages/materials/purchase_back_list.jsp
index df0ea612..1a38139e 100644
--- a/WebRoot/pages/materials/purchase_back_list.jsp
+++ b/WebRoot/pages/materials/purchase_back_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:80px;"></select>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -118,7 +118,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
diff --git a/WebRoot/pages/materials/purchase_in_list.jsp b/WebRoot/pages/materials/purchase_in_list.jsp
index 728a18eb..35c6ce99 100644
--- a/WebRoot/pages/materials/purchase_in_list.jsp
+++ b/WebRoot/pages/materials/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:80px;"></select>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>收货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -118,7 +118,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>收货仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
diff --git a/WebRoot/pages/materials/sale_back_list.jsp b/WebRoot/pages/materials/sale_back_list.jsp
index 66d0a402..83462154 100644
--- a/WebRoot/pages/materials/sale_back_list.jsp
+++ b/WebRoot/pages/materials/sale_back_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:80px;"></select>
 					</td>
@@ -35,7 +35,7 @@
 					<td>
 						<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
 					</td>
-					<td>出库时间：</td>
+					<td>入库时间：</td>
 					<td>
 						<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>收货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -70,7 +70,7 @@
                 <td style="padding:5px">
                 <input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:120px;"/>
                 </td>
-	            <td>客户：</td>
+	            <td>退货单位：</td>
 	            <td style="padding:5px">
 	            <input id="OrganId" name="OrganId" style="width:120px;" />  
 	            </td>
@@ -119,7 +119,7 @@
                 <td style="padding:5px;width:120px;">
                 <span id="OperTimeShow"></span>
                 </td>
-	            <td>客户：</td>
+	            <td>退货单位：</td>
 	            <td style="padding:5px;width:120px;">
 	            <span id="OrganIdShow"></span>
 	            </td>
diff --git a/WebRoot/pages/materials/sale_out_list.jsp b/WebRoot/pages/materials/sale_out_list.jsp
index 1a34c47f..d97706b0 100644
--- a/WebRoot/pages/materials/sale_out_list.jsp
+++ b/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:80px;"></select>
 					</td>
@@ -62,7 +62,7 @@
 	        <form id="depotHeadFM" method="post"  novalidate>
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px">
                 <select name="ProjectId" id="ProjectId" style="width:120px;"></select>
                 </td>
@@ -111,7 +111,7 @@
 	            closed="true" modal="true" cache="false" collapsible="false" closable="true">
 	            <table>
 	            <tr>
-	            <td>仓　库：</td>
+	            <td>发货仓库：</td>
 	            <td style="padding:5px;width:120px;">
                 <span id="ProjectIdShow"></span>
                 </td>
diff --git a/src/com/jsh/action/basic/AccountAction.java b/src/com/jsh/action/basic/AccountAction.java
index 73bd9918..c417675c 100644
--- a/src/com/jsh/action/basic/AccountAction.java
+++ b/src/com/jsh/action/basic/AccountAction.java
@@ -291,9 +291,9 @@ public class AccountAction extends BaseAction<AccountModel>
                 for(Account account:dataList)
                 {
                     JSONObject item = new JSONObject();
-                    item.put("id", account.getId());
+                    item.put("Id", account.getId());
                     //结算账户名称
-                    item.put("name", account.getName());
+                    item.put("AccountName", account.getName());
                     dataArray.add(item);
                 }
             }
diff --git a/src/com/jsh/action/basic/InOutItemAction.java b/src/com/jsh/action/basic/InOutItemAction.java
index 4da9f834..f6f40a91 100644
--- a/src/com/jsh/action/basic/InOutItemAction.java
+++ b/src/com/jsh/action/basic/InOutItemAction.java
@@ -308,6 +308,12 @@ public class InOutItemAction extends BaseAction<InOutItemModel>
          * 拼接搜索条件
          */
         Map<String,Object> condition = new HashMap<String,Object>();
+        if(model.getType().equals("in")) {
+        	condition.put("type_s_eq", "收入");
+        }
+        else if(model.getType().equals("out")) {
+        	condition.put("type_s_eq", "支出");
+        }        	
         condition.put("id_s_order", "desc");
         return condition;
     }
diff --git a/src/com/jsh/action/materials/AccountItemAction.java b/src/com/jsh/action/materials/AccountItemAction.java
index 21f62ae7..ba7e1954 100644
--- a/src/com/jsh/action/materials/AccountItemAction.java
+++ b/src/com/jsh/action/materials/AccountItemAction.java
@@ -1,30 +1,23 @@
 package com.jsh.action.materials;
 
-import java.io.File;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.springframework.dao.DataAccessException;
 import com.jsh.base.BaseAction;
 import com.jsh.base.Log;
-import com.jsh.util.AssetConstants;
-import com.jsh.util.JshException;
-import com.jsh.model.po.Asset;
 import com.jsh.model.po.AccountHead;
 import com.jsh.model.po.AccountItem;
 import com.jsh.model.po.Logdetails;
 import com.jsh.model.po.Account;
 import com.jsh.model.po.InOutItem;
 import com.jsh.model.vo.materials.AccountItemModel;
-import com.jsh.service.materials.AccountHeadIService;
 import com.jsh.service.materials.AccountItemIService;
 import com.jsh.util.PageUtil;
-import com.jsh.util.Tools;
 /*
  * 财务明细管理(收支|收付款|转账)
  * @author jishenghua  qq:752718920
diff --git a/src/com/jsh/action/materials/PersonAction.java b/src/com/jsh/action/materials/PersonAction.java
index 66531d0c..962cd038 100644
--- a/src/com/jsh/action/materials/PersonAction.java
+++ b/src/com/jsh/action/materials/PersonAction.java
@@ -232,10 +232,6 @@ public class PersonAction extends BaseAction<PersonModel>
             personService.find(pageUtil);
             List<Person> dataList = pageUtil.getPageList();
             
-            //开始拼接json数据
-//            {"total":28,"rows":[
-//                {"productid":"AV-CB-01","attr1":"Adult Male","itemid":"EST-18"}
-//            ]}
             JSONObject outer = new JSONObject();
             outer.put("total", pageUtil.getTotalCount());
             //存放数据json数组
diff --git a/src/com/jsh/base/Log.java b/src/com/jsh/base/Log.java
index 3befc3f7..1a665d30 100644
--- a/src/com/jsh/base/Log.java
+++ b/src/com/jsh/base/Log.java
@@ -4,7 +4,7 @@ import org.apache.log4j.Logger;
 
 /**
  * 封装log4j日志信息，打印日志信息类
- * @author ji/sheng/hua  qq_752718920
+ * @author ji/sheng/hua  qq_7527.18920
  * @since 2014-01-22
  */
 public class Log