问题修改

CallCenterWeb.UI/ReportForm/callTotalStatisticsDayDetail.html

@@ -84,12 +84,14 @@
 						}, //如果无需自定义数据响应名称，可不加该参数
 						cols: [
 							[{
+									field: '坐席',
+									title: '坐席',
+									align: 'center',
+									width: '',
+								},{
 									field: '呼损次数',
 									title: '呼损次数',
 									align: 'center',
-									fixed: true,
-									sort: true,
-									width: 150,
 								}, {
 									field: '呼损率',
 									title: '呼损率',

CallCenterWeb.UI/WorkOrder/WorkOrderDealWith.html

@@ -99,11 +99,11 @@
 	                    </td>
 					</tr>
 					<tr class="upfile-wrapper">
-						<th>上传附件:</th>
+						<th>上传图片:</th>
                         <td>
                         	<div class="form-group">
                         		<span class="upfile-text"></span>
-								<input id="btndr" type="button" class="btns" value="上传" />
+								<input id="btndr" type="button" class="btns" value="上传图片" />
 								<input type="file" name="upFile" id="upFile" style="display: none;">
 							</div>
                         </td>

CallCenterWeb.UI/WorkOrder/WorkOrderSpotCheck.html

@@ -379,8 +379,9 @@
 				// 导出
 				$('.export').click(function() {
 					var state = $("#searchState").val(); //处理进度
-					isdc = 3
-					dcexcel(state,isdc);
+					var isdc = 2;
+					var CJ = 1
+					dcexcel(state, isdc, CJ);
 				});
 			})
 			

CallCenterWeb.UI/callScreen/call.js

@@ -1346,10 +1346,10 @@ function saveCustomer() {
                 Clean();
                 //window.location.reload()
                 $('.customerSubmit').attr("disabled", false);
-	            $('.customerSubmit').text('保存');
+	            $('.customerSubmit').text('新建');
             } else {
             	$('.customerSubmit').attr("disabled", false);
-	            $('.customerSubmit').text('保存');
+	            $('.customerSubmit').text('新建');
             }
         }
     });

CallCenterWeb.UI/callScreen/callScreen.html

@@ -892,7 +892,7 @@
                                             </tr>
                                             <tr>
                                                 <td colspan="8" style="text-align: center;">
-                                                    <button class="btns customerSubmit">保&nbsp;存</button>
+                                                    <button class="btns customerSubmit">新&nbsp;建</button>
                                                     <button class="btns customerSubmitRepeat" style="display: none;">提&nbsp;交</button>
                                                 </td>
                                             </tr>

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -266,6 +266,7 @@ function getWorkOrderDetails() {
 				$("#detailDealResult").text(data.F_DealResult); //落实情况
 				$("#detailDealUser").text(data.F_DealUser);
 				$("#detailDealTime").text(data.F_DealTime);
+				$("#detailReduction").text(workOrderDetailsReductionJudge(data)) //是否减免
 			}
 		}
 	})
@@ -332,42 +333,15 @@ function getWorkOrderDe() {
 						debugger;
 						var fileType = n.F_Type;
 						var fileType1 = n.F_Type.split("\/")[0];
-						if (fileType === '.jpg'||fileType === '.png'||fileType1==='image') {
+						if (fileType === '.jpg'||fileType === '.png'|| fileType1==='image') {
 							$('<div class="img-box">' +
-								'<span class="img_mask"><span onclick=downloadFile("'+ n.F_Url + '","' + n.F_Name + '","' + n.F_Type +
-								'") title="点击下载"><i class="fa fa-download" aria-hidden="true"></i></span></span>' +
 								'<img layer-src="' + n.F_Url + '" src="' + n.F_Url + '" alt="' + n.F_Name +
 								'" class="image-item" /><div>').appendTo("#fileList");
 						} else {
 							$('<div class="img-box">' +
-								'<span class="img_mask"><span href="javascript:;" onclick=downloadFile("' +  n.F_Url + '","' + n.F_Name +
-								'","' + n.F_Type +
-								'") title="点击下载"><i class="fa fa-download" aria-hidden="true"></i></span></span>' +
-								'<span class="img_filename">'+n.F_OriName + n.F_Name.split(".")[1] + '</span><div>').appendTo("#fileList");
+								'<span class="img_filename">'+n.F_Name + n.F_Name.split(".")[1] + '</span><div>').appendTo("#fileList");
 						}
 					});
-					layer.photos({
-						photos: '#fileList',
-						anim: 5, //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
-						title: '查看图片',
-						move: '.layui-layer-title',
-						shadeClose: false,
-						closeBtn: 1,
-						area: ['80%', '90%'],
-						tab: function(pic, layero) {
-							$('.layui-layer-content').on("mousewheel", function(e, d) {
-								
-								helper.methods.zoomImg($('#layui-layer-photos').find('img[alt="' + pic.alt + '"]'), d);
-								$('#layui-layer-photos').find('img[alt="' + pic.alt + '"]').dragging({
-									move: "both", //拖动方向，x y both
-									randomPosition: false //初始位置是否随机
-								});
-								return false;
-								
-							});
-							helper.methods.initLayerPhotos('#layui-layer-photos', pic, layero);
-						},
-					});
 				}
 				
 			}
@@ -375,19 +349,6 @@ function getWorkOrderDe() {
 	});
 }
 
-//下载
-function downloadFile(data, strFileName, strMimeType) {
-	event.preventDefault();
-	//详细见文档 http://danml.com/download.html
-	var x = new XMLHttpRequest();
-	x.open("GET", data, true);
-	x.responseType = 'blob';
-	x.onload = function(e) {
-		download(x.response, strFileName, strMimeType);
-	}
-	x.send();
-}
-
 // 工单详情中判断工单来源的值
 function workOrderDetailsSourceJudge (data) {
 	if (data.F_Source === 1) {
@@ -438,11 +399,22 @@ function workOrderDetailsStateJudge (data) {
 }
 
 // 工单详情中重复工单返回值判断
-function workOrderDetailsDuplicateJudge (data) {
-	if (data.F_Duplicate === 0) {
-		return '未重复';
-	} else if (data.F_Duplicate === 1) {
-		return '重复';
+//function workOrderDetailsDuplicateJudge (data) {
+//	if (data.F_Duplicate === 0) {
+//		return '未重复';
+//	} else if (data.F_Duplicate === 1) {
+//		return '重复';
+//	} else {
+//		return '';
+//	}
+//}
+
+// 工单详情减免返回值
+function workOrderDetailsReductionJudge (data) {
+	if (data.F_IsReduction === 0) {
+		return '未减免';
+	} else if (data.F_IsReduction === 1) {
+		return '已减免';
 	} else {
 		return '';
 	}
@@ -735,7 +707,7 @@ function btn_dealWith(id) {
 		type: 2,
 		title: '处理工单',
 		maxmin: true, //开启最大化最小化按钮
-		area: ['35%', '45%'],
+		area: ['35%', '50%'],
 		content: "../WorkOrder/WorkOrderDealWith.html?id=" + id
 	});
 }
@@ -972,14 +944,18 @@ document.onkeydown = function (e) {
 }
 
 // 导出
-function dcexcel(state, isdc) {
+function dcexcel(state, isdc, CJ) {
 	if (isdc === 3) {
-		console.log("1231231231")
 		var isdc = 3;
 	} else {
-		console.log("12312312132")
 		var isdc = 2;
 	}
+	if (CJ === 1) {
+		var CJ = 1;
+	} else {
+		var CJ = "";
+	}
+	
 	var token = $.cookie("token");
 	var code = $("#searchCode").val(); //工单编号
 	var area = $("#searchArea").val(); //大区
@@ -1000,6 +976,6 @@ function dcexcel(state, isdc) {
 	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime
 	+ "&endtime=" + endtime + "&productType=" + productType + "&productDate=" + productDate + "&batchNumber=" + batchNumber
 	+ "&manufacturer=" + manufacturer + "&problemCode=" + problemCode + "&notifications=" + notifications
-	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc;
+	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ;
 	window.location.href = url;
 }

CallCenterWeb.UI/js/WorkOrder/WorkOrderDealWith.js

@@ -20,6 +20,7 @@ function upload() {
         var formData = new FormData();
         formData.append("upFile", document.getElementById("upFile").files[0]);
         formData.append("token", $.cookie("token"));
+        console.log("formData",formData)
         $.ajax({
             url: huayi.config.callcenter_url + "WorkOrder/UploadFile",
             type: "POST",

CallCenterWeb.UI/riTongHuaTime.html

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