优化入库、出库的前端UI，并修复相关BUG

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);
                 }
             }

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;
     }

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

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数组

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