重复投诉表

CallCenterWeb.UI/.project

@@ -105,5 +105,23 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1589250229656</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>1589275565983</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

CallCenterWeb.UI/ReportForm/repeatComplaintForm.html

@@ -72,6 +72,9 @@
 							<i class="tub fa fa-calendar"></i>
 							<input class="form-control" type="text" id="startTime" placeholder="请选择时间" style="width: 228px;">
 						</div>
+						<div class="form-group">
+							<input class="form-control" type="text" id="searchKeywords" placeholder="请输入关键字">
+						</div>
 						<div class="form-group tool_bars pull-right">
 							<button class="btns sear">搜索</button>
 							<a class="btns export">导出</a>
@@ -123,9 +126,10 @@
 			});
 
 			function dcexcel(obj) {
-				var isExport = 1;
+				var isExport = 2;
+				var keywords = $("#searchKeywords").val();//关键字
 				var url = huayi.config.callcenter_url + "WorkOrder/GetList?token=" + token;
-				url += "&starttime=" + stime + "&endtime=" + endtime + "&istime=" + isTime + "&isdc=" + isExport + "&duplicate=" + 1;
+				url += "&starttime=" + stime + "&endtime=" + endtime + "&istime=" + isTime + "&isdc=" + isExport + "&duplicate=" + 1 + "&keywords=" + keywords;
 				window.location.href = url;
 			}
 			//按回车搜索
@@ -157,6 +161,7 @@
 							token: token,
 							duplicate: 1,
 							istime: $("#isTime").val(),
+							keywords: $("#searchKeywords").val(),//关键字
 							isdc: 0,
 						}, 
 						request: {

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -752,7 +752,6 @@ function getProductFactory() {
     $("#searchManufacturerDataList").append('<option value="不清"></option>');
     $.getJSON(huayi.config.callcenter_url + "EquipmentNumber/GetList", {
         "token": $.cookie("token"),
-        keywords: "",
         pageindex: "1",
         pagesize: "200",
     }, function (data) {
@@ -1110,9 +1109,9 @@ function dcexcel(state, isdc, CJ, reduction) {
 	var code = $("#searchCode").val(); //工单编号
 	var area = $("#searchRegionId").val(); //大区
 	var office = $("#searchOfficeId").val(); //办事处
-	// var officeName = $("#searchOfficeName").val(); //办事处
 	var starttime = $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0]; //开始时间
 	var endtime = $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1]; //结束时间
+	var keywords = $("#searchKeywords").val();//关键字
 	var productType = $("#searchProductType").val(); //产品代码
 	var productName = $("#searchProductName").val(); //产品名称
 	var productDate = $("#searchProductDate").val(); //生产日期
@@ -1125,8 +1124,7 @@ function dcexcel(state, isdc, CJ, reduction) {
 	var reminder = $("#searchReminder").val(); //是否催单
 
 	var url = huayi.config.callcenter_url + "WorkOrder/GetList?token=" + token;
-	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime
-	+ "&endtime=" + endtime + "&productType=" + productType +"&productName=" + productName + "&productDate=" + productDate + "&batchNumber=" + batchNumber
+	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime + "&endtime=" + endtime + "&keywords=" + keywords + "&productType=" + productType +"&productName=" + productName + "&productDate=" + productDate + "&batchNumber=" + batchNumber
 	+ "&manufacturer=" + manufacturer + "&problemCode=" + problemCode 
 	+ "&type=" + type + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ + "&IsReduction=" + reduction + "&reminder=" + reminder;
 	window.location.href = url;