合并

CallCenterWeb.UI/.project

 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>CallCenterWeb.UI</name>
+	<name>shuangHuiCallCenterWeb.UI</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1499962560129</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>1499962627366</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>1500016710765</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>1502436648911</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>1503537748469</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>1508741256859</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>1516325161832</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>1543562721882</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>1572572573720</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>1582624973323</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>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>
-		<filter>
-			<id>1643096518248</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>1686622866980</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>1713251081755</id>
+			<id>1720753405101</id>
 			<name></name>
 			<type>26</type>
 			<matcher>

CallCenterWeb.UI/Script/Common/huayi.config.js

 huayi.config = {
    //callcenter_url: "http://localhost:7456/",//生产环境 前端Web站IP和端口
    // callcenter_url: "http://192.168.4.18:4687/",//生产环境 前端Web站IP和端口
-    callcenter_url: "http://192.168.8.9:1001/",//生产环境 前端Web站IP和端口
+//  callcenter_url: "http://192.168.8.9:1001/",//生产环境 前端Web站IP和端口
+    callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境 前端Web站IP和端口
+    
     socket_ip: "192.168.8.7",//WebSocket通讯ip 121.196.219.217
     socket_port: "8081",    //WebSocket通讯端口
     menuworktime: 1000 * 60,    //菜单工单数量刷新间隔

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

 				selectValue:'F_UserCode',
 				selectName:'F_UserName'
 			}
+			var exportParams; // 导出参数
 			$(document).ready(function() {
 				laydate.render({
 					elem: '#greetingTimes',
 				selectCommon(zxSelectObj)
 				// 导出
 				$('.export').click(function() {
-					var state = $("#searchState").val(); //处理进度
-					dcexcel(state);
+//					var state = $("#searchState").val(); //处理进度
+//					dcexcel(state);
+					exportParams.isdc = 2;
+					exportFileFun("WorkOrder/GetList", exportParams)
 				});
 			})
 			
 							pageindex: params.pageNumber, //页码
 							pagesize: params.pageSize, //条数
 						};
+						exportParams = param
 						return param;
 					},
 					onLoadSuccess: function() { //加载成功时执行

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

         initTable();
     }
 }
-
+// 导出列表
+function exportFileFun(api, params) {
+    var url = huayi.config.callcenter_url + api;
+    if(typeof(params) !== "object") {
+        return
+    }
+    // 分页为空
+    delete params.pageindex 
+    delete params.pagesize 
+    Object.keys(params).forEach(function(key, index) {
+        if (index === 0) {
+            url += `?${key}=${params[key]}`
+        } else {
+            url += `&${key}=${params[key]}`
+        }
+    })
+    console.log((url))
+    window.location.href = url;
+}
 // 导出
 function dcexcel(state, isdc, CJ, reduction, isreductions) {
 	
 	var reminder = $("#searchReminder").val(); //是否催单
 	var complete = $("#searchComplete").val(); //是否完善
 	var isdealfile = $("#searchUploadPhoto").val(); //是否上传照片
-
+	var duplicatetime = $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[0] //重复投诉开始时间
+	var endduplicatetime = $('#duplicateTime').val() && $('#duplicateTime').val().split(' ~ ')[1] 
+	
+	
 	var url = huayi.config.callcenter_url + "WorkOrder/GetList?token=" + token;
-	url += "&state=" + state + "&code=" + code + "&area=" + area + "&office=" + office + "&starttime=" + starttime + "&endtime=" + endtime + "&keywords=" + keywords + "&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 + "&complaintType=" + comType + "&dealTimely=" + dealTimely + "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ + "&IsReduction=" + reduction + "&reminder=" + reminder + "&incomplete=" + complete + "&isdealfile=" + isdealfile + "&isreductions=" + isreductions;
+	+ "&type=" + type + "&complaintType=" + comType + "&dealTimely=" + dealTimely 
+	+ "&see=" + see + "&isdc=" + isdc + "&CJ=" + CJ + "&IsReduction=" + reduction + "&reminder=" + reminder 
+	+ "&incomplete=" + complete + "&isdealfile=" + isdealfile + "&isreductions=" + isreductions
+	+ "&duplicatetime=" + duplicatetime+ "&endduplicatetime=" + endduplicatetime
+	console.log(url)
 	window.location.href = url;
 }

双汇APP-andriod/js/huayi.config.js

 huayi.config = {
 	 callcenter_url: "http://oa.shuanghui.net:8046/",//生产环境
 	//callcenter_url: "http://121.196.219.217:8046/",//生产环境
-//	callcenter_url: "http://192.168.8.9:1001/",//生产环境
+	// callcenter_url: "http://192.168.8.9:1001/",//生产环境
 	socket_ip: "222.143.137.63", //ip
 	socket_port: "8081", //端口
 	indexOutTime: 2000, //菜单工单数量刷新间隔

双汇APP-andriod/js/login.js

 		document.getElementById("password").value = localStorage.getItem("psw");
 	}
 	document.getElementById("login").addEventListener('tap', function() {
-<<<<<<< HEAD
-		alert("111")
-=======
-
->>>>>>> dc8886372f33ab5a85b88d764e008237f3ac82e1
+		
 		var username = document.getElementById('account').value;
 		var password = document.getElementById('password').value;
 		var data = {
 			if(plus.networkinfo.getCurrentType() == plus.networkinfo.CONNECTION_NONE) {
 				mui.toast("网络连接中断！");
 			}
-			
 			// 调用ajax  
 			mui.ajax(huayi.config.callcenter_url + '/WorkorderApp/login', {
 				data: data,
 				timeout: 10000, //超时时间设置为10秒
 				success: function(data) {
 					if(data.state == "success") {
-						
+
 						localStorage.setItem("token", data.data.token);
 						localStorage.setItem("user", username);
 						localStorage.setItem("psw", password);
 						document.getElementById('password').value = "";
 					}
 				},
-				error: function(xhr, type, errorThrown) {}
+				error: function(xhr, type, errorThrown) {
+					alert(JSON.stringify(xhr), type,JSON.stringify(errorThrown) )
+				}
 			});
 
 		}

双汇APP-andriod/manifest.json

 {
     "@platforms" : [ "android", "iPhone" ],
-    "id" : "H58720A9E", /*应用的标识，创建应用时自动生成，勿手动修改*/
+    "id" : "H5B42FA92", /*应用的标识，创建应用时自动生成，勿手动修改*/
     "name" : "双汇售后服务平台", /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.6.9", /*应用版本名称*/
+        "name" : "1.7.1", /*应用版本名称*/
         "code" : "83"
     },
     "description" : "", /*应用描述信息*/

双汇APP-andriod/unpackage/cache/apk/apkurl

-https://ide.dcloud.net.cn/build/download/7dedf1b0-a9ea-11ee-bf63-2147db512872
+https://app.liuyingyong.cn/build/download/89e05c70-007c-11ef-b058-adc14a7f0642

双汇APP-andriod/unpackage/cache/wgt/H58720A9E/Undertake/Work-Seach.html

 					}
 				});
 				//工单类型
-				var typeList = [];
-				$.ajax({
-					type: "get",
-					url: huayi.config.callcenter_url + 'Dictionary/GetDicValueListById?',
-					async: false,
-					data: {
-						token: token,
-						id: 2
-					},
-					dataType: 'json',
-					success: function(data) {
-						var type_data = data.data;
-						$(type_data).each(function(i, n) {
-							var obj = {};
-							obj.value = n.F_ValueId;
-							obj.text = n.F_Value;
-							typeList.push(obj)
-						})
-					}
-				});
+				var typeList = [{
+					value: '1',
+					text: '咨询'
+				}, {
+					value: '2',
+					text: '投诉'
+				}, {
+					value: '3',
+					text: '重复'
+				}, 
+				// {
+				// 	value: '5',
+				// 	text: '生鲜品'
+				// }, 
+				// {
+				// 	value: '6',
+				// 	text: '禽产品'
+				// }, {
+				// 	value: '7,
+				// 	text: '综合事业部'
+				// }, {
+				// 	value: '8',
+				// 	text: '餐饮事业部'
+				// }, {
+				// 	value: '9',
+				// 	text: '400热线接听'
+				// }, {
+				// 	value: '10',
+				// 	text: '线上投诉'
+				// }, {
+				// 	value: '11',
+				// 	text: '市场监管局投诉'
+				// }, {
+				// 	value: '12',
+				// 	text: '电商投诉'
+				// },
+				]
+				// $.ajax({
+				// 	type: "get",
+				// 	url: huayi.config.callcenter_url + 'Dictionary/GetDicValueListById?',
+				// 	async: false,
+				// 	data: {
+				// 		token: token,
+				// 		id: 2
+				// 	},
+				// 	dataType: 'json',
+				// 	success: function(data) {
+				// 		var type_data = data.data;
+				// 		$(type_data).each(function(i, n) {
+				// 			var obj = {};
+				// 			obj.value = n.F_ValueId;
+				// 			obj.text = n.F_Value;
+				// 			typeList.push(obj)
+				// 		})
+				// 	}
+				// });
 				//主题词
 				var keyList = [];
 				$.ajax({