双汇2.0.1

CallCenterWeb.UI/.project

@@ -132,5 +132,14 @@
 				<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>
 	</filteredResources>
 </projectDescription>

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

@@ -5,7 +5,7 @@ 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和端口
-    socket_ip: "121.196.219.217",//WebSocket通讯ip 121.196.219.217
+    socket_ip: "192.168.8.7",//WebSocket通讯ip 121.196.219.217
     socket_port: "8081",    //WebSocket通讯端口
     menuworktime: 1000 * 60,    //菜单工单数量刷新间隔
     indextime: 1000 * 60 * 2         //首页报表刷新间隔

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

@@ -675,6 +675,25 @@ helper.init = {
 helper.init.setajax();
 helper.init.setdh();
 
+helper.method = {
+	// 导出列表
+	exportFileFun:function (api, params) {
+		var url = huayi.config.callcenter_url + api;
+		if(typeof(params) !== "object") {
+			return
+		}
+		// 分页为空
+		Object.keys(params).forEach(function(key, index) {
+			if(index === 0) {
+				url += `?${key}=${params[key]}`
+			} else {
+				url += `&${key}=${params[key]}`
+			}
+		})
+		window.location.href = url;
+	}
+}
+
 
 
 

CallCenterWeb.UI/SystemManager/js/yongHuManger.js

@@ -6,6 +6,7 @@ var pidName; //父节点name
 var keyWord = $('.searCon').val(); //关键字
 var xlName; //添加下拉框节点name
 var table = $('#table1'); //右边表格
+var exportParams
 //搜索按钮
 $('.searchGo').click(function() {
 	keyWord = $('.searCon').val();
@@ -19,6 +20,12 @@ $('.searchGo').click(function() {
 	//	return;
 	//}
 })
+//搜索按钮
+$('.exportFile').click(function() {
+	exportParams.isdc = 1
+	helper.method.exportFileFun("UserAccount/GetList",exportParams)
+
+})
 
 
 $.get(huayi.config.callcenter_url + "Department/GetDeptList", {
@@ -901,6 +908,8 @@ function initTable(token, id, keyWord) {
 				dptid: id,
 				key: keyWord.replace(/\ +/g,"")
 			};
+			// 导出参数
+			exportParams = param;
 			return param;
 		},
 		onLoadSuccess: function() { //加载成功时执行

CallCenterWeb.UI/SystemManager/yongHuManger.html

@@ -35,6 +35,8 @@
 						<input type="text" class="searCon" placeholder="请输入关键字" />
 					</span>
 					<button class="btns searchGo">搜索</button>
+					<button class="btns exportFile">导出</button>
+					
 				</div>
 			</div>
 			<div class="treeTable clearfix">

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -32,6 +32,10 @@
 				font-size: 18px;
 				color: #1ab394;
 			}
+			.btn-default{
+				background: #FFFFFF;
+				color: #555
+			}
 		</style>
 	</head>
 	
@@ -167,6 +171,12 @@
 								<option value="0">否</option>
 							</select>
 						</div>
+						<div class="form-group" style="width: 200px;">
+							<select id="ZX" name="select" class="selectpicker show-tick form-control" data-live-search="true">
+								<option value="">请选择</option>
+							</select>
+						</div>
+						
 						<div class="form-group btn-position">
 							<button class="btns ss">搜索</button>
 							<button class="btns export">导出</button>
@@ -218,7 +228,17 @@
 		<script src="../js/WorkOrder/WorkOrder.js"></script>
 		<script src="../js/zTree/jquery.ztree.core.js"></script>
 		<script src="../js/zTree/jquery.ztree.excheck.min.js"></script>
+		<script src="./js/selectCommon.js"></script>
 		<script>
+			var zxSelectObj = {
+				id:'ZX',
+				apiUrl:'UserAccount/GetList',
+				params:{
+					type:3
+				},
+				selectValue:'F_UserCode',
+				selectName:'F_UserName'
+			}
 			$(document).ready(function() {
 				laydate.render({
 					elem: '#greetingTimes',
@@ -230,6 +250,7 @@
 					range: '~',
 					theme: '#1ab394',
 				});
+				selectCommon(zxSelectObj)
 				// 导出
 				$('.export').click(function() {
 					var state = $("#searchState").val(); //处理进度
@@ -275,6 +296,7 @@
 							batchNumber: $("#searchBatchNumber").val(), //产品编码
 							manufacturer: $("#searchManufacturerName").val(), //生产厂家
 							problemCode: $("#searchProblemCodeName").val(), //问题代码
+							ywy:$("#ZX").val(),
 							type: $("#searchOrderType").val(), //工单类别
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子

CallCenterWeb.UI/WorkOrder/js/selectCommon.js

@@ -0,0 +1,42 @@
+function selectMultiple(obj) {
+	var maindeptId = "";
+	var maindeptId_ = obj.val(); //坐席
+	if(maindeptId_ != null) {
+		$(maindeptId_).each(function(i, n) {
+			var obj2 = '';
+			obj2 = n + ",";
+			maindeptId += obj2;
+		})
+		maindeptId = maindeptId.substring(0, maindeptId.length - 1)
+	} else {
+		maindeptId = ""
+	}
+	return maindeptId
+}
+function selectCommon(obj){
+	params = Object.assign(obj.params,{
+			token: $.cookie("token"),
+	})
+	$.getJSON(
+		huayi.config.callcenter_url + obj.apiUrl,params ,
+		function(data) {
+			console.log(data.rows)
+			if(data.rows.length>0) {
+				var content = data.rows;
+				$(content).each(function(i, n) {
+					$(
+						"<option value='" +
+						n[obj.selectValue] +
+						"'>" +
+						n[obj.selectName] +
+						"</option>"
+					).appendTo($("#"+obj.id));
+				});
+				$("#"+obj.id).selectpicker({
+					noneSelectedText: "请选择业务员", //默认显示内容
+				});
+				$("#"+obj.id).selectpicker("refresh");
+			}
+		}
+	);
+}

CallCenterWeb.UI/callScreen/call.js

@@ -3,6 +3,7 @@
 var Number = helper.request.queryString("Number");
 var CallID = helper.request.queryString("CallID");
 var callRecordId = ""; 
+var provinceCityArr
 $(document).ready(function () {
 
 	LAISHENG($("#source"));//省
@@ -90,10 +91,7 @@ $(document).ready(function () {
                 //$(".ldlocation").text(result.data);
 				if (result.data !== "未知") {
 					var data = result.data.substr(0, result.data.length-2);
-					$("#source option:selected").text(data.split("-")[0]); // 工单-省
-					$("#source option:selected").val(data.split("-")[0]); // 工单-省
-					$("#type option:selected").text(data.split("-")[1]); //工单-市
-                    $("#type option:selected").val(data.split("-")[1]); //工单-市
+					provinceCity(data)
                     cityGetCounty(data.split("-")[1]);
                 }
             }
@@ -768,6 +766,9 @@ function LAISHI(obj) {
 			$(content).each(function (i, n) {
 				$("<option value='" + n.F_RegionId + "'>" + n.F_RegionName + "</option>").appendTo(obj);					
 			})
+			if(provinceCityArr.length>1){
+				$('#type option:contains('+provinceCityArr[1]+')').attr("selected",true);
+			}
 		}
 		
 	})
@@ -1690,7 +1691,7 @@ function getRepeatWorker () {
 					//重复工单
 					$("#duplicate input[type=radio][name=duplicate][value="+data.F_Duplicate+"]").attr("checked",'checked');
 					// 省市县
-					provinceCity(data)
+					provinceCity(data.F_AddRess)
 				}
 			}
 		}
@@ -1700,13 +1701,12 @@ function getRepeatWorker () {
 
 //省市县回显
 function provinceCity(data){
-	var provinceCityArr = data.F_AddRess.split("-");
-	$("#source option:selected").text(provinceCityArr[0]); //省
-	$("#source option:selected").val(provinceCityArr[0]);
-	$("#type option:selected").text(provinceCityArr[1]); //市
-	$("#type option:selected").val(provinceCityArr[1]);
+	provinceCityArr = data.split("-");
+	$('#source option:contains('+provinceCityArr[0]+')').attr("selected",true);
 	$("#keyid").val(provinceCityArr[2]); //区\县
 	$("#addressDescription").val(provinceCityArr[3]); //详细地址描述
+	LAISHI($("#type"));
+	
 }
 
 

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -415,6 +415,7 @@ function authorizeOperateButton(userRoleCode) {
 				$('.tool_downs').find('[id*="HY_submit"]').show(); //提交
                 $('.tool_downs').find('[id*="HY_end"]').show(); //完结
 				$('.tool_downs').find('[id*="HY_dealWith"]').show(); //处理
+				$('.tool_downs').find('[id*="HY_return"]').show();//退回
 				$('.tool_downs').find('[id*="HY_reminder"]').show();//催单
 				$('.tool_downs').find('[id*="HY_edit"]').show(); //修改
 				// 操作列表

CallCenterWeb.UI/js/WorkOrder/WorkOrderDetails.js

@@ -158,13 +158,13 @@ function getWorkOrderDe() {
 						var fileType1 = n.F_Type.split("\/")[0];
 						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 +
+								'<span class="img_mask"><span onclick=downloadFile("'+ n.F_Url + '","'+con.rows[0].F_WorkOrderId +"_"+ (i+1) + '","' + 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");
+								'<img layer-src="' + n.F_Url + '" src="' + n.F_Url + '" alt="'+con.rows[0].F_WorkOrderId +"_"+  (i+1) +
+								'" 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 +
+								'<span class="img_mask"><span href="javascript:;" onclick=downloadFile("'+con.rows[0].F_WorkOrderId +"_"+ (i+1)+
 								'","' + 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");
@@ -190,6 +190,7 @@ function getWorkOrderDe() {
 }
 
 function downloadFile(data, strFileName, strMimeType) {
+	console.log(data, strFileName, strMimeType)
 	event.preventDefault();
 	//详细见文档 http://danml.com/download.html
 	var x = new XMLHttpRequest();

CallCenterWeb.UI/js/index.js

@@ -52,7 +52,7 @@ $(document).ready(function() {
 				obj.Type = fun;
 				switch(fun) {
 					case "Login":
-						//									obj.AgentGroup = "364";
+						obj.AgentGroup = "1";
 						obj.AgentType = "0";
 						Send();
 						break; //签入

CallCenterWeb.UI/login.html

@@ -137,9 +137,7 @@
                     },
                     success: function (data) {
                         /*验证请求*/
-                       debugger
                         if (data.state == "success") {
-                        	
                             $.cookie("token", data.data.token, { expires: 7 });
                             $.cookie("extno", userSeat, { expires: 7 });
                             window.location.href = "index.html";

双汇APP-andriod/workOrder/Work-dispose.html

@@ -155,11 +155,11 @@
 						<label class="label labels">是否完结：</label>
 						<div class="mui-input-row mui-radio mui-left radio_box">
 							<label>否</label>
-							<input type="radio" name="secret" value="0" />
+							<input type="radio" name="secret" checked="checked" value="0" />
 						</div>
 						<div class="mui-input-row mui-radio mui-left radio_box">
 							<label>是</label>
-							<input type="radio" name="secret" checked="checked" value="1" />
+							<input type="radio" name="secret" value="1" />
 						</div>
 					</div>
 				</li>

双汇APP/workOrder/Work-dispose.html

@@ -156,11 +156,11 @@
 						<label class="label labels">是否完结：</label>
 						<div class="mui-input-row mui-radio mui-left radio_box">
 							<label>否</label>
-							<input type="radio" name="secret" value="0" />
+							<input type="radio" name="secret" checked="checked" value="0" />
 						</div>
 						<div class="mui-input-row mui-radio mui-left radio_box">
 							<label>是</label>
-							<input type="radio" name="secret" checked="checked" value="1" />
+							<input type="radio" name="secret" value="1" />
 						</div>
 					</div>
 				</li>