Преглед на файлове

工单试剂 工单仪器修改bug

zhangshuangnan преди 7 години
родител
ревизия
2b8c4ea4d1

+ 51 - 29
CallCenterWeb.UI/ReportForm/orderTypeInstrument.html

124
 								var linename = res.linename;
124
 								var linename = res.linename;
125
 								var linecount = res.linecount;
125
 								var linecount = res.linecount;
126
 								var lineSeName = res.lineSeName;
126
 								var lineSeName = res.lineSeName;
127
+								var lineSeNameField = res.lineSeName2;
127
 								if(linename && linecount && lineSeName) {
128
 								if(linename && linecount && lineSeName) {
128
 									var headLn = linename.length;
129
 									var headLn = linename.length;
129
 									var newArr1 = [];
130
 									var newArr1 = [];
139
 										width: 150,
140
 										width: 150,
140
 									});
141
 									});
141
 
142
 
142
-									for(var i = 1; i < headLn - 1; i++) {
143
-										//colspan即横跨的单元格数,这种情况下不用设置field和width
144
-										if(linecount[i] > 1) {
145
-											newArr1.push({
146
-												title: linename[i],
147
-												colspan: linecount[i],
143
+//									for(var i = 1; i < headLn - 1; i++) {
144
+//										//colspan即横跨的单元格数,这种情况下不用设置field和width
145
+//										if(linecount[i] > 1) {
146
+//											newArr1.push({
147
+//												title: linename[i],
148
+//												colspan: linecount[i],
149
+//												align: 'center',
150
+//											});
151
+//											var j = 0;
152
+//											while(j < linecount[i]) {
153
+//												newArr2.push({
154
+//													field: lineSeName[j + i + k],
155
+//													title: lineSeName[j + i + k],
156
+//													align: 'center',
157
+//												});
158
+//												var newL = j + i + k + 1;
159
+//												j++;
160
+//											}
161
+//
162
+//										} else {
163
+//											if(lineSeName[newL]) {
164
+//												newArr1.push({
165
+//													field: lineSeName[newL],
166
+//													title: linename[i] + "(" + lineSeName[newL] + ")",
167
+//													align: 'center',
168
+//													rowspan: 2,
169
+//												});
170
+//											}
171
+//											k++;
172
+//										}
173
+//
174
+//									}
175
+//第一行
176
+									for( var i=1;i<linename.length-1;i++){
177
+									 	newArr1.push({
178
+											title: linename[i],
179
+											colspan: linecount[i],
180
+											align: 'center',
181
+										});
182
+									 }
183
+									//第二行
184
+									$(lineSeName).each(function(i,n){
185
+										if(i>=1&&i<lineSeName.length-1){
186
+											if(n.indexOf('_')!=-1){
187
+													n=n.split('_')[0]
188
+												}
189
+											newArr2.push({
190
+												field: lineSeNameField[i],
191
+												title: n,
148
 												align: 'center',
192
 												align: 'center',
149
 											});
193
 											});
150
-											var j = 0;
151
-											while(j < linecount[i]) {
152
-												newArr2.push({
153
-													field: lineSeName[j + i + k],
154
-													title: lineSeName[j + i + k],
155
-													align: 'center',
156
-												});
157
-												var newL = j + i + k + 1;
158
-												j++;
159
-											}
160
-
161
-										} else {
162
-											if(lineSeName[newL]) {
163
-												newArr1.push({
164
-													field: lineSeName[newL],
165
-													title: linename[i] + "(" + lineSeName[newL] + ")",
166
-													align: 'center',
167
-													rowspan: 2,
168
-												});
169
-											}
170
-											k++;
171
 										}
194
 										}
172
-
173
-									}
195
+									})
174
 									newArr1.push({
196
 									newArr1.push({
175
 										field: '总计',
197
 										field: '总计',
176
 										title: '总计',
198
 										title: '总计',

+ 2 - 1
CallCenterWeb.UI/ReportForm/orderTypeReagents.html

123
 								var linename = res.linename;//第一行
123
 								var linename = res.linename;//第一行
124
 								var linecount = res.linecount;//合并数
124
 								var linecount = res.linecount;//合并数
125
 								var lineSeName = res.lineSeName;//第二行
125
 								var lineSeName = res.lineSeName;//第二行
126
+								var lineSeNameField = res.lineSeName2;//字段名
126
 								if(linename && linecount && lineSeName) {
127
 								if(linename && linecount && lineSeName) {
127
 									var headLn = linename.length;
128
 									var headLn = linename.length;
128
 									var newArr1 = [];
129
 									var newArr1 = [];
188
 													n=n.split('_')[0]
189
 													n=n.split('_')[0]
189
 												}
190
 												}
190
 											newArr2.push({
191
 											newArr2.push({
191
-												field: n,
192
+												field: lineSeNameField[i],
192
 												title: n,
193
 												title: n,
193
 												align: 'center',
194
 												align: 'center',
194
 											});
195
 											});

+ 3 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

19
         table th {
19
         table th {
20
             min-width:100px;
20
             min-width:100px;
21
         }*/
21
         }*/
22
+       ul li{
23
+       	float: initial;
24
+       }
22
 			
25
 			
23
 			.time-box {
26
 			.time-box {
24
 				display: inline-block;
27
 				display: inline-block;