修改bug

CallCenterWeb.UI/WorkOrder/WorkOrderDispose.html

@@ -224,28 +224,32 @@
 									<td>
 										<span id="buyDate"></span>
 									</td>
-									<th>产品名称：</th>
+									<th>购买地址：</th>
 									<td>
-										<span id="productName"></span>
+										<span id="buyAddress"></span>
 									</td>
-									
 								</tr>
 								<tr>
-									<th>购买地址：</th>
+									
+									<th>产品名称：</th>
 									<td>
-										<span id="buyAddress"></span>
+										<span id="productName"></span>
 									</td>
 									<th>产品类别：</th>
 									<td>
 										<span id="productType"></span>
 									</td>
-									<th>生产批号：</th>
-									<td>
-										<span id="batchNumber"></span>
+									<th class="snRmove">生产日期：</th>
+									<td class="snRmove">
+										<span id="productDate"></span>
 									</td>
 									
 								</tr>
 								<tr>
+									<th>生产批号：</th>
+									<td>
+										<span id="batchNumber"></span>
+									</td>
 									<th>使用日期：</th>
 									<td>
 										<span id="userDate"></span>
@@ -253,14 +257,13 @@
 									<th>区域：</th>
 									<td>
 										<span id="areaName"></span>
-									</td>
+									</td>									
+								</tr>
+								<tr>
 									<th>客诉专员：</th>
 									<td>
 										<span id="VipName"></span>
 									</td>
-									
-								</tr>
-								<tr>
 									<th>专员电话：</th>
 									<td>
 										<span id="F_VipPhone"></span>
@@ -269,6 +272,9 @@
 									<td class="snRmove">
 										<span id="county"></span>
 									</td>
+									
+								</tr>
+								<tr>
 									<th class="snRmove">样品寄回：</th>
 									<td class="snRmove">
 										<span id="F_IsBack"></span>

CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -236,28 +236,32 @@
 									<td>
 										<span id="buyDate"></span>
 									</td>
-									<th>产品名称：</th>
+									<th>购买地址：</th>
 									<td>
-										<span id="productName"></span>
+										<span id="buyAddress"></span>
 									</td>
-									
 								</tr>
 								<tr>
-									<th>购买地址：</th>
+									
+									<th>产品名称：</th>
 									<td>
-										<span id="buyAddress"></span>
+										<span id="productName"></span>
 									</td>
 									<th>产品类别：</th>
 									<td>
 										<span id="productType"></span>
 									</td>
-									<th>生产批号：</th>
-									<td>
-										<span id="batchNumber"></span>
+									<th class="snRmove">生产日期：</th>
+									<td class="snRmove">
+										<span id="productDate"></span>
 									</td>
 									
 								</tr>
 								<tr>
+									<th>生产批号：</th>
+									<td>
+										<span id="batchNumber"></span>
+									</td>
 									<th>使用日期：</th>
 									<td>
 										<span id="userDate"></span>
@@ -265,14 +269,13 @@
 									<th>区域：</th>
 									<td>
 										<span id="areaName"></span>
-									</td>
+									</td>									
+								</tr>
+								<tr>
 									<th>客诉专员：</th>
 									<td>
 										<span id="VipName"></span>
 									</td>
-									
-								</tr>
-								<tr>
 									<th>专员电话：</th>
 									<td>
 										<span id="F_VipPhone"></span>
@@ -281,6 +284,9 @@
 									<td class="snRmove">
 										<span id="county"></span>
 									</td>
+									
+								</tr>
+								<tr>
 									<th class="snRmove">样品寄回：</th>
 									<td class="snRmove">
 										<span id="F_IsBack"></span>
@@ -292,7 +298,12 @@
 										
 									</td>
 								</tr>
-								
+								<tr>
+									<th>备注：</th>
+									<td colspan="5" id="remark">
+										
+									</td>
+								</tr>
 							</tbody>
 
 						</table>

CallCenterWeb.UI/WorkOrder/WorkOrderSearch.html

@@ -186,8 +186,8 @@
 				</ul>
 				<div class="gdxq">
 					<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
-						<tbody class="tbodys">
-							<tr>
+							<tbody class="tbodys">
+								<tr>
 									<th>工单编号：</th>
 									<td>
 										<span id="xq_gdbh"></span>
@@ -225,28 +225,32 @@
 									<td>
 										<span id="buyDate"></span>
 									</td>
-									<th>产品名称：</th>
+									<th>购买地址：</th>
 									<td>
-										<span id="productName"></span>
+										<span id="buyAddress"></span>
 									</td>
-									
 								</tr>
 								<tr>
-									<th>购买地址：</th>
+									
+									<th>产品名称：</th>
 									<td>
-										<span id="buyAddress"></span>
+										<span id="productName"></span>
 									</td>
 									<th>产品类别：</th>
 									<td>
 										<span id="productType"></span>
 									</td>
-									<th>生产批号：</th>
-									<td>
-										<span id="batchNumber"></span>
+									<th class="snRmove">生产日期：</th>
+									<td class="snRmove">
+										<span id="productDate"></span>
 									</td>
 									
 								</tr>
 								<tr>
+									<th>生产批号：</th>
+									<td>
+										<span id="batchNumber"></span>
+									</td>
 									<th>使用日期：</th>
 									<td>
 										<span id="userDate"></span>
@@ -254,14 +258,13 @@
 									<th>区域：</th>
 									<td>
 										<span id="areaName"></span>
-									</td>
+									</td>									
+								</tr>
+								<tr>
 									<th>客诉专员：</th>
 									<td>
 										<span id="VipName"></span>
 									</td>
-									
-								</tr>
-								<tr>
 									<th>专员电话：</th>
 									<td>
 										<span id="F_VipPhone"></span>
@@ -270,6 +273,9 @@
 									<td class="snRmove">
 										<span id="county"></span>
 									</td>
+									
+								</tr>
+								<tr>
 									<th class="snRmove">样品寄回：</th>
 									<td class="snRmove">
 										<span id="F_IsBack"></span>
@@ -278,10 +284,18 @@
 								<tr>
 									<th>事件描述：</th>
 									<td colspan="5" id="conTent">
+										
 									</td>
 								</tr>
-						</tbody>
-					</table>
+								<tr>
+									<th>备注：</th>
+									<td colspan="5" id="remark">
+										
+									</td>
+								</tr>
+							</tbody>
+
+						</table>
 					<div class="">
 						<table id="gdxq_table" border="0" class="table table-bordered  table-hover " style="width: 100%;">
 							<tbody class="tbodys">
@@ -290,10 +304,9 @@
 									<td>
 										<span id="F_DealCost"></span>
 									</td>
-									
 									<th>处理状态：</th>
 									<td>
-										<span id="F_DealState"></span>
+										<span id="DealStateName"></span>
 									</td>
 									<th>响应状态：</th>
 									<td>

CallCenterWeb.UI/callScreen/call.js

@@ -30,15 +30,12 @@ $(document).ready(function () {
         $("#vipid").text("对接人:");
         $("#vipphone").text("对接人电话:");
     }
-
     //来电弹屏
     laydate.skin('molv');
-
     laydate({
         elem: '#old_startTime',
         event: 'focus'
     });
-
     laydate({
         elem: '#old_endTime',
         event: 'focus'
@@ -47,12 +44,10 @@ $(document).ready(function () {
         elem: '#con_startTime',
         event: 'focus'
     });
-
     laydate({
         elem: '#con_endTime',
         event: 'focus'
     });
-
     laydate({
         elem: '#userDate',
         event: 'focus'
@@ -61,10 +56,13 @@ $(document).ready(function () {
         elem: '#buyDate',
         event: 'focus'
     });
-    laydate({
-        elem: '#productDate',
-        event: 'focus'
-    });
+    if($("#productDate").val()){
+    	 laydate({
+	        elem: '#productDate',
+	        event: 'focus'
+	    });
+    }
+   
     //弹屏右侧切换效果
     $(".ldtp-cr ul.ld-service li").click(function () {
         $(this).addClass("cr-click").siblings().removeClass("cr-click");
@@ -74,8 +72,6 @@ $(document).ready(function () {
         var par = $(this).parent().parent();
         par.hide().siblings().show();
     })
-
-
     $(".mfhtel").val(Number);
     $(".hidTel").val(Number);
     $(".tel").text(Number);
@@ -90,9 +86,7 @@ $(document).ready(function () {
     $("#Tel").val(Number); //右侧客服部  新增工单电话
     $("#tel").val(Number);
     $("#telm").val(Number);
-
     $("#marketTel").val(Number);//右侧市场部  新增工单电话
-
     if (Number) {
         //获取电话所属地
         $.getJSON(huayi.config.callcenter_url + 'CallInScreen/GetPhoneLocation', {
@@ -104,8 +98,6 @@ $(document).ready(function () {
                 //$(".ldlocation").text(result.data);
             }
         })
-
-
         //获取客户信息
         $.ajax({
             type: "get",
@@ -142,7 +134,6 @@ $(document).ready(function () {
             }
         })
     }
-
     var timestamp = Date.parse(new Date());
     $('.head-pic .lahei .la-before').show();
     $('.head-pic .lahei .la-after').hide();
@@ -174,7 +165,6 @@ $(document).ready(function () {
         $("#time-word").val('');
     })
     var reg = /^\+?[1-9][0-9]*$/;
-
     $('#bc').click(function () {
         var n = $("#time-word").val();
         var val = $("input[name='time']:checked").val();
@@ -214,7 +204,6 @@ $(document).ready(function () {
             }
         })
     })
-
     $('.la-after').click(function () {
         if (!$(".hidTel").val()) {
             layer.confirm('来电号码为空！', {
@@ -228,7 +217,6 @@ $(document).ready(function () {
         $('.ldtp-con .hei-list').removeClass('bounceOutUp');
         $('.ldtp-con .hei-list').addClass('bounceIn');
     })
-
     $('.head-pic .lahei .retur').click(function () {
         $.getJSON(huayi.config.callcenter_url + 'CallInScreen/DelBlack', {
             tel: $(".hidTel").val(),
@@ -242,11 +230,9 @@ $(document).ready(function () {
             }
         })
     })
-
     $(".col-sm-3").mouseleave(function () {
         $(".ztree").parent().hide();
     })
-
     $('.areaDown').click(function () {
         if ($('.treeList1').css('display') == 'block') {
             $('.treeList1').css('display', 'none')
@@ -266,7 +252,6 @@ $(document).ready(function () {
     $('.treeList').mouseleave(function () {
         $(this).css('display', 'none')
     })
-
     $(".orderType").change(function () {
         if ($(".orderType option:selected").text() != "投诉") {
             $(".complainDiv2").show();
@@ -292,7 +277,6 @@ $(document).ready(function () {
         $(".inps2").val($("#vipName option:selected").attr("province"));
         $(".inps3").val($("#vipName option:selected").attr("city"));
     });
-
     //客户资料
     $('.khzl tbody>tr>td input').attr('readonly', true);
     $('.save').hide();
@@ -353,7 +337,6 @@ $(document).ready(function () {
             }
         })
     })
-
     //工单来源
     getOrderSource();
     //工单类型
@@ -368,13 +351,10 @@ $(document).ready(function () {
     getAreaType();
     //客诉专员
     ComplaintVip();
-
     //保存
     $('.customerSubmit').click(function () {
-    	
         saveCustomer();
     });
-
     //获取知识库
     loadZSK();
     //知识库查询
@@ -926,7 +906,6 @@ function saveCustomer() {
         },
         success: function (data) {
             if (data.state.toLowerCase() == 'success') {
-            	debugger
                 layer.msg("保存成功！");
                 //Clean();
                 //window.location.reload()

CallCenterWeb.UI/callScreen/callScreen.html

@@ -864,7 +864,7 @@
 		<script src="./../js/bootstrap-table-zh-CN.js"></script>
 		<script src="./../js/zTree/jquery.ztree.core.js"></script>
 		<script src="./../js/plugins/datapicker/bootstrap-datepicker.js"></script>
-		<script src="./../css/laydate/laydate.js"></script>
+		<script src="../css/laydate/laydate.js"></script>
 		<script src="../js/kindeditor/kindeditor.js"></script>
 		<script src="../js/kindeditor/lang/zh_CN.js"></script>
 		<script src="./../js/jquery.select.js"></script>

CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

@@ -118,13 +118,19 @@ $(document).ready(function () {
 		typeSmall=$(".complaintType1").val();
     });
     //获取专员手机号
-    $("#vipName").change(function () {
+	$("#vipName").change(function () {
         $("#vipTel").val($("#vipName option:selected").attr("index"));
-        //$("#areaInps").val($("#vipName option:selected").attr("areaText"));
-        $("#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"));
+        if ($("#vipName option:selected").attr("province")==undefined) {
+        	$("#typeclass").val("");
+        }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"));
+        }
+       
     });
+    
+    
 })
 
 //工单类型
@@ -321,7 +327,7 @@ function saveCustomer() {
 			token: $.cookie("token"),
 			cusname: $('#name').val(), //姓名
             cusphone: $('#tel').val(), //号码
-            productdate: $('#productDate').val(),
+            productdate: $('#productDate').val(), //生产日期
 			buydate: $('.buyDate').val(), //购买日期
 			productname: $('#productname').val(), //产品名称
 			buyaddress: $('#buyAddress').val(), //购买地址  
@@ -345,7 +351,6 @@ function saveCustomer() {
 		},
 		success: function(data) {
 			if(data.state.toLowerCase() == 'success') {
-				
 				layer.msg("保存成功！");
 				debugger
 				window.location.reload()

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -335,6 +335,7 @@ function xq() {
 				$("#productName").text(data.F_ProductName); //产品名称
 				$("#buyAddress").text(data.F_BuyAddress); //购买地址
 				$("#productType").text(data.ProductTypeName); //产品类别
+				$("#productDate").text(data.F_ProductDate); //生产日期
 				$("#batchNumber").text(data.F_BatchNumber); //生产批号
 				$("#userDate").text(data.F_UserDate); //使用日期
 				$('#county').text(data.F_County); //区县 

CallCenterWeb.UI/js/main.js

@@ -28,10 +28,10 @@ function Connect() {
 			cls = 0;
 			$(".Login").addClass("active");
 			//自动签入
-			//lasttime = new Date().getTime();
-			//obj.Type = "Login";
-			//obj.AgentType = "0";
-			//Send(); /*2018-05-19zhangshaungnan注释*/
+			lasttime = new Date().getTime();
+			obj.Type = "Login";
+			obj.AgentType = "0";
+			Send(); /*2018-05-19zhangshaungnan注释*/
 		};
 		//接收到消息的回调方法
 		ws.onmessage = function(evt) {