工单试剂 工单仪器修改bug

CallCenterWeb.UI/ReportForm/orderTypeInstrument.html

@@ -124,6 +124,7 @@
 								var linename = res.linename;
 								var linecount = res.linecount;
 								var lineSeName = res.lineSeName;
+								var lineSeNameField = res.lineSeName2;
 								if(linename && linecount && lineSeName) {
 									var headLn = linename.length;
 									var newArr1 = [];
@@ -139,38 +140,59 @@
 										width: 150,
 									});
 
-									for(var i = 1; i < headLn - 1; i++) {
-										//colspan即横跨的单元格数，这种情况下不用设置field和width
-										if(linecount[i] > 1) {
-											newArr1.push({
-												title: linename[i],
-												colspan: linecount[i],
+//									for(var i = 1; i < headLn - 1; i++) {
+//										//colspan即横跨的单元格数，这种情况下不用设置field和width
+//										if(linecount[i] > 1) {
+//											newArr1.push({
+//												title: linename[i],
+//												colspan: linecount[i],
+//												align: 'center',
+//											});
+//											var j = 0;
+//											while(j < linecount[i]) {
+//												newArr2.push({
+//													field: lineSeName[j + i + k],
+//													title: lineSeName[j + i + k],
+//													align: 'center',
+//												});
+//												var newL = j + i + k + 1;
+//												j++;
+//											}
+//
+//										} else {
+//											if(lineSeName[newL]) {
+//												newArr1.push({
+//													field: lineSeName[newL],
+//													title: linename[i] + "（" + lineSeName[newL] + "）",
+//													align: 'center',
+//													rowspan: 2,
+//												});
+//											}
+//											k++;
+//										}
+//
+//									}
+//第一行
+									for( var i=1;i<linename.length-1;i++){
+									 	newArr1.push({
+											title: linename[i],
+											colspan: linecount[i],
+											align: 'center',
+										});
+									 }
+									//第二行
+									$(lineSeName).each(function(i,n){
+										if(i>=1&&i<lineSeName.length-1){
+											if(n.indexOf('_')!=-1){
+													n=n.split('_')[0]
+												}
+											newArr2.push({
+												field: lineSeNameField[i],
+												title: n,
 												align: 'center',
 											});
-											var j = 0;
-											while(j < linecount[i]) {
-												newArr2.push({
-													field: lineSeName[j + i + k],
-													title: lineSeName[j + i + k],
-													align: 'center',
-												});
-												var newL = j + i + k + 1;
-												j++;
-											}
-
-										} else {
-											if(lineSeName[newL]) {
-												newArr1.push({
-													field: lineSeName[newL],
-													title: linename[i] + "（" + lineSeName[newL] + "）",
-													align: 'center',
-													rowspan: 2,
-												});
-											}
-											k++;
 										}
-
-									}
+									})
 									newArr1.push({
 										field: '总计',
 										title: '总计',

CallCenterWeb.UI/ReportForm/orderTypeReagents.html

@@ -123,6 +123,7 @@
 								var linename = res.linename;//第一行
 								var linecount = res.linecount;//合并数
 								var lineSeName = res.lineSeName;//第二行
+								var lineSeNameField = res.lineSeName2;//字段名
 								if(linename && linecount && lineSeName) {
 									var headLn = linename.length;
 									var newArr1 = [];
@@ -188,7 +189,7 @@
 													n=n.split('_')[0]
 												}
 											newArr2.push({
-												field: n,
+												field: lineSeNameField[i],
 												title: n,
 												align: 'center',
 											});

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -19,6 +19,9 @@
         table th {
             min-width:100px;
         }*/
+       ul li{
+       	float: initial;
+       }
 			
 			.time-box {
 				display: inline-block;