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

This commit is contained in:
季圣华
2016-12-18 22:02:59 +08:00
parent 5b11628ec1
commit 77e30a07c8
20 changed files with 2846 additions and 2851 deletions

View File

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

View File

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