liuyifan %!s(int64=6) %!d(string=před) roky
rodič
revize
e2be58ec8b

+ 5 - 3
CallCenterWeb.UI/ReportForm/callTotalStatisticsDayDetail.html

84
 						}, //如果无需自定义数据响应名称,可不加该参数
84
 						}, //如果无需自定义数据响应名称,可不加该参数
85
 						cols: [
85
 						cols: [
86
 							[{
86
 							[{
87
+									field: '坐席',
88
+									title: '坐席',
89
+									align: 'center',
90
+									width: '',
91
+								},{
87
 									field: '呼损次数',
92
 									field: '呼损次数',
88
 									title: '呼损次数',
93
 									title: '呼损次数',
89
 									align: 'center',
94
 									align: 'center',
90
-									fixed: true,
91
-									sort: true,
92
-									width: 150,
93
 								}, {
95
 								}, {
94
 									field: '呼损率',
96
 									field: '呼损率',
95
 									title: '呼损率',
97
 									title: '呼损率',

+ 2 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderDealWith.html

99
 	                    </td>
99
 	                    </td>
100
 					</tr>
100
 					</tr>
101
 					<tr class="upfile-wrapper">
101
 					<tr class="upfile-wrapper">
102
-						<th>上传附件:</th>
102
+						<th>上传图片:</th>
103
                         <td>
103
                         <td>
104
                         	<div class="form-group">
104
                         	<div class="form-group">
105
                         		<span class="upfile-text"></span>
105
                         		<span class="upfile-text"></span>
106
-								<input id="btndr" type="button" class="btns" value="上传" />
106
+								<input id="btndr" type="button" class="btns" value="上传图片" />
107
 								<input type="file" name="upFile" id="upFile" style="display: none;">
107
 								<input type="file" name="upFile" id="upFile" style="display: none;">
108
 							</div>
108
 							</div>
109
                         </td>
109
                         </td>

+ 3 - 2
CallCenterWeb.UI/WorkOrder/WorkOrderSpotCheck.html

379
 				// 导出
379
 				// 导出
380
 				$('.export').click(function() {
380
 				$('.export').click(function() {
381
 					var state = $("#searchState").val(); //处理进度
381
 					var state = $("#searchState").val(); //处理进度
382
-					isdc = 3
383
-					dcexcel(state,isdc);
382
+					var isdc = 2;
383
+					var CJ = 1
384
+					dcexcel(state, isdc, CJ);
384
 				});
385
 				});
385
 			})
386
 			})
386
 			
387
 			

+ 2 - 2
CallCenterWeb.UI/callScreen/call.js

1346
                 Clean();
1346
                 Clean();
1347
                 //window.location.reload()
1347
                 //window.location.reload()
1348
                 $('.customerSubmit').attr("disabled", false);
1348
                 $('.customerSubmit').attr("disabled", false);
1349
-	            $('.customerSubmit').text('保存');
1349
+	            $('.customerSubmit').text('新建');
1350
             } else {
1350
             } else {
1351
             	$('.customerSubmit').attr("disabled", false);
1351
             	$('.customerSubmit').attr("disabled", false);
1352
-	            $('.customerSubmit').text('保存');
1352
+	            $('.customerSubmit').text('新建');
1353
             }
1353
             }
1354
         }
1354
         }
1355
     });
1355
     });

+ 1 - 1
CallCenterWeb.UI/callScreen/callScreen.html

892
                                             </tr>
892
                                             </tr>
893
                                             <tr>
893
                                             <tr>
894
                                                 <td colspan="8" style="text-align: center;">
894
                                                 <td colspan="8" style="text-align: center;">
895
-                                                    <button class="btns customerSubmit">保&nbsp;存</button>
895
+                                                    <button class="btns customerSubmit">新&nbsp;建</button>
896
                                                     <button class="btns customerSubmitRepeat" style="display: none;">提&nbsp;交</button>
896
                                                     <button class="btns customerSubmitRepeat" style="display: none;">提&nbsp;交</button>
897
                                                 </td>
897
                                                 </td>
898
                                             </tr>
898
                                             </tr>

+ 28 - 52
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

266
 				$("#detailDealResult").text(data.F_DealResult); //落实情况
266
 				$("#detailDealResult").text(data.F_DealResult); //落实情况
267
 				$("#detailDealUser").text(data.F_DealUser);
267
 				$("#detailDealUser").text(data.F_DealUser);
268
 				$("#detailDealTime").text(data.F_DealTime);
268
 				$("#detailDealTime").text(data.F_DealTime);
269
+				$("#detailReduction").text(workOrderDetailsReductionJudge(data)) //是否减免
269
 			}
270
 			}
270
 		}
271
 		}
271
 	})
272
 	})
332
 						debugger;
333
 						debugger;
333
 						var fileType = n.F_Type;
334
 						var fileType = n.F_Type;
334
 						var fileType1 = n.F_Type.split("\/")[0];
335
 						var fileType1 = n.F_Type.split("\/")[0];
335
-						if (fileType === '.jpg'||fileType === '.png'||fileType1==='image') {
336
+						if (fileType === '.jpg'||fileType === '.png'|| fileType1==='image') {
336
 							$('<div class="img-box">' +
337
 							$('<div class="img-box">' +
337
-								'<span class="img_mask"><span onclick=downloadFile("'+ n.F_Url + '","' + n.F_Name + '","' + n.F_Type +
338
-								'") title="点击下载"><i class="fa fa-download" aria-hidden="true"></i></span></span>' +
339
 								'<img layer-src="' + n.F_Url + '" src="' + n.F_Url + '" alt="' + n.F_Name +
338
 								'<img layer-src="' + n.F_Url + '" src="' + n.F_Url + '" alt="' + n.F_Name +
340
 								'" class="image-item" /><div>').appendTo("#fileList");
339
 								'" class="image-item" /><div>').appendTo("#fileList");
341
 						} else {
340
 						} else {
342
 							$('<div class="img-box">' +
341
 							$('<div class="img-box">' +
343
-								'<span class="img_mask"><span href="javascript:;" onclick=downloadFile("' +  n.F_Url + '","' + n.F_Name +
344
-								'","' + n.F_Type +
345
-								'") title="点击下载"><i class="fa fa-download" aria-hidden="true"></i></span></span>' +
346
-								'<span class="img_filename">'+n.F_OriName + n.F_Name.split(".")[1] + '</span><div>').appendTo("#fileList");
342
+								'<span class="img_filename">'+n.F_Name + n.F_Name.split(".")[1] + '</span><div>').appendTo("#fileList");
347
 						}
343
 						}
348
 					});
344
 					});
349
-					layer.photos({
350
-						photos: '#fileList',
351
-						anim: 5, //0-6的选择,指定弹出图片动画类型,默认随机(请注意,3.0之前的版本用shift参数)
352
-						title: '查看图片',
353
-						move: '.layui-layer-title',
354
-						shadeClose: false,
355
-						closeBtn: 1,
356
-						area: ['80%', '90%'],
357
-						tab: function(pic, layero) {
358
-							$('.layui-layer-content').on("mousewheel", function(e, d) {
359
-								
360
-								helper.methods.zoomImg($('#layui-layer-photos').find('img[alt="' + pic.alt + '"]'), d);
361
-								$('#layui-layer-photos').find('img[alt="' + pic.alt + '"]').dragging({
362
-									move: "both", //拖动方向,x y both
363
-									randomPosition: false //初始位置是否随机
364
-								});
365
-								return false;
366
-								
367
-							});
368
-							helper.methods.initLayerPhotos('#layui-layer-photos', pic, layero);
369
-						},
370
-					});
371
 				}
345
 				}
372
 				
346
 				
373
 			}
347
 			}
375
 	});
349
 	});
376
 }
350
 }
377
 
351
 
378
-//下载
379
-function downloadFile(data, strFileName, strMimeType) {
380
-	event.preventDefault();
381
-	//详细见文档 http://danml.com/download.html
382
-	var x = new XMLHttpRequest();
383
-	x.open("GET", data, true);
384
-	x.responseType = 'blob';
385
-	x.onload = function(e) {
386
-		download(x.response, strFileName, strMimeType);
387
-	}
388
-	x.send();
389
-}
390
-
391
 // 工单详情中判断工单来源的值
352
 // 工单详情中判断工单来源的值
392
 function workOrderDetailsSourceJudge (data) {
353
 function workOrderDetailsSourceJudge (data) {
393
 	if (data.F_Source === 1) {
354
 	if (data.F_Source === 1) {
438
 }
399
 }
439
 
400
 
440
 // 工单详情中重复工单返回值判断
401
 // 工单详情中重复工单返回值判断
441
-function workOrderDetailsDuplicateJudge (data) {
442
-	if (data.F_Duplicate === 0) {
443
-		return '未重复';
444
-	} else if (data.F_Duplicate === 1) {
445
-		return '重复';
402
+//function workOrderDetailsDuplicateJudge (data) {
403
+//	if (data.F_Duplicate === 0) {
404
+//		return '未重复';
405
+//	} else if (data.F_Duplicate === 1) {
406
+//		return '重复';
407
+//	} else {
408
+//		return '';
409
+//	}
410
+//}
411
+
412
+// 工单详情减免返回值
413
+function workOrderDetailsReductionJudge (data) {
414
+	if (data.F_IsReduction === 0) {
415
+		return '未减免';
416
+	} else if (data.F_IsReduction === 1) {
417
+		return '已减免';
446
 	} else {
418
 	} else {
447
 		return '';
419
 		return '';
448
 	}
420
 	}
735
 		type: 2,
707
 		type: 2,
736
 		title: '处理工单',
708
 		title: '处理工单',
737
 		maxmin: true, //开启最大化最小化按钮
709
 		maxmin: true, //开启最大化最小化按钮
738
-		area: ['35%', '45%'],
710
+		area: ['35%', '50%'],
739
 		content: "../WorkOrder/WorkOrderDealWith.html?id=" + id
711
 		content: "../WorkOrder/WorkOrderDealWith.html?id=" + id
740
 	});
712
 	});
741
 }
713
 }
972
 }
944
 }
973
 
945
 
974
 // 导出
946
 // 导出
975
-function dcexcel(state, isdc) {
947
+function dcexcel(state, isdc, CJ) {
976
 	if (isdc === 3) {
948
 	if (isdc === 3) {
977
-		console.log("1231231231")
978
 		var isdc = 3;
949
 		var isdc = 3;
979
 	} else {
950
 	} else {
980
-		console.log("12312312132")
981
 		var isdc = 2;
951
 		var isdc = 2;
982
 	}
952
 	}
953
+	if (CJ === 1) {
954
+		var CJ = 1;
955
+	} else {
956
+		var CJ = "";
957
+	}
958
+	
983
 	var token = $.cookie("token");
959
 	var token = $.cookie("token");
984
 	var code = $("#searchCode").val(); //工单编号
960
 	var code = $("#searchCode").val(); //工单编号
985
 	var area = $("#searchArea").val(); //大区
961
 	var area = $("#searchArea").val(); //大区
1000
 	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime
976
 	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime
1001
 	+ "&endtime=" + endtime + "&productType=" + productType + "&productDate=" + productDate + "&batchNumber=" + batchNumber
977
 	+ "&endtime=" + endtime + "&productType=" + productType + "&productDate=" + productDate + "&batchNumber=" + batchNumber
1002
 	+ "&manufacturer=" + manufacturer + "&problemCode=" + problemCode + "&notifications=" + notifications
978
 	+ "&manufacturer=" + manufacturer + "&problemCode=" + problemCode + "&notifications=" + notifications
1003
-	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc;
979
+	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ;
1004
 	window.location.href = url;
980
 	window.location.href = url;
1005
 }
981
 }

+ 1 - 0
CallCenterWeb.UI/js/WorkOrder/WorkOrderDealWith.js

20
         var formData = new FormData();
20
         var formData = new FormData();
21
         formData.append("upFile", document.getElementById("upFile").files[0]);
21
         formData.append("upFile", document.getElementById("upFile").files[0]);
22
         formData.append("token", $.cookie("token"));
22
         formData.append("token", $.cookie("token"));
23
+        console.log("formData",formData)
23
         $.ajax({
24
         $.ajax({
24
             url: huayi.config.callcenter_url + "WorkOrder/UploadFile",
25
             url: huayi.config.callcenter_url + "WorkOrder/UploadFile",
25
             type: "POST",
26
             type: "POST",

+ 1 - 1
CallCenterWeb.UI/riTongHuaTime.html

226
 						//修改工单
226
 						//修改工单
227
 						layer.open({
227
 						layer.open({
228
 							type: 2,
228
 							type: 2,
229
-							title: '修改工单',
229
+							title: '明细信息',
230
 							maxmin: true, //开启最大化最小化按钮
230
 							maxmin: true, //开启最大化最小化按钮
231
 							area: ['80%', '90%'],
231
 							area: ['80%', '90%'],
232
 							content: './ReportForm/dailyCallDurationDetail.html?time=' + time,
232
 							content: './ReportForm/dailyCallDurationDetail.html?time=' + time,