产品分布情况表

CallCenterWeb.UI/ReportForm/complaintProductDateSheet.html

@@ -215,8 +215,7 @@
 								//工厂投诉比，各质量问题占比，结构占比
 								var factoryLen = content.factory.length;
 								var cyclesNum = content.problem.length + content.product.length;
-								var factoryLenHalfCeil = Math.ceil(factoryLen / 2) ;
-								for (var i=0,num=0,p=0; num < cyclesNum; i+=2, num++){
+								for (var i=0,num=0,p=0,k=1; num < cyclesNum; i+=2, num++, k+=2){
 									if (i === 0) {
 										$(".table").append('<tr>'+
 										'<td rowspan="'+ cyclesNum + '">工厂投诉占比</td>'+
@@ -231,7 +230,7 @@
 										'<td>' + content.problem[num].number + '</td>'+
 										'<td>' + content.problem[num].proportion + '</td>'+
 										'</tr>')
-									} else if (i > 0 && i < factoryLen) {
+									} else if (i > 0 && k < factoryLen) {
 										if (num < content.problem.length){
 											$(".table").append('<tr>'+
 											'<td>' + content.factory[i].name +'</td>'+
@@ -273,7 +272,49 @@
 											}
 											p += 1;
 										}
-									} else if ( i >= factoryLen) {
+									} else if (k == factoryLen) {
+										if (num < content.problem.length){
+											$(".table").append('<tr>'+
+											'<td>' + content.factory[i].name +'</td>'+
+											'<td>' + content.factory[i].number +'</td>'+
+											'<td>' + content.factory[i].proportion +'</td>'+
+											'<td></td>'+
+											'<td></td>'+
+											'<td></td>'+
+											'<td colspan="2">' + content.problem[num].name + '</td>'+
+											'<td>' + content.problem[num].number + '</td>'+
+											'<td>' + content.problem[num].proportion + '</td>'+
+											'</tr>')
+										} else if (num >= content.problem.length) {
+											if(p === 0){
+												$(".table").append('<tr>'+
+												'<td>' + content.factory[i].name +'</td>'+
+												'<td>' + content.factory[i].number +'</td>'+
+												'<td>' + content.factory[i].proportion +'</td>'+
+												'<td></td>'+
+												'<td></td>'+
+												'<td></td>'+
+												'<td rowspan="'+ content.product.length + '">结构占比</td>'+
+												'<td colspan="2">' + content.product[p].name + '</td>'+
+												'<td>' + content.product[p].number + '</td>'+
+												'<td>' + content.product[p].proportion + '</td>'+
+												'</tr>')
+											} else if (0 < p && p < content.product.length) {
+												$(".table").append('<tr>'+
+												'<td>' + content.factory[i].name +'</td>'+
+												'<td>' + content.factory[i].number +'</td>'+
+												'<td>' + content.factory[i].proportion +'</td>'+
+												'<td></td>'+
+												'<td></td>'+
+												'<td></td>'+
+												'<td colspan="2">' + content.product[p].name + '</td>'+
+												'<td>' + content.product[p].number + '</td>'+
+												'<td>' + content.product[p].proportion + '</td>'+
+												'</tr>')
+											}
+											p += 1;
+										}
+									} else if ( k > factoryLen) {
 										if (num < content.problem.length){
 											$(".table").append('<tr>'+
 											'<td></td>'+