Merge branch 'master' of http://192.168.1.222:3000/lihai/Synear_UI

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

 					var val = $("input[name='ltype']:checked").val();
 					
 					var valRes = $("input[name='response']:checked").val();
-					var dealCost=$("#dealCost").val();
+					
+					
+					if (isNaN($("#dealCost").val())) {
+						var dealCost="";
+					}
 					if(!val) {
 						layer.confirm('请选择处理方式！', {
 							btn: ['确定']
 							token: $.cookie("token"),
 							source: $('#orderSource').val(), //工单来源
 							type:$("#orderType").val(),
-							
 							key:$('#keyWord').val(), //内容关键字
-							workid:$('#orderNum').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
 							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
 							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 							userid: $('#userid').val() //坐席
 			}
 			//导出
 			function dcexcel(obj) {
-				var url = huayi.config.callcenter_url + "WorkOrder/ExportList?ltype=471&token=" + $.cookie("token");
+				var url = huayi.config.callcenter_url + "WorkOrder/GetList?isdc=1&token=" + $.cookie("token");
 				//tel来电号码 ; ltype工单状态; type工单来源;  typeclass工单类型;starttime; endtime;lddep;来电单位;fkdep反馈; userid坐席工号
 				if(stype == '1') {
-					url += "&typeclass=" + $("#typeclassId").val();//工单类型
-					url += "&type=" + $("#orderSource").val();//工单来源
-					
+					url += "&state=0";//状态
+					url += "&source=" + $("#orderSource").val();//工单来源
+					url += "&type=" + $("#orderType").val();//工单类型
+					url += "&key=" + $('#keyWord').val();//关键词
+					url += "&workid=" + $('#orderNum').val();//关键词
 					url += "&starttime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[0]);//开始时间
 					url += "&endtime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[1]);//结束时间
-					url += "&lddep=" + $("#comeCall_dep_input").val();//来电单位
-					url += "&userid=" + $("#userid").val();//坐席
-					url += "&fkdep=" + $("#comeCall_deps_input").val();//反馈单位
+					
 				} else if(stype == '2') {
 					url += "&name=" + $("#ss_khxm").val() + "&tel=" + $("#ss_khdh").val() + "&key=" + $("#ss_gdnr").val();
 					url += "&type=" + $("#ss_gdlx").val() + "&orderid=" + $("#ss_gdbh").val();

CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

 			}
 
 			function dcexcel(obj) {
-				var url = huayi.config.callcenter_url + "WorkOrder/ExportList?ltype=472&token=" + $.cookie("token");
+				var url = huayi.config.callcenter_url + "WorkOrder/GetList?isdc=1&token=" + $.cookie("token");
 
 				if(stype == '1') {
-					url += "&typeclass=" + $("#typeclassId").val();//工单类型
-					url += "&type=" + $("#orderSource").val();//工单来源
+					url += "&state=1";//状态
+					url += "&source=" + $("#orderSource").val();//工单来源
+					url += "&type=" + $("#orderType").val();//工单类型
+					url += "&key=" + $('#keyWord').val();//关键词
+					url += "&workid=" + $('#orderNum').val();//关键词
 					url += "&starttime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[0]);//开始时间
 					url += "&endtime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[1]);//结束时间
-					url += "&lddep=" + $("#comeCall_dep_input").val();//来电单位
-					url += "&userid=" + $("#userid").val();//坐席
-					url += "&fkdep=" + $("#comeCall_deps_input").val();//反馈单位
 				} else if(stype == '2') {
 					url += "&name=" + $("#ss_khxm").val() + "&tel=" + $("#ss_khdh").val() + "&key=" + $("#ss_gdnr").val() + "&state=" + $("#ss_gdzt").val();
 					url += "&type=" + $("#ss_gdlx").val() + "&orderid=" + $("#ss_gdbh").val() + "&code=" + $("#ss_zxgh").val();

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

 							page: params.pageNumber,
 							pagesize: params.pageSize,
 							token: $.cookie("token"),
-							
-//							typeclass: $('#typeclassId').val(), //工单类型
 							source: $('#orderSource').val(), //工单来源
 							key:$('#keyWord').val(), //内容关键字
 							workid:$('#orderNum').val(), //内容关键字
 							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
 							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
-//							lddep: $('#comeCall_dep').val(), //来电单位
-//							fkdep: $('#comeCall_deps').val(), //来电单位
 							userid: $('#userid').val() //坐席
 						};
-						//                  if (stype == '1') {
-						//                      param.name = $("#name").val();
-						//                      param.tel = $("#tel").val();
-						//                  } else if (stype == '2') {
-						//                      param.name = $("#ss_khxm").val();
-						//                      param.tel = $("#ss_khdh").val();
-						//                      param.key = $("#ss_gdnr").val();
-						//                      param.state = $("#ss_gdzt").val();
-						//                      param.type = $("#ss_gdlx").val();
-						//                      param.orderid = $("#ss_gdbh").val();
-						//                      param.code = $("#ss_zxgh").val();
-						//                  }
 						return param;
 					},
 					onLoadSuccess: function() { //加载成功时执行
 			}
 
 			function dcexcel(obj) {
-				var url = huayi.config.callcenter_url + "WorkOrder/ExportList?token=" + $.cookie("token");
+				var url = huayi.config.callcenter_url + "WorkOrder/GetList?isdc=1&token=" + $.cookie("token");
 
 				if(stype == '1') {
-					url += "&typeclass=" + $("#typeclassId").val(); //工单类型
-					url += "&type=" + $("#orderSource").val(); //工单来源
-					url += "&starttime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[0]); //开始时间
-					url += "&endtime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[1]); //结束时间
-					url += "&lddep=" + $("#comeCall_dep").val(); //来电单位
-					url += "&userid=" + $("#userid").val(); //坐席
-					url += "&fkdep=" + $("#comeCall_deps").val(); //反馈单位
+					
+					url += "&source=" + $("#orderSource").val();//工单来源
+					url += "&type=" + $("#orderType").val();//工单类型
+					url += "&key=" + $('#keyWord').val();//关键词
+					url += "&workid=" + $('#orderNum').val();//关键词
+					url += "&starttime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[0]);//开始时间
+					url += "&endtime=" + ($("#greetingTimes").val() && $("#greetingTimes").val().split(' ~ ')[1]);//结束时间
 				} else if(stype == '2') {
 					url += "&name=" + $("#ss_khxm").val() + "&tel=" + $("#ss_khdh").val() + "&key=" + $("#ss_gdnr").val() + "&state=" + $("#ss_gdzt").val();
 					url += "&type=" + $("#ss_gdlx").val() + "&orderid=" + $("#ss_gdbh").val() + "&code=" + $("#ss_zxgh").val();

CallCenterWeb.UI/keHuManager/js/addCommissioner.js

 			});
 			return;
 		}
-		
+		if($('.mobile').val() == '') {
+			layer.confirm('请输入电话！', {
+				btn: ['确定']
+			});
+			return;
+		}
 		
 		$.post(huayi.config.callcenter_url + 'Customer/AddCustomer', {
 			id:id,

CallCenterWeb.UI/keHuManager/js/addCustomer.js

 			});
 			return;
 		}
-		
-		
+		if($('.mobile').val() == '') {
+			layer.confirm('请输入电话！', {
+				btn: ['确定']
+			});
+			return;
+		}
 		$.post(huayi.config.callcenter_url + 'Customer/AddCustomer', {
 			id:id,
 			type:1,

CallCenterWeb.UI/keHuManager/js/commissioner.js

             maxmin: true, //开启最大化最小化按钮
             area: ['50%', '50%'],
             //              content: 'addCustomerFile.html'
-            content: 'addCustomerFile.html?ids=' + did
+            content: 'addCommissFile.html?ids=' + did
         });
 
 
     if (document.getElementById("upFile").files.length > 0) {
         var formData = new FormData();
         formData.append("upFile", document.getElementById("upFile").files[0]);
+        formData.append("type", 2);
         formData.append("token", $.cookie("token"));
         $.ajax({
             url: huayi.config.callcenter_url + "Customer/ExportExcel",

CallCenterWeb.UI/keHuManager/js/keHuManger.js

     if (document.getElementById("upFile").files.length > 0) {
         var formData = new FormData();
         formData.append("upFile", document.getElementById("upFile").files[0]);
+        formData.append("type", 1);
         formData.append("token", $.cookie("token"));
         $.ajax({
             url: huayi.config.callcenter_url + "Customer/ExportExcel",
                 });
                 var r = $.parseJSON(result);
                 if (r.state.toLowerCase() == "success") {
+                	debugger
                 	layer.msg("导入成功");
                 	initTable(token);