Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js =================================================================== diff -u -r32200 -r33385 --- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 32200) +++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js (.../printRecyclingDetailWin.js) (revision 33385) @@ -1201,8 +1201,8 @@ if(tableData && Object.keys(tableData).length > 0){ htmlTable += ""; htmlTable += ''; - if(table.departGroupsConfig.showDepartGroupColumn == true){ - htmlTable += ''; + if(table.recyclingDepartGroupsConfig.showRecyclingDepartGroupColumn == true){ + htmlTable += ''; } htmlTable += ''; for(var j=0;j 0;j++){ @@ -1219,7 +1219,7 @@ var k = 0; for(var childItem in tableData[item]){ htmlTable += ''; - if(k == 0 && table.departGroupsConfig.showDepartGroupColumn == true){ + if(k == 0 && table.recyclingDepartGroupsConfig.showRecyclingDepartGroupColumn == true){ htmlTable += ''; } htmlTable += ''; @@ -1243,7 +1243,7 @@ } } htmlTable += ''; - if(table.departGroupsConfig.showDepartGroupColumn == true){ + if(table.recyclingDepartGroupsConfig.showRecyclingDepartGroupColumn == true){ htmlTable += ''; }else { htmlTable += ''; @@ -1275,7 +1275,7 @@ var k = 0; for(var childItem in tableData[item]){ htmlTable += ''; - if(k == 0 && table.showDepartGroupColumn == true){ + if(k == 0 && table.showRecyclingDepartGroupColumn == true){ htmlTable += ''; } htmlTable += '"; - if(table.showDepartGroupColumn == true){ + if(table.showRecyclingDepartGroupColumn == true){ htmlTable += ""; } htmlTable += "";
'+table.departGroupsConfig.columnName+''+table.recyclingDepartGroupsConfig.columnName+''+table.departConfig.columnName+'
'+item+''+childItem+'
合计:合计:
'+item+''+childItem+':'; @@ -1345,7 +1345,7 @@ } } htmlTable += "
"+item+"科室