d123 7 yıl önce
ebeveyn
işleme
f3e40e00f6

Dosya farkı çok büyük olduğundan ihmal edildi
+ 73 - 95
CallCenterWeb.UI/callScreen/call.js


+ 7 - 10
CallCenterWeb.UI/callScreen/callScreen.html

@@ -8,10 +8,8 @@
8 8
 		<script src="../Script/Common/huayi.config.js"></script>
9 9
 		<link href="./../css/plugins/jasny/jasny-bootstrap.min.css" rel="stylesheet">
10 10
 		<link href="./../js/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" />
11
-		<link rel="stylesheet" href="../css/WorkOrder/jquery.editable-select.css" />
12 11
 		<link rel="stylesheet" href="./../js/zTree/zTreeStyle.css" />
13 12
 		<link rel="stylesheet" href="./css/call.css" />
14
-		<link rel="stylesheet" href="./css/select.css" />
15 13
 		<style>
16 14
 			body,
17 15
 			html,
@@ -462,7 +460,7 @@
462 460
 						<tr>
463 461
 							<th>来电单位:</th>
464 462
 							<td  style="position: relative;">
465
-								<input type="text" value="" class="ldpamter" />
463
+								<!--<input type="text" value="" class="ldpamter" />-->
466 464
 								<input id="testInput1" type="text" style="width:100%;" value="" style="display: none;" />
467 465
 								<ul class="testInput-list">
468 466
 									<li></li>
@@ -642,13 +640,11 @@
642 640
                                     反馈单位:
643 641
                                 </span>
644 642
 										<span class="col-sm-3">
645
-									<!--<input type="text" id="testInput_" class="ld-sercon form-control " />
643
+									<input type="text" id="testInput_" class="ld-sercon form-control " />
646 644
 								<ul class="testInput-list">
647 645
 									<li></li>
648
-								</ul>-->
649
-									<select class="form-control" id="LDunit_">
650
-										
651
-									</select>									  
646
+								</ul>
647
+									
652 648
                                 </span>
653 649
 									</div>
654 650
 									<div class="form-group clearfix">
@@ -748,12 +744,13 @@
748 744
 		<script src="./../js/plugins/datapicker/bootstrap-datepicker.js"></script>
749 745
 		<!--<script src="./js/bootstrap-select/js/bootstrap-select.js"></script>-->
750 746
 		<script src="./../css/laydate/laydate.js"></script>
747
+		<script src="../js/kindeditor/kindeditor.js"></script>
748
+	<script src="../js/kindeditor/lang/zh_CN.js"></script>
751 749
 		<!--<script src="./../js/jquery.select.js"></script>-->
752 750
 		<script src="./../js/main.js?v=1.5"></script>
753
-		<script src="../js/WorkOrder/jquery.editable-select.js"></script>
754
-		<script src="select.js"></script>
755 751
 		<script src="call.js"></script>
756 752
 		<script>
753
+			Select($("#testInput1"));
757 754
 			
758 755
 		</script>
759 756
 	</body>

+ 3 - 1
CallCenterWeb.UI/callScreen/css/call.css

@@ -353,4 +353,6 @@
353 353
 			color: #ccc;
354 354
 		}
355 355
 	
356
-	
356
+	.ke-container{
357
+		width: 70%!important;
358
+	}

+ 9 - 3
CallCenterWeb.UI/js/WorkOrder/xgWork.js

@@ -48,6 +48,11 @@ $(document).ready(function() {
48 48
 		saveMarket();
49 49
 	})
50 50
 	//  	})
51
+	
52
+	 	//编辑器配置
53
+ KindEditor.ready(function(K) {
54
+                window.changeEditor = K.create('#feedBackCon');//修改弹出框编辑器
55
+        })
51 56
 })
52 57
 
53 58
 //工单类型
@@ -206,7 +211,7 @@ function saveCustomer() {
206 211
 			type: $('#DicValueList').val(), //工单来源
207 212
 			typeclass: $('#typeclassId').val(), //工单类型id
208 213
 			gdzt: $('#State').val(), //工单状态id   
209
-			detail: $('#feedBackCon').val(), //反馈内容    
214
+			detail: encodeURIComponent(changeEditor.html()), //反馈内容    
210 215
 			files: $('#express').val(), //快递信息     
211 216
 			remark1: $('#remark1').val(), //备注一     
212 217
 			remark2: $('#remark2').val(), //备注二     
@@ -251,7 +256,7 @@ function saveMarket() {
251 256
 
252 257
 	$.ajax({
253 258
 		type: "post",
254
-		url: huayi.config.callcenter_url + "CallInScreen/AddWorkOrder",
259
+		url: huayi.config.callcenter_url + "WorkOrder/EditWorkOrderDetail",
255 260
 		dataType: 'json',
256 261
 		async: true,
257 262
 		data: {
@@ -260,7 +265,7 @@ function saveMarket() {
260 265
 			tel: $('#tel_market').val(), //号码
261 266
 			lddep: $('#testInput3').val(), //来电单位
262 267
 			fkdep: $('#testInput4').val(), //反馈单位
263
-			fkcont: $('#remark_market').val(), //反馈内容
268
+			fkcont: encodeURIComponent(changeEditor.html()), //反馈内容
264 269
 			callid: $("#CallID").val()
265 270
 
266 271
 		},
@@ -321,6 +326,7 @@ $.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetWorkOrder', {
321 326
 			$("#testInput4").val(data.Source);
322 327
 			$("#typeclass").val(data.GDLXName);
323 328
 			$("#feedBackCon").text(data.Detail);
329
+			changeEditor.html(decodeURIComponent(data.Detail));			
324 330
 			$("#remark_market").text(data.Detail);
325 331
 			$("#express").text(data.Files);
326 332
 			$("#remark1").text(data.City);