Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java =================================================================== diff -u -r13846 -r13935 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 13846) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/InvoicePlanAction.java (.../InvoicePlanAction.java) (revision 13935) @@ -548,12 +548,16 @@ public void loadDepartApplicationInfo() { List list = invoicePlanManager .getInvoicePlanByOrgUnitCoding(orgUnitCoding); - String remark = ""; + StringBuilder sb = new StringBuilder(); + String separator = "\r\n"; for (InvoicePlan invoicePlan : list) { if (invoicePlan instanceof RecyclingApplication) { RecyclingApplication appcalition = (RecyclingApplication) invoicePlan; if (StringUtils.isNotBlank(appcalition.getRemark())) { - remark += (appcalition.getRemark() + " ; "); + if(sb.length() > 0){ + sb.append(separator); + } + sb.append(appcalition.getRemark()); } } } @@ -562,7 +566,7 @@ config.setJsonPropertyFilter(propertyFilter); Map map = new HashMap(); map.put("success", true); - map.put("remark", remark); + map.put("remark", sb.toString()); JSONObject jsonObject = JSONObject.fromObject(map, config); try { StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r13932 -r13935 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 13932) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 13935) @@ -933,7 +933,7 @@ columnWidth : 1, labelWidth :70, items : [{ - xtype : 'textfield', + xtype : 'textarea', fieldLabel : '备注', id : 'remark2', name : 'remark',