历史工单详情、工单样式修改

CallCenterWeb.UI/OutboundMessage/MyTask.html

@@ -46,7 +46,7 @@
 							<th data-field="state" data-checkbox="true"></th>
 							<th data-field="F_Phone" data-align="center" data-formatter="Code">电话号码</th>
 							<th data-field="F_CusName" data-align="center">姓名</th>
-							<th data-field="ExpandVchField12" data-align="center">地址</th>
+							<!--<th data-field="ExpandVchField12" data-align="center">地址</th>-->
 							<th data-field="F_UserName" data-align="center">分配坐席</th>
 							<th data-field="F_HJJGName" data-align="center">呼叫结果</th>
 							<th data-field="ExpandDatField1" data-align="center">调查时间</th>

CallCenterWeb.UI/OutboundMessage/MyTaskResult.html

@@ -83,7 +83,7 @@
 							<th data-field="F_Phone" data-align="center" data-formatter="Code">电话号码</th>
 							<!--<th data-field="nid" data-formatter="setCode">录音</th>-->
 							<th data-field="F_CusName" data-align="center">姓名</th>
-							<th data-field="ExpandVchField4" data-align="center">乡镇或单位</th>
+							<!--<th data-field="ExpandVchField4" data-align="center">乡镇或单位</th>-->
 							<th data-field="ExpandVchField3" data-align="center">地址</th>
 							<th data-field="F_UserName" data-align="center">分配坐席</th>
 							<th data-field="F_HJJGName" data-align="center">呼叫结果</th>

CallCenterWeb.UI/OutboundMessage/TaskResult.html

@@ -57,7 +57,7 @@
 							<!--<th data-field="state" data-checkbox="true"></th>-->
 							<th data-field="F_Phone" data-align="center" data-formatter="Code">电话号码</th>
 							<th data-field="F_CusName" data-align="center">姓名</th>
-							<th data-field="ExpandVchField4" data-align="center">乡镇或单位</th>
+							<!--<th data-field="ExpandVchField4" data-align="center">乡镇或单位</th>-->
 							<th data-field="ExpandVchField3" data-align="center">住址</th>
 							<th data-field="F_UserName" data-align="center">分配坐席</th>
 							<th data-field="F_HJJGName" data-align="center">呼叫结果</th>

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -267,7 +267,7 @@
 							<!--<th data-field="F_Definition" data-align="center">营业厅名称</th>-->
 							<!--<th data-field="F_Dealing" data-align="center">处理人</th>-->
 							<th data-field="" data-align="center">录音</th>
-							<th data-field="F_WorkOrderId" data-formatter="Appoint" data-align="center">操作</th>
+							<th data-field="F_WorkOrderId" data-formatter="Dispose" data-align="center">操作</th>
 						</tr>
 					</thead>
 				</table>
@@ -638,10 +638,10 @@
 							definition:$("#cityName").val(),//营业厅名称
 							strusercode:$('#typeclassId').val(),//创建人
 							Typeof:$("#orderType").val(), //工单类型
-							strkey:$('#keyWord').val(), //内容关键字
-							strworkid:$('#orderNum').val(), //工单号
-							strstarttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
-							strendtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
+							key:$('#keyWord').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 //							userid: $('#userid').val() //坐席
 						};
 						return param;
@@ -696,10 +696,10 @@
 							definition:$("#cityName").val(),
 							strusercode:$('#typeclassId').val(),
 							Typeof:$("#orderType").val(), //工单类型
-							strkey:$('#keyWord').val(), //内容关键字
-							strworkid:$('#orderNum').val(), //工单号
-							strstarttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
-							strendtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
+							key:$('#keyWord').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 
 						};
 						return param;

CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -597,10 +597,10 @@
 							definition:$("#cityName").val(),
 							strusercode:$('#typeclassId').val(),
 							Typeof:$("#orderType").val(), //工单类型
-							strkey:$('#keyWord').val(), //内容关键字
-							strworkid:$('#orderNum').val(), //工单号
-							strstarttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
-							strendtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
+							key:$('#keyWord').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 						};
 						return param;
 					},
@@ -649,10 +649,10 @@
 							definition:$("#cityName").val(),
 							strusercode:$('#typeclassId').val(),
 							Typeof:$("#orderType").val(), //工单类型
-							strkey:$('#keyWord').val(), //内容关键字
-							strworkid:$('#orderNum').val(), //工单号
-							strstarttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
-							strendtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
+							key:$('#keyWord').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 
 						};
 						//                  if (stype == '1') {

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -137,9 +137,9 @@
 			   height: 39px;
 			   border-bottom: 1px solid #E7EAEC;
 			}
-			.th-inner {
+			/*.th-inner {
 				text-align: center;
-			}
+			}*/
 			.W220{
 			   width:220px !important;
 			   position: absolute;
@@ -569,10 +569,10 @@
 							definition:$("#cityName").val(),//营业厅名称
 							strusercode:$('#typeclassId').val(),//创建人
 							Typeof:$("#orderType").val(), //工单类型
-							strkey:$('#keyWord').val(), //内容关键字
-							strworkid:$('#orderNum').val(), //工单号
-							strstarttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
-							strendtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
+							key:$('#keyWord').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 						};
 						return param;
 					},
@@ -620,10 +620,10 @@
 							definition:$("#cityName").val(),//营业厅名称
 							strusercode:$('#typeclassId').val(),//创建人
 							Typeof:$("#orderType").val(), //工单类型
-							strkey:$('#keyWord').val(), //内容关键字
-							strworkid:$('#orderNum').val(), //工单号
-							strstarttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
-							strendtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
+							key:$('#keyWord').val(), //内容关键字
+							workid:$('#orderNum').val(), //工单号
+							starttime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[0], //开始时间
+							endtime: $('#greetingTimes').val() && $('#greetingTimes').val().split(' ~ ')[1], //结束时间
 						};
 						return param;
 					},

CallCenterWeb.UI/callScreen/call.js

@@ -36,10 +36,12 @@ $(document).ready(function () {
 			success: function(data) {
 				if(data.state.toLowerCase() == 'success') {
 					if(data.data.user.F_SeartGroup == '楼下组') {
+						loadOlds();
 						$('.up_floor').css('display','none')
 						$('#ces').show();
+						
 					}else{
-						$('#orderlist').show();
+						$('#zxlbs').show();
 					}
 				}
 			}
@@ -73,6 +75,7 @@ $(document).ready(function () {
     $(".ldtp-cr ul.ld-service li").click(function () {
         $(this).addClass("cr-click").siblings().removeClass("cr-click");
         loadOld();
+        loadOlds();
     });
     $('.pre-add').click(function () {
         var par = $(this).parent().parent();
@@ -262,17 +265,17 @@ $(document).ready(function () {
     $('.treeList').mouseleave(function () {
         $(this).css('display', 'none')
     })
-    $(".orderType").change(function () {
-        if ($(".orderType option:selected").text() != "投诉") {
-            $(".complainDiv2").show();
-            typeSmall =$(".complaintType2").val();
-            $(".complainDiv").hide();
-        } else {
-            $(".complainDiv2").hide();
-            $(".complainDiv").show();
-            typeSmall =$(".complaintType1").val();
-        }
-    });
+//  $(".orderType").change(function () {
+//      if ($(".orderType option:selected").text() != "投诉") {
+//          $(".complainDiv2").show();
+//          typeSmall =$(".complaintType2").val();
+//          $(".complainDiv").hide();
+//      } else {
+//          $(".complainDiv2").hide();
+//          $(".complainDiv").show();
+//          typeSmall =$(".complaintType1").val();
+//      }
+//  });
     $(".complaintType2").change(function () {
 		typeSmall=$(".complaintType2").val();
     });
@@ -401,11 +404,13 @@ $(document).ready(function () {
     //历史记录查询
     $(".searchbtn").click(function () {
         loadOld();
+        loadOlds();
     })
     //按enter查询历史记录
     $('#old_startTime, #old_endTime').bind('keypress', function (event) {
 	  	if (event.keyCode == "13") {
         	loadOld();
+        	loadOlds();
    			return false;
 		}
 	});
@@ -450,7 +455,92 @@ function loadZSK() {
 	})
 }
 
+//获取历史记录
+function loadOlds() {
 
+    var type = $(".ldtp-cr ul.ld-service .cr-click").attr("itemtype");
+    $(".complain").hide();
+    $(".complain").eq(type).show();
+    if (type == '2') {
+
+        //先销毁表格
+        $('#order_ces').bootstrapTable('destroy');
+        //初始化表格,动态从服务器加载数据
+        $("#order_ces").bootstrapTable({
+            method: "get", //使用get请求到服务器获取数据
+            url: huayi.config.callcenter_url + "WorkOrder/GetList", //获取数据的Servlet地址
+            contentType: 'application/x-www-form-urlencoded',
+            striped: true, //表格显示条纹
+            pagination: true, //启动分页
+            pageSize: 5, //每页显示的记录数
+            pageNumber: 1, //当前第几页
+            pageList: [5, 10, 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 = {
+                    starttime: $("#con_startTime").val(),
+                    endtime: $("#con_endTime").val(),
+                    keywords: $(".hidTel").val(),
+                    token: $.cookie("token"),
+					page: params.pageNumber, //页码
+					pagesize: params.pageSize, //条数
+                };
+                return param;
+            },
+            onLoadSuccess: function() { //加载成功时执行
+                //layer.msg("加载成功");
+            },
+            onLoadError: function() { //加载失败时执行
+                //layer.msg("加载数据失败", { time: 1500, icon: 2 });
+            }
+        });
+    } else if (type == '1') {
+        //先销毁表格
+        $('#oldlist').bootstrapTable('destroy');
+        //初始化表格,动态从服务器加载数据
+        $("#oldlist").bootstrapTable({
+            method: "get", //使用get请求到服务器获取数据
+            url: huayi.config.callcenter_url + "CallInScreen/GetOldList", //获取数据的Servlet地址
+            contentType: 'application/x-www-form-urlencoded',
+            striped: true, //表格显示条纹
+            pagination: true, //启动分页
+            pageSize: 5, //每页显示的记录数
+            pageNumber: 1, //当前第几页
+            pageList: [5, 10, 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 = {
+                    page: params.pageNumber,
+                    pagesize: params.pageSize,
+                    tel: $(".hidTel").val(),
+                    starttime: $("#old_startTime").val(),
+                    endtime: $("#old_endTime").val(),
+                    token: $.cookie("token")
+
+                };
+                return param;
+            },
+            onLoadSuccess: function() { //加载成功时执行
+                //layer.msg("加载成功");
+            },
+            onLoadError: function() { //加载失败时执行
+                //layer.msg("加载数据失败", { time: 1500, icon: 2 });
+            }
+        });
+    }
+}
 //获取历史记录
 function loadOld() {
 
@@ -577,13 +667,13 @@ function formatterDealType(val, row) {
 // 工单编号
 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>';
+		return '<div class="imgs" ><a class="xg workOrderIdColorRed" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_WorkOrderId + '") >' + 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>';
+		return '<div class="imgs" ><a class="xg workOrderIdColorGreen" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_WorkOrderId + '") >' + 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>';
+		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_WorkOrderId + '") >' + val + '</a></div>';
 	} else {
-		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_Id + '") >' + val + '</a></div>';
+		return '<div class="imgs" ><a class="xg" index="' + row.CreateUser + '" onclick= btn_order_details("' + row.F_WorkOrderId + '") >' + val + '</a></div>';
 	}
 	$("#F_UserCode").val(row.CreateUser);
 }
@@ -853,14 +943,11 @@ function GetDealState(val) {
 }
 
 function GetStateName(val) {
-	var str = '';
-	switch(val + '') {
-		case '0':
-			str = "待处理";
-			break;
-		case '1':
-			str = "已处理";
-			break;
+	
+	if(val == 0) {
+		return '<div class="warning">待处理</div> '
+	} else {
+		return '<div class="defauli">已处理</div>'
 	}
 	return str;
 }
@@ -907,7 +994,7 @@ function complaintType() {
         result = $.parseJSON(result);
         var Count = result.data;
         $(Count).each(function(i, n) {
-            $('<option value="' + n.F_DictionaryValueId + '">' + n.F_Name + '</option>').appendTo($(".complaintType1"));
+            $('<option value="' + n.F_Name + '">' + n.F_Name + '</option>').appendTo($(".complaintType1"));
         })
         typeSmall=$(".complaintType1").val();
     });
@@ -925,7 +1012,19 @@ function consultType() {
 		})
 	});
 }
-
+//客户名称多余隐藏
+function characterFive(val) {
+	if(val) {
+			var str = '<div'
+		if(val.length > 5){
+		 str =str + '>' + val.substring(0, 5) + '...</div>';
+		}
+		else{
+			str = str + '>' + val + '</div>';
+		}
+		return str
+	}
+}
 //区域
 //function getAreaType() {
 //  $.get(huayi.config.callcenter_url + 'Area/GetAreaList', {
@@ -1269,7 +1368,7 @@ function Clean() {
     $('#tel').val(''); //号码
     $('#orderSource').val(''); //工单来源
     $('#typeclassId').val(''); //工单类型id
-    $('.orderType').val(''); //工单状态id   
+//  $('.orderType').val(''); //工单状态id   
     $('.DicValueList').val(''); //反馈内容    
     $('#productname').val(''); //备注一     
     $('#buyAddress').val(''); //备注二     
@@ -1283,7 +1382,7 @@ function Clean() {
     $('#type').val('');
     $('#keyid').val('');
     $('#addressDescription').val(''); //详细地址
-    $('#productType').val('');
+//  $('#productType').val('');
     $('#productName').val('');
     $('#specification').val('');
     $('#productDate').val('');

CallCenterWeb.UI/callScreen/callScreen.html

@@ -482,9 +482,9 @@
     		.imgs a:hover {
         		color: #e43926;
 			}
-            .W100 .th-inner {
+            /*.W100 .th-inner {
 			    width:100px !important;
-			}
+			}*/
 			.W160 .th-inner {
 			    width:160px !important;
 			}
@@ -505,10 +505,16 @@
 				height: 55px;
 				width: 600px;
 			}
-			#orderlist,
+			#zxlbs,
 			#ces{
 				display: none;
 			}
+			.warning{
+				color: #eea236;
+			}
+			.defauli{
+				color:#bababa;
+			}
 		</style>
 		<script>
 			function clearInter() {
@@ -886,8 +892,8 @@
 												<th data-field="F_CreateTime" data-class="W100" data-align="center">创建时间</th>
 												<th data-field="F_CreateUser" data-class="W100" data-align="center">创建人</th>
 												<th data-field="F_State" data-formatter="GetStateName" data-class="W100" data-align="center">工单状态</th>
-												<th data-field="F_Content" data-class="W100" data-align="center">投诉事件描述</th>
-												<th data-field="F_CusName" data-class="W100" data-align="center">客户姓名</th>
+												<th data-field="F_Content" data-class="W100" data-align="center">描述内容</th>
+												<th data-field="F_CusName" data-formatter="characterFive" data-class="W100" data-align="center">客户姓名</th>
 												<th data-field="F_CusPhone" data-class="W100" data-align="center">客户电话</th>
 												<th data-field="F_Typeof" data-class="W100" data-align="center">工单类型</th>
 												<th data-field="F_Definition" data-class="W100" data-align="center">营业厅名称</th>
@@ -905,9 +911,11 @@
 												<th data-field="F_Type" data-class="W100" data-formatter="workOrderTypeJudge" data-align="center">工单类别</th>-->
                                             </tr>
                                         </thead>
-                                        <tbody class="list"></tbody>
+                                        <!--<tbody class="list"></tbody>-->
                                     </table>
-                                     <table id="ces" data-row-style="rowStyle" data-query-params="queryParams" data-pagination="true">
+                                </div>
+                                <div id="ces" class="table-responsive col-sm-12 tbold" style="padding-left: 0;">
+                                	<table id="order_ces" 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>
@@ -923,7 +931,7 @@
 												<th data-field="" data-class="W100" data-align="center">录音</th>
                                             </tr>
                                         </thead>
-                                        <tbody class="list"></tbody>
+                                        <!--<tbody class="list"></tbody>-->
                                     </table>
                                 </div>
                             </div>

CallCenterWeb.UI/callScreen/work_order_details.html

@@ -46,135 +46,87 @@
 				<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>
+								<tr>
+									<th>工单编号：</th>
+									<td>
+										<span id="xq_gdbh"></span>
+									</td>
+									<th>工单类型：</th>
+									<td>
+										<span id="xq_gdlx"></span>
+									</td>
+									<th>定责：</th>
+									<td>
+										<span id="complaintType1"></span>
+									</td>
+								</tr>
+								<tr>
+									<th>创建时间：</th>
+									<td>
+										<span id="xq_cjsj"></span>
+									</td>
+									<th>工单状态：</th>
+									<td>
+										<span id="xq_gdzt"></span>
+									</td>
+									<th>客户姓名：</th>
+									<td>
+										<span id="xq_khxm"></span>
+									</td>
+									
+								</tr>
+								<tr class="up_floor">
+									<th>派单类型：</th>
+									<td>
+										<span id="complaintType2"></span>
+									</td>
+									<th>处理人姓名：</th>
+									<td>
+										<span id="dealing"></span>
+									</td>
+									<th>处理人电话：</th>
+									<td>
+										<span id="dealingtel"></span>
+									</td>
+									
+								</tr>
+								<tr>
+									<th>客户电话：</th>
+									<td>
+										<span id="xq_khdh"></span>
+									</td>
+									<th class="up_floor">营业厅名称：</th>
+									<td class="up_floor">
+										<span id="definition"></span>
+									</td>
+									<!--<th>购买日期：</th>
+									<td>
+										<span id="buyDate"></span>
+									</td>
+									<th>购买地址：</th>
+									<td>
+										<span id="buyAddress"></span>
+									</td>-->
+								</tr>
+								<tr>
+									<th>描述内容：</th>
+									<td colspan="5" id="conTent">
+										
+									</td>
+								</tr>
+								<tr>
+									<th>回复内容：</th>
+									<td colspan="5" id="replycontent">
+										
+									</td>
+								</tr>
+								<tr>
+									<th>备注：</th>
+									<td colspan="5" id="remark">
+										
+									</td>
+								</tr>
+							</tbody>
 					</table>
 				</div>
 			</div>
@@ -183,18 +135,18 @@
 					<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>
+								<th data-field="F_CreateUser" data-width="20%" data-align="left">处理人</th>
+								<th data-field="F_Message" data-align="left">内容</th>
+								<th data-field="F_CreateTime" data-width="20%" data-align="center">创建时间</th>
 							</tr>
 						</thead>
 					</table>
 				</div>
 			</div>
 		</div>
-		<div class="repeat-btn">
+		<!--<div class="repeat-btn">
             <button class="btns repeatSubmit">提&nbsp;交</button>
-        </div>
+        </div>-->
         
 	<script type="text/javascript" src="./work_order_details.js"></script>
 </body>

CallCenterWeb.UI/callScreen/work_order_details.js

@@ -15,7 +15,23 @@ $(document).ready(function () {
 			getWorkOrderRecord();
 		}
 	});
-	
+	//	楼下组部分字段隐藏
+	$.ajax({
+			type: "get",
+			url: huayi.config.callcenter_url + "UserAccount/GetNowUser",
+			dataType: 'json',
+			async: true,
+			data: {
+				token: $.cookie("token")
+			},
+			success: function(data) {
+				if(data.state.toLowerCase() == 'success') {
+					if(data.data.user.F_SeartGroup == '楼下组') {
+						$('.up_floor').css('display','none')
+					}
+				}
+			}
+		});
 	//提交
 	$(".repeatSubmit").click(function() {
 		submitRepeatWorkOrder();
@@ -26,45 +42,47 @@ $(document).ready(function () {
 
 // 工单详情
 function getWorkOrderDetails() {
-	$.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetDetails', {
-		id: selid,
+	$.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetWorkOrder', {
+		workid: 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);
+			if(result.data.data.length > 0) {
+				var data = result.data.data[0];
+				$("#complaintType2").text(data.F_Pietype);//派单类型
+				$("#dealing").text(data.F_Dealing);//处理人姓名
+				$("#dealingtel").text(data.F_Dealingtel);//处理人电话
+				$("#complaintType1").text(data.F_Fixduty);//定责
+				$("#xq_gdbh").text(data.F_WorkOrderId); //工单编号
+				$("#xq_gdlx").text(data.F_Typeof); //工单类型
+				$("#xq_cjsj").text(data.F_CreateTime); //创建时间
+				$("#xq_gdzt").html(GetStateName(data.F_State)); //工单状态
+				$("#xq_khxm").text(data.F_CusName); //客户姓名
+				$("#xq_khdh").text(data.F_CusPhone); //客户电话
+				$("#definition").text(data.F_Definition); //营业厅名称
+				$("#buyAddress").text(data.F_BuyAddress); //购买地址
+				$("#userDate").text(data.F_UserDate); //使用日期
+				$('#county').text(data.F_County); //区县 
+				$("#F_complaint").text(data.SmallTypeName); //投诉类型
+				$("#areaName").text(data.F_Area+"-"+data.F_Province+"-"+data.F_City); //区域
+				$("#VipName").text(data.F_VIPName); //专员姓名
+				$("#F_VipPhone").text(data.F_VIPPhone); //专员电话
+				$("#conTent").text(data.F_Content); //事件描述
+				$("#replycontent").text(data.F_Replycontent); //事件回复
+				$("#remark").text(data.F_Remark); //备注
 			}
 		}
 	})
 }
-
+function GetStateName(val) {
+	
+	if(val == 0) {
+		return '<div class="warning">待处理</div> '
+	} else {
+		return '<div class="defauli">已处理</div>'
+	}
+	return str;
+}
 
 // 工单记录
 function getWorkOrderRecord() {
@@ -73,10 +91,10 @@ function getWorkOrderRecord() {
 	//初始化表格,动态从服务器加载数据
 	$('#workOrderRecord').bootstrapTable({
 		method: "get", //使用get请求到服务器获取数据
-		url: huayi.config.callcenter_url + "WorkOrder/GetDetails", //获取数据的Servlet地址
+		url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrder", //获取数据的Servlet地址
 		contentType: 'application/x-www-form-urlencoded',
 		striped: true, //表格显示条纹
-		pagination: true, //启动分页
+		pagination: false, //启动分页
 		pageSize: 10, //每页显示的记录数
 		pageNumber: 1, //当前第几页
 		pageList: [10, 20, 50, 100], //记录数可选列表
@@ -89,15 +107,15 @@ function getWorkOrderRecord() {
 		queryParamsType: "undefined",
 		queryParams: function queryParams(params) { //设置查询参数
 			var param = {
-				id: selid, // 工单ID
+				workid: selid, // 工单ID
 				token: $.cookie("token")
 			};
 			return param;
 		},
 		responseHandler: function(res) {
             return {
-                "total": res.itemlasts.length,//总页数
-                "rows": res.itemlasts   //数据
+//              "total": res.itemlasts.length,//总页数
+                "rows": res.data.gcdata,   //数据
             };
         },
 		onLoadSuccess: function() { //加载成功时执行
@@ -189,36 +207,36 @@ function formatterWorkOrderRecordStatus(val, row) {
 }
 
 // 提交重复工单
-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)
-	})
-}
+//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/js/WorkOrder/AddWorkOrder.js

@@ -117,18 +117,18 @@ $(document).ready(function () {
         $(this).css('display', 'none')
     })
 
-    $(".orderType").change(function () {
-    	
-        if ($(".orderType option:selected").text() != "投诉") {
-            $(".complainDiv2").show();
-            typeSmall =$(".complaintType2").val();
-            $(".complainDiv").hide();
-        } else {
-            $(".complainDiv2").hide();
-            $(".complainDiv").show();
-            typeSmall =$(".complaintType1").val();
-        }
-    });
+//  $(".orderType").change(function () {
+//  	
+//      if ($(".orderType option:selected").text() != "投诉") {
+//          $(".complainDiv2").show();
+//          typeSmall =$(".complaintType2").val();
+//          $(".complainDiv").hide();
+//      } else {
+//          $(".complainDiv2").hide();
+//          $(".complainDiv").show();
+//          typeSmall =$(".complaintType1").val();
+//      }
+//  });
     $(".complaintType2").change(function () {
 		typeSmall=$(".complaintType2").val();
     });

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -551,7 +551,7 @@ function getRY(obj, deptid) {
 }
 
 function Appoint(val, row) {
-	return czhtml(val, row, "处理");
+	return czhtmls(val, row, "处理");
 }
 
 function Dispose(val, row) {
@@ -566,7 +566,10 @@ function czhtml(val, row, str) {
 	+ '\')">' + str + '</a><a  onclick= btnRemove("' + val 
 	+ '") >删除</a></div>';
 }
-
+function czhtmls(val, row, str) {
+	return '<div class="imgs" ><a  onclick= btnRemove("' + val 
+	+ '") >删除</a></div>';
+}
 function oper(val, obj) {
 	zpid = val;
 	var zp = JSON.parse($(obj).attr("itemstr"));

CallCenterWeb.UI/js/WorkOrder/xgWork.js

@@ -113,6 +113,7 @@ $(document).ready(function () {
                 $('#dealingtel').val(data.F_Dealingtel)//处理人姓名
                 $('#DicValueList').val(data.F_Source + ''); //工单来源 
                 $('#content').val(data.F_Content); //事件描述
+                $('#replycontent').val(data.F_Replycontent); //事件描述
                 $('#remark').val(data.F_Remark); //备注
 				$("#disposeST").text(data.DealStateName); //处理状态
 				$("#dealCont").text(data.F_DealResult); //处理结果