重复工单，问题修改

CallCenterWeb.UI/ReportForm/KPI.html

@@ -105,14 +105,13 @@
 						<td class="count">0</td>
 						<td class="percent">0%</td>
 					</tr>
-
 					<tr>
 						<td>呼入未接通项目占有率</td>
 						<td class="count">0</td>
 						<td class="percent">0%</td>
 					</tr>
 					<tr>
-						<td>合计(总电话量)：</td>
+						<td>合计(总电话量，呼入项目+呼出项目)：</td>
 						<td class="count">0</td>
 						<td class="percent">0%</td>
 					</tr>

CallCenterWeb.UI/WorkOrder/AddWorkOrder.html

@@ -190,14 +190,19 @@
 							<th>工单类型:</th>
                             <td>
                             	<div id="order_isover" class="col-md-6 r_order_type">
-                            		<input class="radio-input" id="work-order-radio-advisory" type="radio" name="type" value="1" checked="checked">
-									<label class="radio-inline" for="work-order-radio-advisory">
+                            		<input class="radio-input" id="workOrderRadioAdvisory" type="radio" name="type" value="1" checked="checked">
+									<label class="radio-inline" for="workOrderRadioAdvisory">
 						   				咨询
 									</label>
-									<input class="radio-input" id="work-order-radio-complaint" type="radio" name="type" value="2" >
-									<label class="radio-inline" for="work-order-radio-complaint">
+									<input class="radio-input" id="workOrderRadioComplaint" type="radio" name="type" value="2" >
+									<label class="radio-inline" for="workOrderRadioComplaint">
 						   				投诉
 									</label>
+									<input class="radio-input" id="workOrderRadioRepeat" type="radio" name="type" value="3" >
+									<label class="radio-inline" for="workOrderRadioRepeat">
+						   				重复
+									</label>
+
 								</div>
                             </td>
 						</tr>
@@ -211,7 +216,7 @@
                             <th><i style="color: #FF0000">*&nbsp;</i>电话:</th>
                             <td>
                                 <div class="form-group">
-                                    <input type="text" class="form-control" id="tel" maxlength="11" onkeyup="value=value.replace(/[^\d]/g,'')" />
+                                    <input type="text" class="form-control" id="tel" />
                                 </div>
                             </td>
 							<!--<th>大区:</th>
@@ -346,7 +351,7 @@
                             </td>
 						</tr>
 						<tr></tr>
-						<tr>
+						<!--<tr>
 							<th>重复工单:</th>
                             <td>
                             	<div id="duplicate" class="col-md-6 r_order_type">
@@ -360,7 +365,7 @@
 									</label>
 								</div>
                             </td>
-						</tr>
+						</tr>-->
 						<tr>
 							<th>是否指派:</th>
                             <td>

CallCenterWeb.UI/WorkOrder/WorkOrderAppoint.html

@@ -84,13 +84,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -127,11 +121,11 @@
                     	<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
                     	<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 						<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-						<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+						<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 						<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 						<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 						<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-						<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+						<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 						<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 						<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 						<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -144,8 +138,7 @@
 						<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 						<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-						<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-						<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+						<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 						<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 						<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 						<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -274,9 +267,9 @@
 									<td>
 										<span id="detailState"></span>
 									</td>
-									<th>重复工单：</th>
+									<th>处理时间：</th>
 									<td>
-										<span id="detailDuplicate"></span>
+										<span id="detailDealTime"></span>
 									</td>
 								</tr>
 								<tr>
@@ -288,10 +281,6 @@
 									<td>
 										<span id="detailDealUser"></span>
 									</td>
-									<th>处理时间：</th>
-									<td>
-										<span id="detailDealTime"></span>
-									</td>
 								</tr>
 								<tr>
 									<th>备注：</th>
@@ -382,7 +371,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderDetails.html

@@ -0,0 +1,201 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="../css/init.css" rel="stylesheet" />
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/WorkOrder/Search.css" rel="stylesheet">
+    <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
+    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
+    <link rel="stylesheet" href="../css/init.css" />
+    <link rel="stylesheet" href="../css/WorkOrder/NewAddWorkOrder.css" />
+	<link rel="stylesheet" href="../js/zTree/zTreeStyle.css" />
+	<link href="../css/WorkOrder/Search.css" rel="stylesheet">
+	<link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
+	<link href="../css/init.css" rel="stylesheet" />
+    <title></title>
+    <style>
+        ul li {
+            float: initial;
+            list-style: none;
+        }
+        
+        .ckxq .ckxq_ul li{
+        	display: inline-block;
+        }
+        
+        .repeat-btn{
+        	width: 100%;
+        	margin: 30px 0 0 0;
+        	text-align: center;
+        }
+    </style>
+</head>
+
+<body class="gray-bg">
+        <div class="ckxq">
+			<ul class="clearfix ckxq_ul">
+				<li class="Active">工单详情</li>
+				<li>工单记录</li>
+			</ul>
+			<div class="gdxq">
+				<div class="">
+					<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
+						<tbody class="tbodys">
+							<tr>
+								<th>工单编号：</th>
+								<td>
+									<span id="detailWorkOrderId"></span>
+								</td>
+								<th>工单来源：</th>
+								<td>
+									<span id="detailSource"></span>
+								</td>
+								<th>工单类型：</th>
+								<td>
+									<span id="detailType"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>大区：</th>
+								<td>
+									<span id="detailAreaName"></span>
+								</td>
+								<th>办事处：</th>
+								<td>
+									<span id="detailOfficeName"></span>
+								</td>
+								<th>投诉时间：</th>
+								<td>
+									<span id="detailCreateTime"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>工单级别：</th>
+								<td>
+									<span id="detailDealTimely"></span>
+								</td>
+								<th>原因：</th>
+								<td>
+									<span id="detailReason"></span>
+								</td>
+								<th>通知人：</th>
+								<td>
+									<span id="detailNotifications"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>姓名：</th>
+								<td>
+									<span id="detailCusName"></span>
+								</td>
+								<th>联系电话：</th>
+								<td>
+									<span id="detailCusPhone"></span>
+								</td>
+								<th>接听人：</th>
+								<td>
+									<span id="detailReceivingPerson"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>地址：</th>
+								<td>
+									<span id="detailAddress"></span>
+								</td>
+								<th>产品代码：</th>
+								<td>
+									<span id="detailProductType"></span>
+								</td>
+								<th>产品名称：</th>
+								<td>
+									<span id="detailProductName"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>规格：</th>
+								<td>
+									<span id="detailSpecifications"></span>
+								</td>
+								<th>生产日期：</th>
+								<td>
+									<span id="detailPRoductDate"></span>
+								</td>
+								<th>产品编码：</th>
+								<td>
+									<span id="detailBatchNumber"></span>
+								</td>									
+							</tr>
+							<tr>
+								<th>生产厂家：</th>
+								<td>
+									<span id="detailManufacturer"></span>
+								</td>
+								<th>问题代码：</th>
+								<td>
+									<span id="detailProblemCode"></span>
+								</td>
+								<th>质量问题：</th>
+								<td>
+									<span id="detailQualityProblem"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>序号：</th>
+								<td>
+									<span id="detailSerialNumber"></span>
+								</td>
+								<th>工单状态：</th>
+								<td>
+									<span id="detailState"></span>
+								</td>
+								<th>处理时间：</th>
+								<td>
+									<span id="detailDealTime"></span>
+								</td>
+							</tr>
+							<tr>
+								<th>落实情况：</th>
+								<td>
+									<span id="detailDealResult"></span>
+								</td>
+								<th>处理人：</th>
+								<td>
+									<span id="detailDealUser"></span>
+								</td>
+							</tr>
+							<tr>
+							<tr>
+								<th>备注：</th>
+								<td colspan="5" id="detailContent">
+								</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			<div class="gdxq" style="display:none;">
+				<div class="">
+					<table id="workOrderRecord" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+						<thead>
+							<tr>
+								<th data-field="F_WoState" data-width="20%" data-align="left" data-formatter="formatterWorkOrderRecordStatus">工单状态</th>
+								<th data-field="F_OptContent" data-align="left">内容</th>
+								<th data-field="F_CreateTime" data-width="10%" data-align="center">创建时间</th>
+							</tr>
+						</thead>
+					</table>
+				</div>
+			</div>
+		</div>
+		<div class="repeat-btn">
+            <button class="btns repeatSubmit">提&nbsp;交</button>
+        </div>
+        
+    <script src="../js/WorkOrder/WorkOrderDetails.js"></script>
+</body>
+
+</html>

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -151,13 +151,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -194,11 +188,11 @@
 							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
 							<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 							<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-							<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+							<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 							<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 							<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 							<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-							<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+							<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 							<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 							<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 							<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -211,8 +205,7 @@
 							<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 							<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-							<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-							<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+							<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 							<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 							<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 							<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -347,9 +340,9 @@
 									<td>
 										<span id="detailState"></span>
 									</td>
-									<th>重复工单：</th>
+									<th>处理时间：</th>
 									<td>
-										<span id="detailDuplicate"></span>
+										<span id="detailDealTime"></span>
 									</td>
 								</tr>
 								<tr>
@@ -361,10 +354,6 @@
 									<td>
 										<span id="detailDealUser"></span>
 									</td>
-									<th>处理时间：</th>
-									<td>
-										<span id="detailDealTime"></span>
-									</td>
 								</tr>
 								<tr>
 									<th>备注：</th>
@@ -540,7 +529,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -95,13 +95,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -138,11 +132,11 @@
 							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
 							<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 							<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-							<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+							<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 							<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 							<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 							<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-							<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+							<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 							<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 							<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 							<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -155,8 +149,7 @@
 							<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 							<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-							<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-							<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+							<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 							<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 							<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 							<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -287,9 +280,9 @@
 									<td>
 										<span id="detailState"></span>
 									</td>
-									<th>重复工单：</th>
+									<th>处理时间：</th>
 									<td>
-										<span id="detailDuplicate"></span>
+										<span id="detailDealTime"></span>
 									</td>
 								</tr>
 								<tr>
@@ -301,10 +294,6 @@
 									<td>
 										<span id="detailDealUser"></span>
 									</td>
-									<th>处理时间：</th>
-									<td>
-										<span id="detailDealTime"></span>
-									</td>
 								</tr>
 								<tr>
 									<th>备注：</th>
@@ -391,7 +380,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderProcessing.html

@@ -100,13 +100,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -143,11 +137,11 @@
 							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
 							<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 							<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-							<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+							<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 							<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 							<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 							<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-							<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+							<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 							<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 							<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 							<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -160,8 +154,7 @@
 							<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 							<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-							<th data-field="F_Type" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-							<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+							<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 							<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 							<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 							<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -292,9 +285,9 @@
 									<td>
 										<span id="detailState"></span>
 									</td>
-									<th>重复工单：</th>
+									<th>处理时间：</th>
 									<td>
-										<span id="detailDuplicate"></span>
+										<span id="detailDealTime"></span>
 									</td>
 								</tr>
 								<tr>
@@ -306,10 +299,6 @@
 									<td>
 										<span id="detailDealUser"></span>
 									</td>
-									<th>处理时间：</th>
-									<td>
-										<span id="detailDealTime"></span>
-									</td>
 								</tr>
 								<tr>
 									<th>备注：</th>
@@ -395,7 +384,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderRemark.html

@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="../css/init.css" rel="stylesheet" />
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/WorkOrder/Search.css" rel="stylesheet">
+    <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
+    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
+    <link rel="stylesheet" href="../css/init.css" />
+    <title>备注</title>
+    <style>
+        ul li {
+            float: initial;
+            list-style: none;
+        }
+		
+		.wrapper-content{
+			padding: 20px 50px 20px 0; 
+		}
+		
+        .common {
+            width: 100%;
+            text-align: center;
+            padding: 10px 0 0 0;
+        }
+
+        .common table {
+            width: 100%;
+        }
+
+        .common table th {
+            padding: 5px 8px 5px 0;
+        }
+
+        .common table td {
+            padding: 6px 0 5px 10px;
+            text-align: left;
+            color: #717171;
+            line-height: 200%;
+        }
+
+        .common table td textarea {
+            width: 100%;
+            vertical-align: middle;
+            resize: none;
+            outline: none;
+        }
+
+        .form-group {
+            margin-bottom: 0;
+        }
+
+        button[disabled] {
+            background-color: #999;
+        }
+        
+        .customerService .cont-title {
+        	text-align: center;
+        }
+        
+		
+    </style>
+</head>
+
+<body class="gray-bg">
+    <div class="clearfix wrapper wrapper-content animated fadeInRight">
+        <div class="common">
+            <table class="customerService">
+            	<tbody>
+					<tr>
+                        <th class="cont-title">内容：</th>
+                        <td colspan="7">
+                            <textarea name="" rows="5" cols="" placeholder="" id="cont" style="margin-top:10px;"></textarea>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td colspan="8" style="text-align: center;">
+                            <button class="btns customerSubmit">确&nbsp;定</button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <script src="../js/WorkOrder/jquery.editable-select.js"></script>
+    <script src="../js/comboSelect/jquery.combo.select.js"></script>
+    <script src="../js/WorkOrder/WorkOrderRemark.js"></script>
+</body>
+
+</html>

CallCenterWeb.UI/WorkOrder/WorkOrderRepeat.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="../css/init.css" rel="stylesheet" />
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/WorkOrder/Search.css" rel="stylesheet">
+    <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
+    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
+    <link rel="stylesheet" href="../css/init.css" />
+    <title>重复工单</title>
+    <style>
+        ul li {
+            float: initial;
+            list-style: none;
+        }
+		
+		.wrapper-content{
+			padding: 20px 50px 20px 0; 
+		}
+		
+        .common {
+            width: 100%;
+            text-align: center;
+            padding: 10px 0 0 0;
+        }
+
+        .common table {
+            width: 100%;
+        }
+
+        .common table th {
+            padding: 5px 8px 5px 0;
+        }
+
+        .common table td {
+            padding: 6px 0 5px 10px;
+            color: #717171;
+            line-height: 200%;
+        }
+
+        .common table td textarea {
+            width: 100%;
+            vertical-align: middle;
+            resize: none;
+            outline: none;
+        }
+
+        .form-group {
+            margin-bottom: 0;
+        }
+
+        button[disabled] {
+            background-color: #999;
+        }
+        
+        .customerService .tel-title {
+        	text-align: center;
+        }
+        
+        .customerService .tel-input{
+        	width: 50%
+        }
+		
+    </style>
+</head>
+
+<body class="gray-bg">
+    <div class="clearfix wrapper wrapper-content animated fadeInRight">
+        <div class="common">
+            <table class="customerService">
+            	<tbody>
+					<tr>
+                        <th class="tel-title">手机号：</th>
+                        <td>
+                            <div class="form-group tel-input">
+                                <input type="text" class="form-control" id="repeatPhone"/>
+                            </div>
+                        </td>
+                        <td>
+                            <button class="btns customerSubmit">搜&nbsp;索</button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div style="width: 100%;padding: 10px;">
+			<table id="workorderlist" class="market" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+                <thead>
+                    <tr>
+                    	<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
+                    	<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
+                    	<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
+                    	<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+						<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
+						<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
+						<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
+						<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
+						<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
+						<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
+						<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
+						<th data-field="F_ProductDate" data-class="W100" data-align="center">生产日期</th>
+						<th data-field="F_BatchNumber" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品编码</th>
+						<th data-field="F_Manufacturer" data-class="W160" data-formatter="formatterCharacterLength" data-align="center">生产厂家</th>
+						<th data-field="F_ProblemCode" data-class="W100" data-align="center">问题代码</th>
+						<th data-field="F_QualityProblem" data-class="W160" data-formatter="formatterCharacterLength" data-align="center">质量问题</th>
+						<th data-field="F_Notifications" data-class="W100" data-align="center">通知人</th>
+						<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
+						<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
+						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
+						<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
+					</tr>
+                </thead>
+            </table>
+        </div>
+    </div>
+
+    <script src="../js/WorkOrder/jquery.editable-select.js"></script>
+    <script src="../js/comboSelect/jquery.combo.select.js"></script>
+    <script src="../js/WorkOrder/WorkOrderRepeat.js"></script>
+</body>
+
+</html>

CallCenterWeb.UI/WorkOrder/WorkOrderReturnAssigned.html

@@ -84,13 +84,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -127,11 +121,11 @@
                     	<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
                     	<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 						<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-						<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+						<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 						<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 						<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 						<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-						<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+						<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 						<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 						<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 						<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -144,8 +138,7 @@
 						<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 						<th data-field="F_DealResult" data-class="W300" data-align="center" data-formatter="formatterAddressResult">落实情况</th>
 						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-						<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-						<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+						<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 						<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 						<!--<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">工单状态</th>-->
 						<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
@@ -276,9 +269,9 @@
 									<td>
 										<span id="detailState"></span>
 									</td>
-									<th>重复工单：</th>
+									<th>处理时间：</th>
 									<td>
-										<span id="detailDuplicate"></span>
+										<span id="detailDealTime"></span>
 									</td>
 								</tr>
 								<tr>
@@ -290,10 +283,6 @@
 									<td>
 										<span id="detailDealUser"></span>
 									</td>
-									<th>处理时间：</th>
-									<td>
-										<span id="detailDealTime"></span>
-									</td>
 								</tr>
 								<tr>
 									<th>备注：</th>
@@ -384,7 +373,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderReturnSubmit.html

@@ -85,13 +85,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -128,11 +122,11 @@
                     	<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
                     	<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
                     	<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-                    	<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+                    	<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 						<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 						<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 						<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-						<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+						<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 						<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 						<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 						<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -145,8 +139,7 @@
 						<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 						<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-						<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-						<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+						<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 						<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 						<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 						<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -275,9 +268,9 @@
 								<td>
 									<span id="detailState"></span>
 								</td>
-								<th>重复工单：</th>
+								<th>处理时间：</th>
 								<td>
-									<span id="detailDuplicate"></span>
+									<span id="detailDealTime"></span>
 								</td>
 							</tr>
 							<tr>
@@ -289,10 +282,6 @@
 								<td>
 									<span id="detailDealUser"></span>
 								</td>
-								<th>处理时间：</th>
-								<td>
-									<span id="detailDealTime"></span>
-								</td>
 							</tr>
 							<tr>
 							<tr>
@@ -379,7 +368,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -132,13 +132,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -175,11 +169,11 @@
 							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
 							<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 							<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-							<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+							<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 							<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 							<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 							<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-							<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+							<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 							<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 							<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 							<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -192,8 +186,7 @@
 							<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 							<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 							<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-							<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-							<th data-field="F_Duplicate" data-class="W100" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+							<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 							<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 							<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 							<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -201,8 +194,8 @@
 							<!--<th data-field="F_DealTime" data-class="W100" data-align="center">处理时间</th>-->
 							<!--<th data-field="F_Returnnote" data-class="W100" data-align="center">退回说明</th>-->
 							<!--<th data-field="F_Content" data-class="W160" data-align="center">备注</th>-->
-							<!--<th data-field="" data-class="workOprate workOprate7 W220" data-align="center">操作</th>-->	
 							<!--<th data-field="F_WorkOrderId" data-formatter="formatterIntegratedQuery" data-align="center">操作</th>-->	
+							<th data-field="" data-class="workOprate workOprate7 W200" data-formatter = "formatterIntegratedQuery" data-align="center">操作</th>	
 						</tr>
 					</thead>
 				</table>
@@ -325,9 +318,9 @@
 									<td>
 										<span id="detailState"></span>
 									</td>
-									<th>重复工单：</th>
+									<th>处理时间：</th>
 									<td>
-										<span id="detailDuplicate"></span>
+										<span id="detailDealTime"></span>
 									</td>
 								</tr>
 								<tr>
@@ -339,10 +332,6 @@
 									<td>
 										<span id="detailDealUser"></span>
 									</td>
-									<th>处理时间：</th>
-									<td>
-										<span id="detailDealTime"></span>
-									</td>
 								<tr>
 								<tr>
 									<th>备注：</th>
@@ -429,7 +418,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/WorkOrderSubmit.html

@@ -94,13 +94,7 @@
 								<option value="">请选择工单类别</option>
 								<option value="1">咨询</option>
 								<option value="2">投诉</option>
-							</select>
-						</div>
-						<div class="form-group">
-							<select class="form-control" id="searchOrderRepeat">
-								<option value="">请选择重复工单</option>
-								<option value="0">未重复</option>
-								<option value="1">重复</option>
+								<option value="3">重复</option>
 							</select>
 						</div>
 						<div class="form-group">
@@ -137,11 +131,11 @@
                     	<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
                     	<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
                     	<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
-                    	<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+                    	<th data-field="F_CreateTime" data-class="W300" data-formatter="formatterAddressResult" data-align="center">投诉时间</th>
 						<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
 						<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
 						<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
-						<th data-field="F_CusPhone" data-class="W100" data-align="center">联系电话</th>
+						<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
 						<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
 						<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
 						<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
@@ -154,8 +148,7 @@
 						<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
 						<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
 						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
-						<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-						<th data-field="F_Duplicate" data-class="W60margin" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
+						<th data-field="F_Type" data-class="W60margin" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
 						<!--<th data-field="F_Source" data-class="W100" data-formatter="workOrderSourceJudge" data-align="center">工单来源</th>-->
 						<!--<th data-field="F_DealTimely" data-class="W100" data-align="center">工单级别</th>-->
 						<!--<th data-field="F_Reason" data-class="W100" data-align="center">原因</th>-->
@@ -284,9 +277,9 @@
 								<td>
 									<span id="detailState"></span>
 								</td>
-								<th>重复工单：</th>
+								<th>处理时间：</th>
 								<td>
-									<span id="detailDuplicate"></span>
+									<span id="detailDealTime"></span>
 								</td>
 							</tr>
 							<tr>
@@ -298,10 +291,6 @@
 								<td>
 									<span id="detailDealUser"></span>
 								</td>
-								<th>处理时间：</th>
-								<td>
-									<span id="detailDealTime"></span>
-								</td>
 							</tr>
 							<tr>
 							<tr>
@@ -402,7 +391,6 @@
 							problemCode: $("#searchProblemCode").val(), //问题代码
 							notifications: $("#searchNotifications").val(), //通知人
 							type: $("#searchOrderType").val(), //工单类别
-							duplicate: $("#searchOrderRepeat").val(),//重复工单
 							dealTimely: $("#searchDealTimely").val(), // 工单级别
 							see: $("#searchSee").val(), //	处理专员是否只查看负责区域单子
 //							source: $("#searchOrderSource").val(), //工单来源

CallCenterWeb.UI/WorkOrder/Xga.html

@@ -188,14 +188,18 @@
 						<th>工单类型:</th>
                         <td>
                         	<div id="order_isover" class="col-md-6 r_order_type">
-                        		<input class="radio-input" id="work-order-radio-advisory" type="radio" name="type" value="1" checked="checked">
-								<label class="radio-inline" for="work-order-radio-advisory">
+                        		<input class="radio-input" id="workOrderRadioAdvisory" type="radio" name="type" value="1" checked="checked">
+								<label class="radio-inline" for="workOrderRadioAdvisory">
 					   				咨询
 								</label>
-								<input class="radio-input" id="work-order-radio-complaint" type="radio" name="type" value="2" >
-								<label class="radio-inline" for="work-order-radio-complaint">
+								<input class="radio-input" id="workOrderRadioComplaint" type="radio" name="type" value="2" >
+								<label class="radio-inline" for="workOrderRadioComplaint">
 					   				投诉
 								</label>
+								<input class="radio-input" id="workOrderRadioRepeat" type="radio" name="type" value="3" />
+								<label class="radio-inline" for="workOrderRadioRepeat">
+									重复
+								</label>
 							</div>
                         </td>
 					</tr>
@@ -209,7 +213,7 @@
                         <th><i style="color: #FF0000">*&nbsp;</i>电话:</th>
                         <td>
                             <div class="form-group">
-                                <input type="text" class="form-control" id="tel" maxlength='11' onkeyup="value=value.replace(/[^\d]/g,'')" />
+                                <input type="text" class="form-control" id="tel" />
                             </div>
                         </td>
                     </tr>
@@ -324,21 +328,6 @@
                         </td>
 					</tr>
 					<tr></tr>
-					<tr>
-						<th>重复工单:</th>
-                        <td>
-                        	<div id="duplicate" class="col-md-6 r_order_type">
-                        		<input class="radio-input" id="duplicate-no" type="radio" name="duplicate" value="0" checked="checked">
-								<label class="radio-inline" for="duplicate-no">
-					   				否
-								</label>
-				   				<input class="radio-input" id="duplicate-yes" type="radio" name="duplicate" value="1" >
-								<label class="radio-inline" for="duplicate-yes">
-									是
-								</label>
-							</div>
-                        </td>
-					</tr>
                     <tr></tr>
                     <tr>
                         <th>备注:</th>

CallCenterWeb.UI/callScreen/call.js

@@ -370,6 +370,14 @@ $(document).ready(function () {
    			return false;
 		}
 	});
+	
+    //重复工单
+	$('#order_isover').find('input[type="radio"]').on('change', function() {
+		if($(this).val() === '3') {
+			radioRepeat();
+    		$("#order_isover input[name='type'][value='1']").prop("checked","checked"); //咨询
+		}
+	});
 
     //历史记录查询
     $(".searchbtn").click(function () {
@@ -453,15 +461,12 @@ function loadOld() {
             queryParamsType: "undefined",
             queryParams: function queryParams(params) { //设置查询参数
                 var param = {
-                    page: params.pageNumber,
-                    pagesize: params.pageSize,
-                    keywords: $("#tel").val(),
                     starttime: $("#con_startTime").val(),
                     endtime: $("#con_endTime").val(),
+                    keywords: $(".hidTel").val(),
                     token: $.cookie("token"),
-                    isldtp: 1,
-                    fkdep: $("#fkdep").val()
-
+					pageindex: params.pageNumber, //页码
+					pagesize: params.pageSize, //条数
                 };
                 return param;
             },
@@ -594,16 +599,7 @@ function workOrderTypeJudge (val, row) {
 		return '<div>咨询</div>';
 	} else if (val === 2) {
 		return '<div>投诉</div>';
-	} else {
-		return '<div></div>';
-	}
-}
-
-// 重复工单返回值判断
-function workOrderDuplicateJudge (val, row) {
-	if (val === 0) {
-		return '<div>未重复</div>';
-	} else if (val === 1) {
+	} else if (val === 3) {
 		return '<div>重复</div>';
 	} else {
 		return '<div></div>';
@@ -802,7 +798,19 @@ $(".setwin").click(function () {
     $('audio')[0].pause();
 });
 
-//修改
+
+// 重复工单
+function radioRepeat(id){
+	layer.open({
+		type: 2,
+		title: '重复工单',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['80%', '90%'],
+		content: "./work_order_repeat.html?id=" + id
+	});
+}
+
+//工单详情
 function btn_order_details(val) {
 	var id = val;
 	layer.open({
@@ -814,6 +822,8 @@ function btn_order_details(val) {
 		//              content: 'addZhiShiKuManger.html?addId=' + id + '&addPid='+ pid +'&addName='+ name +''
 	});
 }
+
+
 function GetDealState(val) {
 	if(val == '1') {
 		return '已处理';

CallCenterWeb.UI/callScreen/callScreen.html

@@ -599,7 +599,7 @@
 						<tr>
 							<th>省份：</th>
                             <td>
-                                <input type="text" id="shengshi" readonly="readonly">
+                                <input type="text" id="shengshi" readonly="readonly" autocomplete="off">
                                 <div class="time-box time-box_flbox" style="position: relative;">
                                     <input type="hidden" class="khprovince">
                                     <input type="hidden" class="khcity">
@@ -646,6 +646,9 @@
 											<label class="radio-inline">
 											   <input type="radio" name="type" value="2" > 投诉
 											</label>
+											<label class="radio-inline">
+											   <input type="radio" name="type" value="3" > 重复
+											</label>
 										</div>
 									</div>
                                     <table class="customerService">
@@ -660,7 +663,7 @@
                                                 <th><i style="color: #FF0000">*&nbsp;</i>电话:</th>
                                                 <td>
                                                     <div class="form-group">
-                                                        <input type="text" class="form-control" id="tel" maxlength="11" onkeyup="value=value.replace(/[^\d]/g,'')" />
+                                                        <input type="text" class="form-control" id="tel" />
                                                     </div>
                                                 </td>
 												<!--<th>大区:</th>
@@ -806,19 +809,6 @@
                                                 </td>
 											</tr>
 											<tr>
-												<th>重复工单:</th>
-                                                <td>
-                                                	<div id="duplicate" class="col-md-6 r_order_type">
-														<label class="radio-inline">
-											   				<input type="radio" name="duplicate" value="0" checked="checked"> 否
-														</label>
-														<label class="radio-inline">
-											   				<input type="radio" name="duplicate" value="1" > 是
-														</label>
-													</div>
-                                                </td>
-											</tr>
-											<tr>
 												<th>是否指派:</th>
                                                 <td>
                                                 	<div id="isAssign" class="col-md-6 r_order_type">
@@ -979,16 +969,6 @@
                                     <table id="orderlist" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
                                         <thead>
                                             <tr>
-                                                <!--<th data-field="F_WorkOrderId" data-formatter="View" data-align="center">工单编号</th>
-                                                <th data-field="F_State" data-formatter="GetStateName" data-align="center">工单状态</th>
-                                                <th data-field="SourceName" data-align="center">工单来源</th>
-                                                <th data-field="TypeName" data-align="center">工单类型</th>
-                                                <th data-field="F_CusName" data-align="center" data-class="E73">姓名</th>
-                                                <th data-field="F_CusPhone" data-align="center">客户电话</th>
-                                                <th data-field="F_DealUser" data-align="center">受理人</th>
-                                                <th data-field="F_CreateTime" data-align="center">创建时间</th>
-                                                <th data-field="F_Content" data-align="center" data-formatter="Detail" style="width:500px;">投诉事件描述</th>-->
-                                                
                     							<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
 												<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
 												<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
@@ -1010,7 +990,6 @@
 												<th data-field="F_DealResult" data-class="W100" data-align="center">落实情况</th>
 												<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
 												<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
-												<th data-field="F_Duplicate" data-class="W100" data-formatter="workOrderDuplicateJudge" data-align="center">重复工单</th>
                                             </tr>
                                         </thead>
                                         <tbody class="list"></tbody>

CallCenterWeb.UI/callScreen/work_order_details.html

@@ -26,6 +26,13 @@
         .ckxq .ckxq_ul li{
         	display: inline-block;
         }
+        
+	    .repeat-btn{
+        	width: 100%;
+        	margin: 30px 0 0 0;
+        	text-align: center;
+        }
+
     </style>
 </head>
 
@@ -146,9 +153,9 @@
 								<td>
 									<span id="detailState"></span>
 								</td>
-								<th>重复工单：</th>
+								<th>处理时间：</th>
 								<td>
-									<span id="detailDuplicate"></span>
+									<span id="detailDealTime"></span>
 								</td>
 							</tr>
 							<tr>
@@ -160,10 +167,6 @@
 								<td>
 									<span id="detailDealUser"></span>
 								</td>
-								<th>处理时间：</th>
-								<td>
-									<span id="detailDealTime"></span>
-								</td>
 							</tr>
 							<tr>
 							<tr>
@@ -189,6 +192,10 @@
 				</div>
 			</div>
 		</div>
+		<div class="repeat-btn">
+            <button class="btns repeatSubmit">提&nbsp;交</button>
+        </div>
+        
 	<script type="text/javascript" src="./work_order_details.js"></script>
 </body>
 

CallCenterWeb.UI/callScreen/work_order_details.js

@@ -15,6 +15,12 @@ $(document).ready(function () {
 			getWorkOrderRecord();
 		}
 	});
+	
+	//提交
+	$(".repeatSubmit").click(function() {
+		submitRepeatWorkOrder();
+	})
+
 })
 
 
@@ -50,7 +56,6 @@ function getWorkOrderDetails() {
 				$("#detailReceivingPerson").text(data.F_ReceivingPerson);
 				$("#detailSerialNumber").text(data.F_SerialNumber);
 				$("#detailState").text(workOrderDetailsStateJudge(data)); //工单状态
-				$("#detailDuplicate").text(workOrderDetailsDuplicateJudge(data)); //重复工单
 				$("#detailContent").text(data.F_Content);
 				$("#detailDealResult").text(data.F_DealResult); //落实情况
 				$("#detailDealUser").text(data.F_DealUser);
@@ -123,6 +128,8 @@ function workOrderDetailsTypeJudge (data) {
 		return '咨询';
 	} else if (data.F_Type === 2) {
 		return '投诉';
+	} else if (data.F_Type === 3) {
+		return '重复';
 	} else {
 		return '';
 	}
@@ -151,17 +158,6 @@ function workOrderDetailsStateJudge (data) {
 	}
 }
 
-// 工单详情中重复工单返回值判断
-function workOrderDetailsDuplicateJudge (data) {
-	if (data.F_Duplicate === 0) {
-		return '未重复';
-	} else if (data.F_Duplicate === 1) {
-		return '重复';
-	} else {
-		return '';
-	}
-}
-
 // 工单记录中工单状态返回值判断
 function formatterWorkOrderRecordStatus(val, row) {
     var formatterWorkOrderRecordStatusStr = '';
@@ -191,3 +187,38 @@ function formatterWorkOrderRecordStatus(val, row) {
     }
 	return formatterWorkOrderRecordStatusStr;
 }
+
+// 提交重复工单
+function submitRepeatWorkOrder () {
+	var laye = layer.confirm("您确定要提交重复工单吗？", {
+		btn: ["确定", "取消"]
+	},  function () {
+            $.ajax({
+                type: "post",
+                url: huayi.config.callcenter_url + "WorkOrder/Repeat",
+                async: true,
+                dataType: "json",
+                data: {
+                    token: $.cookie("token"),
+                    orderid: selid,
+                    isbj: 1
+                },
+                success: function (data) {
+                    if (data.state.toLowerCase() == 'success') {
+                        layer.msg("标记重复工单成功！");
+                        //工单列表
+                        parent.$("#workorderlist").bootstrapTable('refresh');
+                        //历史工单列表
+                        parent.$("#orderlist").bootstrapTable('refresh');
+                        //工单详情
+                        getWorkOrderDetails();
+                        getWorkOrderRecord();
+                    } else {
+                        layer.msg("标记重复工单失败！");
+                    }
+                }
+            });
+	}, function(){
+        layer.close(laye)
+	})
+}

CallCenterWeb.UI/callScreen/work_order_repeat.html

@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="../css/init.css" rel="stylesheet" />
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/WorkOrder/Search.css" rel="stylesheet">
+    <link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
+    <link rel="stylesheet" href="../js/comboSelect/combo.select.css" />
+    <link rel="stylesheet" href="../css/init.css" />
+    <title>重复工单</title>
+    <style>
+        ul li {
+            float: initial;
+            list-style: none;
+        }
+		
+		.wrapper-content{
+			padding: 20px 50px 20px 0; 
+		}
+		
+        .common {
+            width: 100%;
+            text-align: center;
+            padding: 10px 0 0 0;
+        }
+
+        .common table {
+            width: 100%;
+        }
+
+        .common table th {
+            padding: 5px 8px 5px 0;
+        }
+
+        .common table td {
+            padding: 6px 0 5px 10px;
+            color: #717171;
+            line-height: 200%;
+        }
+
+        .common table td textarea {
+            width: 100%;
+            vertical-align: middle;
+            resize: none;
+            outline: none;
+        }
+
+        .form-group {
+            margin-bottom: 0;
+        }
+
+        button[disabled] {
+            background-color: #999;
+        }
+        
+        .customerService .tel-title {
+        	text-align: center;
+        }
+        
+        .customerService .tel-input{
+        	width: 50%
+        }
+		
+    </style>
+</head>
+
+<body class="gray-bg">
+    <div class="clearfix wrapper wrapper-content animated fadeInRight">
+        <div class="common">
+            <table class="customerService">
+            	<tbody>
+					<tr>
+                        <th class="tel-title">手机号：</th>
+                        <td>
+                            <div class="form-group tel-input">
+                                <input type="text" class="form-control" id="repeatPhone"/>
+                            </div>
+                        </td>
+                        <td>
+                            <button class="btns customerSubmit">搜&nbsp;索</button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        <div style="width: 100%;padding: 10px;">
+			<table id="workorderlist" class="market" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+                <thead>
+                    <tr>
+                    	<th data-field="F_WorkOrderId" data-class="W160" data-formatter="View" data-align="center">工单编号</th>
+                    	<th data-field="F_AreaName" data-class="W100" data-align="center">大区</th>
+                    	<th data-field="F_OfficName" data-class="W100" data-align="center">办事处</th>
+                    	<th data-field="F_CreateTime" data-class="W160" data-align="center">投诉时间</th>
+						<th data-field="F_SerialNumber" data-class="W100" data-align="center">序号</th>
+						<th data-field="F_CusName" data-class="W160" data-align="center">姓名</th>
+						<th data-field="F_AddRess" data-class="W300" data-formatter="formatterAddressResult" data-align="center">地址</th>
+						<th data-field="F_CusPhone" data-class="W300" data-formatter="formatterAddressResult" data-align="center">联系电话</th>
+						<th data-field="F_ProductType" data-class="W100" data-align="center">产品代码</th>
+						<th data-field="F_ProductName" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品名称</th>
+						<th data-field="F_Specifications" data-class="W100" data-formatter="formatterCharacterLength" data-align="center">规格</th>
+						<th data-field="F_ProductDate" data-class="W100" data-align="center">生产日期</th>
+						<th data-field="F_BatchNumber" data-class="W300" data-formatter="formatterAddressResult" data-align="center">产品编码</th>
+						<th data-field="F_Manufacturer" data-class="W160" data-formatter="formatterCharacterLength" data-align="center">生产厂家</th>
+						<th data-field="F_ProblemCode" data-class="W100" data-align="center">问题代码</th>
+						<th data-field="F_QualityProblem" data-class="W160" data-formatter="formatterCharacterLength" data-align="center">质量问题</th>
+						<th data-field="F_Notifications" data-class="W100" data-align="center">通知人</th>
+						<th data-field="F_ReceivingPerson" data-class="W100" data-align="center">接听人</th>
+						<th data-field="F_DealResult" data-class="W300" data-formatter="formatterAddressResult" data-align="center">落实情况</th>
+						<th data-field="F_State" data-class="W100" data-formatter="workOrderStateJudge" data-align="center">处理进度</th>
+						<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>
+					</tr>
+                </thead>
+            </table>
+        </div>
+    </div>
+
+    <script src="../js/WorkOrder/jquery.editable-select.js"></script>
+    <script src="../js/comboSelect/jquery.combo.select.js"></script>
+    <script src="./work_order_repeat.js"></script>
+</body>
+
+</html>

CallCenterWeb.UI/callScreen/work_order_repeat.js

@@ -0,0 +1,155 @@
+var id = helper.request.queryString("id");
+$(document).ready(function () {
+    //搜索
+    $('.customerSubmit').click(function() {
+        initTable();
+    });
+    $('#repeatPhone').bind('keypress', function (event) {
+  		if (event.keyCode == "13") {
+  			initTable();
+   			return false;
+		}
+	});
+	//获取工单列表
+	initTable();
+})
+
+//工单列表
+function initTable() {
+    //先销毁表格
+    $('#workorderlist').bootstrapTable('destroy');
+    //初始化表格,动态从服务器加载数据
+    $("#workorderlist").bootstrapTable({
+        method: "get",  //使用get请求到服务器获取数据
+        url: huayi.config.callcenter_url + "WorkOrder/GetList", //获取数据的Servlet地址
+        contentType: 'application/x-www-form-urlencoded',
+        striped: true,  //表格显示条纹
+        pagination: true, //启动分页
+        pageSize: 10,  //每页显示的记录数
+        pageNumber: 1, //当前第几页
+        pageList: [10, 20, 50, 100],  //记录数可选列表
+        search: false,  //是否启用查询
+        showColumns: false,  //显示下拉框勾选要显示的列
+        showRefresh: false,  //显示刷新按钮
+        sidePagination: "server", //表示服务端请求
+        //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+        //设置为limit可以获取limit, offset, search, sort, order
+        queryParamsType: "undefined",
+        queryParams: function queryParams(params) { //设置查询参数
+				var param = {
+					state: "",
+					token: $.cookie("token"),
+					code: "", //工单编号
+					area: "", //大区
+					office: "", //办事处
+					starttime: "", //开始时间
+					endtime: "", //结束时间
+					keywords: $("#repeatPhone").val(),//联系电话
+					productType: "", //产品代码
+					productDate: "", //生产日期
+					batchNumber: "", //产品编码
+					manufacturer: "", //生产厂家
+					problemCode: "", //问题代码
+					notifications: "", //通知人
+					type: "", //工单类别
+					dealTimely: "", // 工单级别
+					see: "", //	处理专员是否只查看负责区域单子
+					pageindex: params.pageNumber, //页码
+					pagesize: params.pageSize, //条数
+				};
+				return param;
+			},
+        onLoadSuccess: function () {  //加载成功时执行
+        },
+        onLoadError: function () {  //加载失败时执行
+        }
+    });
+}
+
+// 工单编号
+function View(val, row) {
+	if (row.F_DealTimely === "Ⅰ级") {
+		return '<div class="imgs" ><a class="xg workOrderIdColorRed" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	} else if (row.F_DealTimely === "Ⅱ级") {
+		return '<div class="imgs" ><a class="xg workOrderIdColorGreen" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	} else if (row.F_DealTimely === "普通工单") {
+		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	} else {
+		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	}
+	$("#F_UserCode").val(row.CreateUser);
+}
+
+
+//格式化 字符长度 25
+function formatterAddressResult(val) {
+	if(val) {
+		var strAddressResult = decodeURIComponent(val);
+		strAddressResult = helper.filter.filterHTMLTag(strAddressResult);
+		if(strAddressResult.length > 25) {
+			strAddressResult = strAddressResult.substring(0, 25) + '...';
+		}
+		return strAddressResult;
+	}
+}
+
+//格式化 字符长度 8
+function formatterCharacterLength(val) {
+	if(val) {
+		var characterLength = decodeURIComponent(val);
+		characterLength = helper.filter.filterHTMLTag(characterLength);
+		if(characterLength.length > 8) {
+			characterLength = characterLength.substring(0, 8) + '...';
+		}
+		return characterLength;
+	}
+}
+
+// 工单状态返回值判断
+function workOrderStateJudge (val, row) {
+	if (val === 0) {
+		return '<div>待提交</div>';
+	} else if (val === 1) {
+		return '<div>待分派</div>';
+	} else if (val === 2) {
+		return '<div>待接单</div>';
+	} else if (val === 3) {
+		return '<div>待处理</div>';
+	} else if (val === 4) {
+		return '<div>处理中</div>';
+	} else if (val === 5) {
+		return '<div>退回待分派</div>';
+	} else if (val === 6) {
+		return '<div>退回待提交</div>';
+	} else if (val === 10) {
+		return '<div>已完成</div>';
+	} else {
+		return '<div></div>';
+	}
+}
+
+// 工单类别返回值判断
+function workOrderTypeJudge (val, row) {
+	if (val === 1) {
+		return '<div>咨询</div>';
+	} else if (val === 2) {
+		return '<div>投诉</div>';
+	} else if (val === 3) {
+		return '<div>重复</div>';
+	} else {
+		return '<div></div>';
+	}
+}
+
+// 工单详情
+function btn_order_details(val) {
+	var id = val;
+	layer.open({
+		type: 2,
+		title: '工单详情',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['80%', '90%'],
+		content: './work_order_details.html?id=' + id
+	});
+}
+

CallCenterWeb.UI/css/WorkOrder/Search.css

@@ -468,10 +468,10 @@ textarea {
     width:160px !important;
 }
 .W300{
-	width: 300px;
+	width: 310px;
 }
 .W300 .th-inner{
-	width: 300px;
+	width: 310px;
 }
 .W200 .th-inner {
    width:200px !important;

CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

@@ -113,7 +113,7 @@ $(document).ready(function () {
         $("#vipTel").val($("#vipName option:selected").attr("index"));
         if ($("#vipName option:selected").attr("province")==undefined) {
         	$("#typeclass").val("");
-        }else{
+        } else {
         	$("#typeclass").val($("#vipName option:selected").attr("province") + "/" + $("#vipName option:selected").attr("city"));
 	        $(".inps2").val($("#vipName option:selected").attr("province"));
 	        $(".inps3").val($("#vipName option:selected").attr("city"));
@@ -121,6 +121,13 @@ $(document).ready(function () {
        
     });
     
+    //重复工单
+	$('#order_isover').find('input[type="radio"]').on('change', function() {
+		if($(this).val() === '3') {
+			radioRepeat();
+    		$("#order_isover input[name='type'][value='1']").prop("checked","checked"); //咨询
+		}
+	});
     
 })
 
@@ -605,6 +612,8 @@ function saveCustomer() {
 	});
 }
 
+
+
 function clear() {
     $('#name').val('');
     $('#tel').val(''); //号码
@@ -626,4 +635,15 @@ function clear() {
     $('#customer_submitter').val('');
 //  $('#cont').val('');
     $('#remark').val('');
+}
+
+// 重复工单
+function radioRepeat(id){
+	layer.open({
+		type: 2,
+		title: '重复工单',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['80%', '90%'],
+		content: "../WorkOrder/WorkOrderRepeat.html?id=" + id
+	});
 }

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -165,6 +165,8 @@ function workOrderTypeJudge (val, row) {
 		return '<div>咨询</div>';
 	} else if (val === 2) {
 		return '<div>投诉</div>';
+	} else if (val === 3) {
+		return '<div>重复</div>';
 	} else {
 		return '<div></div>';
 	}
@@ -193,30 +195,19 @@ function workOrderStateJudge (val, row) {
 	}
 }
 
-// 重复工单返回值判断
-function workOrderDuplicateJudge (val, row) {
-	if (val === 0) {
-		return '<div>未重复</div>';
-	} else if (val === 1) {
-		return '<div>重复</div>';
-	} else {
-		return '<div></div>';
-	}
-}
-
-//格式化地址、落实情况
+//格式化 字符长度 25
 function formatterAddressResult(val) {
 	if(val) {
 		var strAddressResult = decodeURIComponent(val);
 		strAddressResult = helper.filter.filterHTMLTag(strAddressResult);
-		if(strAddressResult.length > 20) {
-			strAddressResult = strAddressResult.substring(0, 20) + '...';
+		if(strAddressResult.length > 25) {
+			strAddressResult = strAddressResult.substring(0, 25) + '...';
 		}
 		return strAddressResult;
 	}
 }
 
-//格式化产品编码、质量问题
+//格式化 字符长度 8
 function formatterCharacterLength(val) {
 	if(val) {
 		var characterLength = decodeURIComponent(val);
@@ -270,7 +261,6 @@ function getWorkOrderDetails() {
 				$("#detailReceivingPerson").text(data.F_ReceivingPerson);
 				$("#detailSerialNumber").text(data.F_SerialNumber);
 				$("#detailState").text(workOrderDetailsStateJudge(data)); //工单状态
-				$("#detailDuplicate").text(workOrderDetailsDuplicateJudge(data)); //重复工单
 				$("#detailContent").text(data.F_Content);
 				$("#detailDealResult").text(data.F_DealResult); //落实情况
 				$("#detailDealUser").text(data.F_DealUser);
@@ -342,6 +332,8 @@ function workOrderDetailsTypeJudge (data) {
 		return '咨询';
 	} else if (data.F_Type === 2) {
 		return '投诉';
+	} else if (data.F_Type === 3) {
+		return '重复';
 	} else {
 		return '';
 	}
@@ -444,18 +436,21 @@ function authorizeOperateButton(userRoleCode) {
 		case "JDYPTZX": // 普通坐席 创建 提交
 		case "JDYBZZX": // 坐席班长 创建 提交
 				$('.tool_downs').find('[id*="HY_submit"]').show(); //指派
-				$('.tool_downs').find('[id*="HY_edit"]').show(); // 修改
-				$('.tool_downs').find('[id*="HY_mark"]').show(); // 标记
+				$('.tool_downs').find('[id*="HY_edit"]').show(); //修改
+				$('.tool_downs').find('[id*="HY_mark"]').show(); //标记
+				$('.tool_downs').find('[id*="HY_remark_"]').show(); //备注
 				$('.tool_downs').find('[id*="HY_delete"]').hide(); //删除
 				$('.tool_downs').find('[id*="HY_return"]').hide(); //退回
 				$('.tool_downs').find('[id*="HY_order"]').hide(); //接单
 				$('.tool_downs').find('[id*="HY_dealWith"]').hide(); //处理
 				$('#workorderlist').find('.workOprate1').show(); //待指派
+				$('#workorderlist').find('.workOprate7').show(); //综合查询
 			break;
 		case "BSCJL": // 办事处经理 转派、退回、修改、删除、
 				$('.tool_downs').find('[id*="HY_transfer"]').show(); //指派
 				$('.tool_downs').find('[id*="HY_mark"]').show(); // 标记
 				$('.tool_downs').find('[id*="HY_edit"]').hide(); // 修改
+				$('.tool_downs').find('[id*="HY_remark_"]').hide(); //备注
 				$('.tool_downs').find('[id*="HY_delete"]').hide(); //删除
 				$('.tool_downs').find('[id*="HY_return"]').show(); //退回
 				$('.tool_downs').find('[id*="HY_order"]').hide(); //接单
@@ -471,6 +466,7 @@ function authorizeOperateButton(userRoleCode) {
 				$('.tool_downs').find('[id*="HY_mark"]').show(); // 标记
 				$('.tool_downs').find('[id*="HY_delete"]').hide(); //删除
 				$('.tool_downs').find('[id*="HY_edit"]').hide(); //修改
+				$('.tool_downs').find('[id*="HY_remark_"]').hide(); //备注
 				$('.tool_downs').find('[id*="HY_dealWith"]').show(); //处理
 				$('.tool_downs').find('[id*="HY_return"]').show();//退回
 				$('.tool_downs').find('[id*="HY_order"]').show();//接单
@@ -490,6 +486,7 @@ function formatterSubmit(val, row) {
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_submit_' + row.F_Id + '" onclick="btn_transfer(\'' + row.F_Id + '\', 1)" title="提交">提交</a></li>' +
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_mark_' + row.F_Id + '" onclick="btn_mark(\'' + row.F_Id + '\')" title="标记">标记</a></li>' +
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.F_Id + '" onclick="btn_edit(\'' + row.F_Id + '\')" title="修改">修改</a></li>' +
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_remark_' + row.F_Id + '" onclick="btn_remark(\'' + row.F_Id + '\')" title="备注">备注</a></li>' +
 		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
 		'</ul>';
 }
@@ -534,12 +531,11 @@ function formatterProcessing(val, row) {
 }
 
 //格式化操作 （综合查询）
-//function formatterIntegratedQuery(val, row) {
-//	return '<ul class="tool_downs">' +
-//		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_edit_' + row.F_Id + '" onclick="btn_edit(\'' + row.F_Id + '\')" title="修改">修改</a></li>' +
-//		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.F_Id + '" onclick="btn_deleteid(\'' + row.F_Id + '\')" title="删除">删除</a></li>' +
-//		'</ul>';
-//}
+function formatterIntegratedQuery(val, row) {
+	return '<ul class="tool_downs">' +
+		'<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_remark_' + row.F_Id + '" onclick="btn_remark(\'' + row.F_Id + '\')" title="备注">备注</a></li>' +
+		'</ul>';
+}
 
 //格式化操作 （待接单）
 function formatterReceive(val,row) {
@@ -580,6 +576,19 @@ function btn_edit(val) {
 	});
 }
 
+//备注
+function btn_remark(val) {
+	var id = val;
+	layer.open({
+		type: 2,
+		title: '备注',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['40%', '40%'],
+		content: '../WorkOrder/WorkOrderRemark.html?id=' + id
+	});
+}
+
+
 //标记工单
 function btn_mark(val) {
 	var id = val;

CallCenterWeb.UI/js/WorkOrder/WorkOrderDetails.js

@@ -0,0 +1,221 @@
+var selid = helper.request.queryString("id");
+$(document).ready(function () {
+	//工单详情
+	getWorkOrderDetails();
+	getWorkOrderRecord();
+	// 工单详情、记录切换
+	$(".ckxq ul li").click(function() {
+		$(this).addClass("Active").siblings().removeClass("Active");
+		var i = $(this).index();
+		$(".gdxq").hide();
+		$(".gdxq").eq(i).show();
+		if(i === 0) {
+			getWorkOrderDetails();
+		} else if(i === 1) {
+			getWorkOrderRecord();
+		}
+	});
+	
+	//提交
+	$(".repeatSubmit").click(function() {
+		submitRepeatWorkOrder();
+	})
+})
+
+
+// 工单详情
+function getWorkOrderDetails() {
+	$.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetDetails', {
+		id: selid,
+		token: $.cookie("token")
+	}, function(result) {
+		if(result.state.toLowerCase() == "success") {
+			if(result.rows.length > 0) {
+				var data = result.rows[0];
+				$("#detailWorkOrderId").text(data.F_WorkOrderId);
+				$("#detailSource").text(workOrderDetailsSourceJudge(data)); //工单来源
+				$("#detailType").text(workOrderDetailsTypeJudge(data)); //工单类别
+				$("#detailAreaName").html(data.F_AreaName);
+				$("#detailOfficeName").text(data.F_OfficName);
+				$("#detailCreateTime").text(data.F_CreateTime);
+				$("#detailDealTimely").text(data.F_DealTimely); //重要级别
+				$("#detailReason").text(data.F_Reason); //重要原因
+				$("#detailCusName").text(data.F_CusName);
+				$("#detailCusPhone").text(data.F_CusPhone);
+				$("#detailAddress").text(data.F_AddRess);
+				$("#detailProductType").text(data.F_ProductType); //产品代码
+				$("#detailProductName").text(data.F_ProductName);
+				$('#detailSpecifications').text(data.F_Specifications); 
+				$("#detailPRoductDate").text(data.F_ProductDate);
+				$("#detailBatchNumber").text(data.F_BatchNumber);
+				$("#detailManufacturer").text(data.F_Manufacturer);
+				$("#detailProblemCode").text(data.F_ProblemCode); //问题代码
+				$("#detailQualityProblem").text(data.F_QualityProblem); 
+				$("#detailNotifications").text(data.F_Notifications);
+				$("#detailReceivingPerson").text(data.F_ReceivingPerson);
+				$("#detailSerialNumber").text(data.F_SerialNumber);
+				$("#detailState").text(workOrderDetailsStateJudge(data)); //工单状态
+				$("#detailContent").text(data.F_Content);
+				$("#detailDealResult").text(data.F_DealResult); //落实情况
+				$("#detailDealUser").text(data.F_DealUser);
+				$("#detailDealTime").text(data.F_DealTime);
+			}
+		}
+	})
+}
+
+
+// 工单记录
+function getWorkOrderRecord() {
+	//先销毁表格
+	$('#workOrderRecord').bootstrapTable('destroy');
+	//初始化表格,动态从服务器加载数据
+	$('#workOrderRecord').bootstrapTable({
+		method: "get", //使用get请求到服务器获取数据
+		url: huayi.config.callcenter_url + "WorkOrder/GetDetails", //获取数据的Servlet地址
+		contentType: 'application/x-www-form-urlencoded',
+		striped: true, //表格显示条纹
+		pagination: true, //启动分页
+		pageSize: 10, //每页显示的记录数
+		pageNumber: 1, //当前第几页
+		pageList: [10, 20, 50, 100], //记录数可选列表
+		search: false, //是否启用查询
+		showColumns: false, //显示下拉框勾选要显示的列
+		showRefresh: false, //显示刷新按钮
+		sidePagination: "server", //表示服务端请求
+		//设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+		//设置为limit可以获取limit, offset, search, sort, order
+		queryParamsType: "undefined",
+		queryParams: function queryParams(params) { //设置查询参数
+			var param = {
+				id: selid, // 工单ID
+				token: $.cookie("token")
+			};
+			return param;
+		},
+		responseHandler: function(res) {
+            return {
+                "total": res.itemlasts.length,//总页数
+                "rows": res.itemlasts   //数据
+            };
+        },
+		onLoadSuccess: function() { //加载成功时执行
+			//layer.msg("加载成功");
+		},
+		onLoadError: function() { //加载失败时执行
+			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
+		}
+	});
+}
+
+// 工单详情中判断工单来源的值
+function workOrderDetailsSourceJudge (data) {
+	if (data.F_Source === 1) {
+		return 'PC';
+	} else if (data.F_Source === 2) {
+		return 'APP';
+	} else if (data.F_Source === 3) {
+		return '微信';
+	} else {
+		return '';
+	}
+}
+
+// 工单详情中工单类别返回值判断
+function workOrderDetailsTypeJudge (data) {
+	if (data.F_Type === 1) {
+		return '咨询';
+	} else if (data.F_Type === 2) {
+		return '投诉';
+	} else if (data.F_Type === 3) {
+		return '重复';
+	} else {
+		return '';
+	}
+}
+
+// 工单详情中工单状态返回值判断
+function workOrderDetailsStateJudge (data) {
+	if (data.F_State === 0) {
+		return '待提交';
+	} else if (data.F_State === 1) {
+		return '待分派';
+	} else if (data.F_State === 2) {
+		return '待接单';
+	} else if (data.F_State === 3) {
+		return '待处理';
+	} else if (data.F_State === 4) {
+		return '处理中';
+	} else if (data.F_State === 5) {
+		return '退回待分派';
+	} else if (data.F_State === 6) {
+		return '退回待提交';
+	} else if (data.F_State === 10) {
+		return '已完成';
+	} else {
+		return '';
+	}
+}
+
+// 工单记录中工单状态返回值判断
+function formatterWorkOrderRecordStatus(val, row) {
+    var formatterWorkOrderRecordStatusStr = '';
+    if (row.F_WoState === 0){
+        formatterWorkOrderRecordStatusStr = "待提交";
+    }
+    if (row.F_WoState === 1){
+        formatterWorkOrderRecordStatusStr = "待分派";
+    }
+    if (row.F_WoState === 2){
+        formatterWorkOrderRecordStatusStr = "待接单";
+    }
+    if (row.F_WoState === 3){
+    	formatterWorkOrderRecordStatusStr = "待处理";
+    }
+    if (row.F_WoState === 4){
+    	formatterWorkOrderRecordStatusStr = "处理中";
+    }
+    if (row.F_WoState === 5){
+    	formatterWorkOrderRecordStatusStr = "退回待分派";
+    }
+    if (row.F_OptType == 6){    	
+    	formatterWorkOrderRecordStatusStr = "退回待提交";
+    }
+    if (row.F_OptType == 10){
+    	formatterWorkOrderRecordStatusStr = "已完成";
+    }
+	return formatterWorkOrderRecordStatusStr;
+}
+
+// 提交重复工单
+function submitRepeatWorkOrder () {
+	var laye = layer.confirm("您确定要提交重复工单吗？", {
+		btn: ["确定", "取消"]
+	},  function () {
+            $.ajax({
+                type: "post",
+                url: huayi.config.callcenter_url + "WorkOrder/Repeat",
+                async: true,
+                dataType: "json",
+                data: {
+                    token: $.cookie("token"),
+                    orderid: selid,
+                    isbj: 1
+                },
+                success: function (data) {
+                    if (data.state.toLowerCase() == 'success') {
+                        layer.msg("标记重复工单成功！");
+                        //工单列表
+                        parent.$("#workorderlist").bootstrapTable('refresh');
+                        //工单详情
+                        getWorkOrderDetails();
+                        getWorkOrderRecord();
+                    } else {
+                        layer.msg("标记重复工单失败！");
+                    }
+                }
+            });
+	}, function(){
+        layer.close(laye)
+	})
+}

CallCenterWeb.UI/js/WorkOrder/WorkOrderRemark.js

@@ -0,0 +1,40 @@
+var id = helper.request.queryString("id");
+$(document).ready(function () {
+    //保存
+    $('.customerSubmit').click(function() {
+        saveCustomer();
+    });
+})
+
+//保存
+function saveCustomer() {
+    $.ajax({
+        type: "post",
+        url: huayi.config.callcenter_url + "WorkOrder/Annotation",
+        dataType: 'json',
+        async: true,
+        beforeSend: function() { //触发ajax请求开始时执行
+            $('.customerSubmit').attr("disabled", true);
+            $('.customerSubmit').text('确定中...');
+        },
+        data: {
+            token: $.cookie("token"),
+            orderid: id,
+            cont: $('#cont').val(), //提交内容
+        },
+        success: function(data) {
+            if (data.state.toLowerCase() == 'success') {
+                $('.customerSubmit').attr("disabled", false);
+	            $('.customerSubmit').text('确定');
+            	var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+				parent.layer.close(index); //再执行关闭
+				parent.layer.msg("保存成功！");
+				parent.initTable();
+            } else {
+            	$('.customerSubmit').attr("disabled", false);
+	            $('.customerSubmit').text('确定');
+            }
+        }
+    });
+
+}

CallCenterWeb.UI/js/WorkOrder/WorkOrderRepeat.js

@@ -0,0 +1,155 @@
+var id = helper.request.queryString("id");
+$(document).ready(function () {
+    //搜索
+    $('.customerSubmit').click(function() {
+        initTable();
+    });
+    $('#repeatPhone').bind('keypress', function (event) {
+  		if (event.keyCode == "13") {
+  			initTable();
+   			return false;
+		}
+	});
+	//获取工单列表
+	initTable();
+})
+
+//工单列表
+function initTable() {
+    //先销毁表格
+    $('#workorderlist').bootstrapTable('destroy');
+    //初始化表格,动态从服务器加载数据
+    $("#workorderlist").bootstrapTable({
+        method: "get",  //使用get请求到服务器获取数据
+        url: huayi.config.callcenter_url + "WorkOrder/GetList", //获取数据的Servlet地址
+        contentType: 'application/x-www-form-urlencoded',
+        striped: true,  //表格显示条纹
+        pagination: true, //启动分页
+        pageSize: 10,  //每页显示的记录数
+        pageNumber: 1, //当前第几页
+        pageList: [10, 20, 50, 100],  //记录数可选列表
+        search: false,  //是否启用查询
+        showColumns: false,  //显示下拉框勾选要显示的列
+        showRefresh: false,  //显示刷新按钮
+        sidePagination: "server", //表示服务端请求
+        //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+        //设置为limit可以获取limit, offset, search, sort, order
+        queryParamsType: "undefined",
+        queryParams: function queryParams(params) { //设置查询参数
+				var param = {
+					state: "",
+					token: $.cookie("token"),
+					code: "", //工单编号
+					area: "", //大区
+					office: "", //办事处
+					starttime: "", //开始时间
+					endtime: "", //结束时间
+					keywords: $("#repeatPhone").val(),//联系电话
+					productType: "", //产品代码
+					productDate: "", //生产日期
+					batchNumber: "", //产品编码
+					manufacturer: "", //生产厂家
+					problemCode: "", //问题代码
+					notifications: "", //通知人
+					type: "", //工单类别
+					dealTimely: "", // 工单级别
+					see: "", //	处理专员是否只查看负责区域单子
+					pageindex: params.pageNumber, //页码
+					pagesize: params.pageSize, //条数
+				};
+				return param;
+			},
+        onLoadSuccess: function () {  //加载成功时执行
+        },
+        onLoadError: function () {  //加载失败时执行
+        }
+    });
+}
+
+// 工单编号
+function View(val, row) {
+	if (row.F_DealTimely === "Ⅰ级") {
+		return '<div class="imgs" ><a class="xg workOrderIdColorRed" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	} else if (row.F_DealTimely === "Ⅱ级") {
+		return '<div class="imgs" ><a class="xg workOrderIdColorGreen" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	} else if (row.F_DealTimely === "普通工单") {
+		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	} else {
+		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+	}
+	$("#F_UserCode").val(row.CreateUser);
+}
+
+
+//格式化 字符长度 25
+function formatterAddressResult(val) {
+	if(val) {
+		var strAddressResult = decodeURIComponent(val);
+		strAddressResult = helper.filter.filterHTMLTag(strAddressResult);
+		if(strAddressResult.length > 25) {
+			strAddressResult = strAddressResult.substring(0, 25) + '...';
+		}
+		return strAddressResult;
+	}
+}
+
+//格式化 字符长度 8
+function formatterCharacterLength(val) {
+	if(val) {
+		var characterLength = decodeURIComponent(val);
+		characterLength = helper.filter.filterHTMLTag(characterLength);
+		if(characterLength.length > 8) {
+			characterLength = characterLength.substring(0, 8) + '...';
+		}
+		return characterLength;
+	}
+}
+
+// 工单状态返回值判断
+function workOrderStateJudge (val, row) {
+	if (val === 0) {
+		return '<div>待提交</div>';
+	} else if (val === 1) {
+		return '<div>待分派</div>';
+	} else if (val === 2) {
+		return '<div>待接单</div>';
+	} else if (val === 3) {
+		return '<div>待处理</div>';
+	} else if (val === 4) {
+		return '<div>处理中</div>';
+	} else if (val === 5) {
+		return '<div>退回待分派</div>';
+	} else if (val === 6) {
+		return '<div>退回待提交</div>';
+	} else if (val === 10) {
+		return '<div>已完成</div>';
+	} else {
+		return '<div></div>';
+	}
+}
+
+// 工单类别返回值判断
+function workOrderTypeJudge (val, row) {
+	if (val === 1) {
+		return '<div>咨询</div>';
+	} else if (val === 2) {
+		return '<div>投诉</div>';
+	} else if (val === 3) {
+		return '<div>重复</div>';
+	} else {
+		return '<div></div>';
+	}
+}
+
+// 工单详情
+function btn_order_details(val) {
+	var id = val;
+	layer.open({
+		type: 2,
+		title: '工单详情',
+		maxmin: true, //开启最大化最小化按钮
+		area: ['80%', '90%'],
+		content: '../WorkOrder/WorkOrderDetails.html?id=' + id
+	});
+}
+

CallCenterWeb.UI/zhiJian.html

@@ -209,9 +209,9 @@
 								$('.zjTable tbody').html('');
 							for(var i = 0; i < tbodyCon.length; i++) {
                                 $('<tr><td>' + tbodyCon[i].QCName + '</td><td>' + tbodyCon[i].UserName + '</td><td>' + tbodyCon[i].UserCode + '</td><td>' + tbodyCon[i].ZJCount + '</td><td>'
-                                    + tbodyCon[i].df0 + '</td><td>' + tbodyCon[i].Q12 + '</td><td>' + tbodyCon[i].Q13 + '</td><td>' + tbodyCon[i].Q14 + '</td><td>' + tbodyCon[i].Q15 + '</td><td>' + tbodyCon[i].Q16 + '</td><td>'
-                                    + tbodyCon[i].Q17 + '</td><td>' + tbodyCon[i].Q18 + '</td><td>' + tbodyCon[i].df1 + '</td><td>' + tbodyCon[i].Q19 + '</td><td>' + tbodyCon[i].Q20 + '</td><td>' + tbodyCon[i].Q21 + '</td><td>'
-                                    + tbodyCon[i].Q22 + '</td><td>' + tbodyCon[i].Q23 + '</td><td>' + tbodyCon[i].Q24
+                                    + tbodyCon[i].Q12 + '</td><td>' + tbodyCon[i].Q13 + '</td><td>' + tbodyCon[i].Q14 + '</td><td>' + tbodyCon[i].Q15 + '</td><td>' + tbodyCon[i].Q16 + '</td><td>'
+                                    + tbodyCon[i].Q17 + '</td><td>' + tbodyCon[i].Q18 + '</td><td>' + tbodyCon[i].df0 + '</td><td>' + tbodyCon[i].Q19 + '</td><td>' + tbodyCon[i].Q20 + '</td><td>' + tbodyCon[i].Q21 + '</td><td>'
+                                    + tbodyCon[i].Q22 + '</td><td>' + tbodyCon[i].Q23 + '</td><td>' + tbodyCon[i].Q24 + '</td><td>'+ tbodyCon[i].df1
                                     + '</td><td style="color:#e43926;font-weight: bold;">' + tbodyCon[i].AllScore + '</td></tr>').appendTo('.zjTable tbody')
 							}
 						}