Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js =================================================================== diff -u -r35687 -r35692 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 35687) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js (.../departmentMonthlyView.js) (revision 35692) @@ -16,6 +16,7 @@ var headerArr = {}; var headerTitle = titleInfoArr; var thirdChildren = []; + var tableWidth = 0; if (data.length > 0) { for (var i = 0; i < data.length; i++) { var department = data[i].department; @@ -66,20 +67,38 @@ } } } + for (var i = 0; i < headerTitle.length; i++) { + if (headerTitle[i].name == '院区') { + tableWidth += 200; + } else if (headerTitle[i].name == '部门') { + tableWidth += 300; + } else { + if (headerTitle[i].children) { + tableWidth += (100 * headerTitle[i].children.length) + } else { + tableWidth += 100; + } + } + } var tableHtml = ''; - var tableWidth = 'auto' tableHtml += ""; tableHtml += ""; tableHtml += ""; for (var i = 0; i < headerTitle.length; i++) { + var width = 100; + if (headerTitle[i].name == '院区') { + width = 200; + } else if (headerTitle[i].name == '部门') { + width = 300; + } if (headerTitle[i].rowspan && !headerTitle[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else if (!headerTitle[i].rowspan && headerTitle[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else if (headerTitle[i].rowspan && headerTitle[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else { - tableHtml += ""; + tableHtml += ""; } } tableHtml += ""; @@ -90,13 +109,13 @@ for (var i = 0; i < headerColumn.length; i++) { if (headerColumn[i].name !== '价格合计' && headerColumn[i].name !== '数量合计' && headerColumn[i].name !== '科室记支合计' && headerColumn[i].name !== '包内材料数量合计' && headerColumn[i].displayName.indexOf('可收费') == -1) { if (headerColumn[i].rowspan && !headerColumn[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else if (!headerColumn[i].rowspan && headerColumn[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else if (headerColumn[i].rowspan && headerColumn[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else { - tableHtml += ""; + tableHtml += ""; } } } @@ -106,13 +125,13 @@ if (thirdChildren.length > 0) { tableHtml += ""; for (var z = 0; z < thirdChildren.length; z++) { - tableHtml += ""; + tableHtml += ""; } - tableHtml += ""; + tableHtml += ""; for (var z = 0; z < thirdChildren.length; z++) { - tableHtml += ""; + tableHtml += ""; } - tableHtml += ""; + tableHtml += ""; tableHtml += ""; } tableHtml += ""; @@ -193,19 +212,38 @@ } } var tableHtml = ''; - var tableWidth = 'auto' + var tableWidth = 0; + for (var i = 0; i < headerTitle.length; i++) { + if (headerTitle[i].name == '院区') { + tableWidth += 200; + } else if (headerTitle[i].name == '部门') { + tableWidth += 300; + } else { + if (headerTitle[i].children) { + tableWidth += (100 * headerTitle[i].children.length) + } else { + tableWidth += 100; + } + } + } tableHtml += "
" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "
" + headerColumn[i].name + "" + headerColumn[i].name + "" + headerColumn[i].name + "" + headerColumn[i].name + "" + headerColumn[i].name + "" + headerColumn[i].name + "" + headerColumn[i].name + "" + headerColumn[i].name + "
" + thirdChildren[z] + "" + thirdChildren[z] + "总价总价" + thirdChildren[z] + "" + thirdChildren[z] + "总数量总数量
"; tableHtml += ""; tableHtml += ""; for (var i = 0; i < headerTitle.length; i++) { + var width = 100; + if (headerTitle[i].name == '院区') { + width = 200; + } else if (headerTitle[i].name == '部门') { + width = 300; + } if (headerTitle[i].rowspan && !headerTitle[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else if (!headerTitle[i].rowspan && headerTitle[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else if (headerTitle[i].rowspan && headerTitle[i].colspan) { - tableHtml += ""; + tableHtml += ""; } else { - tableHtml += ""; + tableHtml += ""; } } tableHtml += "";
" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "" + headerTitle[i].displayName + "