zhaomin лет назад: 4
Родитель
Сommit
9761da7d1d

Разница между файлами не показана из-за своего большого размера
+ 63 - 14
WebUI/CallCenterWeb.UI/accessManagement/js/generalStatisticsReport.js


+ 109 - 78
WebUI/CallCenterWeb.UI/equipmentOperationManage/template/HandleEquipmentRepair.html

@@ -24,53 +24,57 @@
24 24
 				border-radius: 3px;
25 25
 				cursor: pointer;
26 26
 			}
27
-			
27
+
28 28
 			.crop_left {
29 29
 				width: 40%;
30 30
 				float: left;
31 31
 			}
32
-			
32
+
33 33
 			.crop_right {
34 34
 				width: 30%;
35 35
 				float: right;
36 36
 				margin-right: 25px;
37 37
 			}
38
-			
38
+
39 39
 			.time-box .dates {
40
-				width: 100%!important;
40
+				width: 100% !important;
41 41
 			}
42
-			
42
+
43 43
 			i.tub {
44
-				right: 25px!important;
44
+				right: 25px !important;
45 45
 			}
46
-			
46
+
47 47
 			b.text_require {
48 48
 				color: red;
49 49
 			}
50
-			
50
+
51 51
 			.loader_icon {
52 52
 				display: block;
53 53
 				height: 36px;
54 54
 				width: 36px;
55 55
 				background: url(../../img/upLod.png) no-repeat;
56 56
 			}
57
-			
57
+
58 58
 			.table_extension tr td:last-child {
59 59
 				text-align: right !important;
60 60
 			}
61
-			
61
+
62 62
 			.isusematerial,
63 63
 			.islosematerial {
64 64
 				display: none;
65 65
 			}
66
-			.togetherbox{
66
+
67
+			.togetherbox {
67 68
 				display: none;
68 69
 			}
69
-			.gqbecausewrap{
70
+
71
+			.gqbecausewrap {
70 72
 				display: none;
71 73
 			}
72
-			#inv_name{
73
-				display: block!important;
74
+
75
+			select.bs-select-hidden,
76
+			select.selectpicker {
77
+				display: block !important;
74 78
 			}
75 79
 		</style>
76 80
 	</head>
@@ -93,14 +97,16 @@
93 97
 					</div>
94 98
 				</div>-->
95 99
 				<div class="form-group">
96
-					<label for="woCode" class="col-sm-3 control-label text-right"><b class="text_require">*</b>工单编号</label>
100
+					<label for="woCode" class="col-sm-3 control-label text-right"><b
101
+							class="text_require">*</b>工单编号</label>
97 102
 					<div class="col-sm-9">
98 103
 						<input id="woCode" class="form-control" type="text" autocomplete="off" readonly="readonly" />
99 104
 					</div>
100 105
 				</div>
101 106
 
102 107
 				<div class="form-group hidden">
103
-					<label for="sysname" class="col-sm-3 control-label text-right"><b class="text_require">*</b>系统名称</label>
108
+					<label for="sysname" class="col-sm-3 control-label text-right"><b
109
+							class="text_require">*</b>系统名称</label>
104 110
 					<div class="col-sm-9">
105 111
 						<select class="form-control selectpicker" id="sysname" data-live-search="true">
106 112
 
@@ -108,7 +114,8 @@
108 114
 					</div>
109 115
 				</div>
110 116
 				<div class="form-group hidden">
111
-					<label for="equipname" class="col-sm-3 control-label text-right"><b class="text_require">*</b>设备名称</label>
117
+					<label for="equipname" class="col-sm-3 control-label text-right"><b
118
+							class="text_require">*</b>设备名称</label>
112 119
 					<div class="col-sm-9">
113 120
 						<select class="form-control selectpicker" id="equipname" data-live-search="true">
114 121
 
@@ -116,7 +123,8 @@
116 123
 					</div>
117 124
 				</div>
118 125
 				<div class="form-group">
119
-					<label for="faulttype" class="col-sm-3 control-label text-right"><b class="text_require">*</b>维修类型</label>
126
+					<label for="faulttype" class="col-sm-3 control-label text-right"><b
127
+							class="text_require">*</b>维修类型</label>
120 128
 					<div class="col-sm-9">
121 129
 						<select class="form-control selectpicker" id="faulttype" data-live-search="true">
122 130
 
@@ -124,7 +132,8 @@
124 132
 					</div>
125 133
 				</div>
126 134
 				<div class="form-group">
127
-					<label for="finishtime" class="col-sm-3 control-label text-right"><b class="text_require">*</b>是否使用耗材</label>
135
+					<label for="finishtime" class="col-sm-3 control-label text-right"><b
136
+							class="text_require">*</b>是否使用耗材</label>
128 137
 					<div class="col-sm-9">
129 138
 						<select class="form-control selectpicker" id="isusematerial">
130 139
 							<option value="0">否</option>
@@ -141,7 +150,8 @@
141 150
 								<tr>
142 151
 									<td>配件名称</td>
143 152
 									<td>价格</td>
144
-									<td><button class="btn btn-info addBtn" onclick="addExtension(1)">添加耗材信息</button></td>
153
+									<td><button class="btn btn-info addBtn" onclick="addExtension(1)">添加耗材信息</button>
154
+									</td>
145 155
 								</tr>
146 156
 							</thead>
147 157
 							<tbody>
@@ -162,7 +172,8 @@
162 172
 					</div>
163 173
 				</div>
164 174
 				<div class="form-group hidden">
165
-					<label for="islosematerial" class="col-sm-3 control-label text-right"><b class="text_require">*</b>是否缺少耗材</label>
175
+					<label for="islosematerial" class="col-sm-3 control-label text-right"><b
176
+							class="text_require">*</b>是否缺少耗材</label>
166 177
 					<div class="col-sm-9">
167 178
 						<select class="form-control selectpicker" id="islosematerial">
168 179
 							<option value="0">否</option>
@@ -179,7 +190,8 @@
179 190
 								<tr>
180 191
 									<td>配件名称</td>
181 192
 									<td>价格</td>
182
-									<td><button class="btn btn-info addBtn" onclick="addExtension(2)">添加耗材信息</button></td>
193
+									<td><button class="btn btn-info addBtn" onclick="addExtension(2)">添加耗材信息</button>
194
+									</td>
183 195
 								</tr>
184 196
 							</thead>
185 197
 							<tbody>
@@ -241,14 +253,17 @@
241 253
 				</div>
242 254
 
243 255
 				<div class="form-group">
244
-					<label for="exceptiondes" class="col-sm-3 control-label text-right"><b class="text_require">*</b>异常说明</label>
256
+					<label for="exceptiondes" class="col-sm-3 control-label text-right"><b
257
+							class="text_require">*</b>异常说明</label>
245 258
 					<div class="col-sm-9">
246 259
 						<!--<input id="exceptiondes" class="form-control" type="text" autocomplete="off" />-->
247
-						<textarea id="exceptiondes" class="form-control" name="" rows="" autocomplete="off" cols="" style="resize: none;"></textarea>
260
+						<textarea id="exceptiondes" class="form-control" name="" rows="" autocomplete="off" cols=""
261
+							style="resize: none;"></textarea>
248 262
 					</div>
249 263
 				</div>
250 264
 				<div class="form-group">
251
-					<label for="origins" class="col-sm-3 control-label text-right"><b class="text_require">*</b>来源</label>
265
+					<label for="origins" class="col-sm-3 control-label text-right"><b
266
+							class="text_require">*</b>来源</label>
252 267
 					<div class="col-sm-9">
253 268
 						<select class="form-control selectpicker" id="origins">
254 269
 							<option value=""></option>
@@ -258,7 +273,8 @@
258 273
 					</div>
259 274
 				</div>
260 275
 				<div class="form-group">
261
-					<label for="states" class="col-sm-3 control-label text-right"><b class="text_require">*</b>工单状态</label>
276
+					<label for="states" class="col-sm-3 control-label text-right"><b
277
+							class="text_require">*</b>工单状态</label>
262 278
 					<div class="col-sm-9">
263 279
 						<select class="form-control selectpicker" id="states">
264 280
 							<option value="2">已处理</option>
@@ -267,7 +283,8 @@
267 283
 					</div>
268 284
 				</div>
269 285
 				<div class="form-group gqbecausewrap">
270
-					<label for="gqbecause" class="col-sm-3 control-label text-right"><b class="text_require">*</b>挂起原因</label>
286
+					<label for="gqbecause" class="col-sm-3 control-label text-right"><b
287
+							class="text_require">*</b>挂起原因</label>
271 288
 					<div class="col-sm-9">
272 289
 						<select class="form-control selectpicker" id="gqbecause">
273 290
 							<option value=""></option>
@@ -279,7 +296,8 @@
279 296
 				</div>
280 297
 
281 298
 				<div class="form-group">
282
-					<label for="bzid" class="col-sm-3 control-label text-right"><b class="text_require">*</b>维修项目内容</label>
299
+					<label for="bzid" class="col-sm-3 control-label text-right"><b
300
+							class="text_require">*</b>维修项目内容</label>
283 301
 					<div class="col-sm-9">
284 302
 						<select class="form-control selectpicker" id="bzid" data-live-search="true">
285 303
 							<option value="">请选择维修项目内容</option>
@@ -297,6 +315,7 @@
297 315
 		<script src="../js/equipmentCommon.js"></script>
298 316
 		<script src="../../js/webuploader.min.js"></script>
299 317
 		<script>
318
+			var clicknum = -1
300 319
 			var code = helper.request.queryString("code");
301 320
 			var floorId = helper.request.queryString("floorId");
302 321
 			var serveMan = window.localStorage.getItem('userCode');
@@ -304,7 +323,7 @@
304 323
 				var usercodes = []
305 324
 				togetherCodes(usercodes)
306 325
 				$('#woCode').val(code);
307
-		
326
+
308 327
 				//系统名称
309 328
 				helper.getDropList.getlistDropByDic($('#sysname'), 'XTMC').then(function() {
310 329
 					$('#sysname').trigger('change');
@@ -365,8 +384,7 @@
365 384
 					}
366 385
 
367 386
 				})
368
-				// 耗材
369
-				getequipment()
387
+
370 388
 			})
371 389
 
372 390
 			uploaderImg(0)
@@ -444,7 +462,8 @@
444 462
 						event.stopPropagation();
445 463
 						$(this).parent().remove();
446 464
 						uploader.removeFile(file);
447
-						helper.methods.delImgs($(this).parent().attr("data-filesmallurl"), $(this).parent().attr("data-fileurl"));
465
+						helper.methods.delImgs($(this).parent().attr("data-filesmallurl"), $(this).parent().attr(
466
+							"data-fileurl"));
448 467
 						file_num(cindex)
449 468
 					});
450 469
 				});
@@ -511,9 +530,11 @@
511 530
 			}
512 531
 			//添加自定义字段
513 532
 			function addExtension(num) {
533
+				clicknum++
514 534
 				var str = '<tr>' +
515 535
 					'<td>' +
516
-					'<select class="form-control selectpicker" id="inv_name" data-live-search="true"><option value="">请选择配件名称</option></select>' +
536
+					'<select class="form-control selectpicker" id="inv_name' + clicknum +
537
+					'"   data-live-search="true"><option value="">请选择配件名称</option></select>' +
517 538
 					'</td>' +
518 539
 					'<td>' +
519 540
 					'<input type="text"  class="form-control extenValue" placeholder="请输入配件价格"  autocomplete="off"/>' +
@@ -527,9 +548,37 @@
527 548
 					'</td>' +
528 549
 					'</tr>'
529 550
 				$('#table_extension' + num + ' tbody').append(str);
551
+				$.getScript("../../js/bootstrap-select/js/bootstrap-select.js")
530 552
 				// 耗材
531
-				getequipment()
553
+				getequipment(clicknum)
532 554
 				//				$(ele).remove();
555
+				$("#inv_name"+clicknum).change(function() {
556
+					$("#inv_name"+clicknum).empty();
557
+					$.ajax({
558
+						type: "get",
559
+						url: huayi.config.callcenter_url +
560
+						"equipmentapi/api/worepairbase/gethcinfo", //获取数据的Servlet地址
561
+						async: true,
562
+						dataType: 'json',
563
+						data: {
564
+							inv_name: $("#inv_name"+clicknum).val()
565
+						},
566
+						success: function(data) {
567
+							
568
+							if (data.state.toLowerCase() == 'success') {
569
+				                $('#table_extension' + clicknum + '').find('tbody tr').each(function(g, h) {
570
+				                	
571
+				                	
572
+				                		 $(h).find('.extenValue').val(data.data[0].price);
573
+				                	
574
+				                	
575
+				                })
576
+							}
577
+						}
578
+					});
579
+				
580
+					$("#inv_name").trigger('change');
581
+				})
533 582
 			}
534 583
 			//自定义字段 删除一行
535 584
 			function delExtension(ele, num) {
@@ -540,11 +589,12 @@
540 589
 			function getExtenArr(num) {
541 590
 				var extenArr = [];
542 591
 				$('#table_extension' + num + '').find('tbody tr').each(function(g, h) {
592
+					console.log(g, h)
543 593
 					if ($.trim($(h).find('.extenValue').val()) !== '' && $.trim($(h).find('.extenValue').val()) !== '') {
544 594
 						var objs = {
545
-							'name': $(h).find('#inv_name').val(),
595
+							'name': $(h).find('#inv_name' + g).val(),
546 596
 							'describe': $(h).find('.extenValue').val(),
547
-							'inv_name': $(h).find('.priceValue').val()
597
+							'inv_num': $(h).find('.priceValue').val()
548 598
 						};
549 599
 						extenArr.push(objs);
550 600
 					}
@@ -614,7 +664,7 @@
614 664
 					});
615 665
 					return;
616 666
 				}
617
-				if ($("#gqbecause").val() == '' && $('.gqbecausewrap').css('display')=='block') {
667
+				if ($("#gqbecause").val() == '' && $('.gqbecausewrap').css('display') == 'block') {
618 668
 					layer.confirm('请选择挂起原因!', {
619 669
 						icon: 2,
620 670
 						btn: ['确定'] //按钮
@@ -628,10 +678,10 @@
628 678
 					});
629 679
 					return;
630 680
 				}
631
-				
632
-			
633
-			
634
-			// 提交
681
+
682
+
683
+
684
+				// 提交
635 685
 				$.ajax({
636 686
 					type: "post",
637 687
 					url: huayi.config.callcenter_url + "equipmentapi/api/worepairbase/deal",
@@ -666,8 +716,8 @@
666 716
 					}
667 717
 				});
668 718
 			}
669
-	// 获取设备
670
-          function getequipment() {
719
+			// 获取设备
720
+			function getequipment(num) {
671 721
 				// $("#equipname").html('');
672 722
 				equipmentdata = []
673 723
 				// $("#equipname").append('<option selected="selected" value="">请选择设备</option>');
@@ -676,59 +726,39 @@
676 726
 					url: huayi.config.callcenter_url + "equipmentapi/api/worepairbase/gethcinfo", //获取数据的Servlet地址
677 727
 					async: true,
678 728
 					dataType: 'json',
679
-					data: {
680
-					},
729
+					data: {},
681 730
 					success: function(data) {
682 731
 
683 732
 						var equipmentdata = []
684 733
 						if (data.state.toLowerCase() == 'success') {
685
-	  equipmentdata = data.data
686
-							console.log(equipmentdata.length,equipmentdata)
734
+							equipmentdata = data.data
687 735
 							if (equipmentdata.length > 0) {
688 736
 
689 737
 								for (var k = 0; k < equipmentdata.length; k++) {
690 738
 									$(equipmentdata[k]).each(function(q, p) {
691
-									 console.log(p)
692
-									
693
-										$("<option value='" + p.inv_name + "'>" + p.inv_name + "</option>").appendTo("#inv_name");
739
+										$("<option value='" + p.inv_name + "'>" + p.inv_name + "</option>")
740
+											.appendTo("#inv_name" + num);
694 741
 										$("#inv_name").selectpicker('refresh');
695
-									    $('#inv_name').selectpicker('render');
696
-												
742
+										$('#inv_name').selectpicker('render');
743
+
697 744
 										// console.log(p.equipment_name)
698 745
 									});
699 746
 								}
700 747
 
701 748
 							} else {
702 749
 								// $("#inv_name").empty();
703
-								$("#inv_name").selectpicker('refresh');
704
-								 $('#inv_name').selectpicker('render');
750
+								$("#inv_name" + num).selectpicker('refresh');
751
+								$('#inv_name' + num).selectpicker('render');
705 752
 							}
706 753
 						}
707 754
 					}
708 755
 				});
709 756
 			}
710
-			$("#inv_name").change(function() {
711
-				$("#inv_name").empty();
712
-				$.ajax({
713
-					type: "get",
714
-					url: huayi.config.callcenter_url + "equipmentapi/api/worepairbase/gethcinfo", //获取数据的Servlet地址
715
-					async: true,
716
-					dataType: 'json',
717
-					data: {
718
-						inv_name:$("#inv_name").val()
719
-					},
720
-					success: function(data) {
721
-				
722
-						var equipmentdata = []
723
-						if (data.state.toLowerCase() == 'success') {
724
-				
725
-								   $(".extenValue")=data.data[0].price
726
-						}
727
-					}
728
-				});
729
-		
730
-				$("#inv_name").trigger('change');
731
-			})
757
+			
758
+			
759
+			
760
+			
761
+
732 762
 			function forFloorGetEquipName(obj, fids, sysid) {
733 763
 				$.getJSON(huayi.config.callcenter_url + "equipmentapi/api/Equipment/getrepairlistdrop", {
734 764
 					floorid: fids,
@@ -758,10 +788,11 @@
758 788
 				$.getJSON(huayi.config.callcenter_url + "equipmentapi/api/WoRepairBase/getwxwptimesbybz", function(data) {
759 789
 					if (data.state.toLowerCase() == "success") {
760 790
 						var province = data.data;
761
-                           console.log(province)
791
+						console.log(province)
762 792
 						for (var i = 0; i < province.length; i++) {
763 793
 							console.log(province[i].wxcenter)
764
-							$("<option value='" + province[i].id + "'>" + province[i].wxcenter + "</option>").appendTo("#bzid");
794
+							$("<option value='" + province[i].id + "'>" + province[i].wxcenter + "</option>").appendTo(
795
+								"#bzid");
765 796
 							$('#bzid').selectpicker('refresh');
766 797
 							$('#bzid').selectpicker('render');
767 798
 						}