diff --git a/erp_web/js/pages/materials/bill_detail.js b/erp_web/js/pages/materials/bill_detail.js index a127b801..04343320 100644 --- a/erp_web/js/pages/materials/bill_detail.js +++ b/erp_web/js/pages/materials/bill_detail.js @@ -205,8 +205,8 @@ $("#bill .AccountIdShow").text(data.accountName); //结算账户 } else if(data.accountidlist && data.accountmoneylist) { - var accountArr = data.accountidlist; //账户id列表 - var accountMoneyArr = data.accountmoneylist; //账户金额列表 + var accountArr = data.accountidlist.split(","); //账户id列表 + var accountMoneyArr = data.accountmoneylist.split(","); //账户金额列表 var accountIdShow = ""; for (var j = 0; j < accountArr.length; j++) { if (accountList != null) { diff --git a/erp_web/pages/manage/account.html b/erp_web/pages/manage/account.html index 70549afe..19c867c8 100644 --- a/erp_web/pages/manage/account.html +++ b/erp_web/pages/manage/account.html @@ -131,7 +131,7 @@ title: '是否默认', field: 'isdefault', width: 100, align: "center", formatter: function (value, rec) { if (rec.isdefault) { - return ""; + return ""; } else { return "否"; @@ -569,7 +569,7 @@ //初始化表格数据 function initAccountDetailData(accountId) { $('#accountTableData').datagrid({ - height: heightInfo, + height: 435, nowrap: false, rownumbers: false, //动画效果 diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html index 0d82d6e5..1fff6b15 100644 --- a/erp_web/pages/manage/depot.html +++ b/erp_web/pages/manage/depot.html @@ -180,7 +180,7 @@ title: '是否默认', field: 'isDefault', width: 100, align: "center", formatter: function (value, rec) { if (rec.isDefault) { - return ""; + return ""; } else { return "否"; diff --git a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 330a8c09..fda59f58 100644 --- a/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -422,6 +422,14 @@ public class DepotHeadService { } if (null != list) { for (DepotHeadVo4List dh : list) { + if(dh.getAccountidlist() != null) { + String accountidlistStr = dh.getAccountidlist().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setAccountidlist(accountidlistStr); + } + if(dh.getAccountmoneylist() != null) { + String accountmoneylistStr = dh.getAccountmoneylist().replace("[", "").replace("]", "").replaceAll("\"", ""); + dh.setAccountmoneylist(accountmoneylistStr); + } if(dh.getOthermoneylist() != null) { String otherMoneyListStr = dh.getOthermoneylist().replace("[", "").replace("]", "").replaceAll("\"", ""); dh.setOthermoneylist(otherMoneyListStr);