优化入库、出库的前端UI,并修复相关BUG
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user