Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js =================================================================== diff -u -r35692 -r35700 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 35692) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 35700) @@ -49,13 +49,13 @@ if (columnName.indexOf('总价') >= 0) { headerArr[department][columnName] = data[i].money if (columnName.indexOf('一次性物品') >= 0) { - headerArr[department]['一次性物品总价_总价'] += (data[i].money || 0) + headerArr[department]['一次性物品总价_总价'] = (headerArr[department]['一次性物品总价_总价'] || 0) + (data[i].money || 0) } headerArr[department]['价格合计'] += data[i].money } else if (columnName.indexOf('数量') >= 0 && columnName.indexOf('包内材料') == -1) { headerArr[department][columnName] = data[i].amount if (columnName.indexOf('一次性物品') >= 0) { - headerArr[department]['一次性物品数量_总数'] += (data[i].amount || 0) + headerArr[department]['一次性物品数量_总数'] = (headerArr[department]['一次性物品数量_总数'] || 0) + (data[i].amount || 0) } headerArr[department]['数量合计'] += data[i].amount } else if (columnName.indexOf('包内材料') >= 0) { @@ -67,6 +67,7 @@ } } } + console.log(headerArr) for (var i = 0; i < headerTitle.length; i++) { if (headerTitle[i].name == '院区') { tableWidth += 200; @@ -136,6 +137,7 @@ } tableHtml += ""; tableHtml += ""; + console.log(data) var hasHospitalDistrictName = []; for (var item in headerArr) { tableHtml += "";