no message

CallCenterWeb.UI/WorkOrder/WorkOrderExpedite.html

@@ -154,6 +154,7 @@
 							<th data-field="Files" data-align="center" data-formatter="Detail">快递信息</th>
                         <th data-field="WorkOrderID" data-formatter="OverTime" data-align="center">工单超时</th>
                         <th data-field="WorkOrderID" data-formatter="Expedite" data-align="center">操作</th>
+                        <th data-field="ID" data-formatter="Remove" data-align="center">删除</th>
                     </tr>
                 </thead>
             </table>
@@ -174,6 +175,7 @@
 							<th data-field="CBCount" data-align="center">催办</th>
 							<th data-field="WorkOrderID" data-formatter="OverTime" data-align="center">工单超时</th>
 							<th data-field="WorkOrderID" data-formatter="Expedite" data-align="center">操作</th>
+							<th data-field="ID" data-formatter="Remove" data-align="center">删除</th>
 						</tr>
 					</thead>
 				</table>

CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

@@ -13,6 +13,7 @@
 			success: function(data) {
 				if(data.state.toLowerCase()=='success'){
 					if(data.data.groname=='客服组'){
+						console.log(data.data.groname)
 						$('.customerService').show();	
 						ns=1;
 					}else{
@@ -40,6 +41,11 @@
             getAccount('#feedbackDep');
 //          getAccount('#feedbackDep_market');
   
+  //编译器
+  	//编辑器配置
+ KindEditor.ready(function(K) {
+                window.changeEditor = K.create('#feedBackCon');//修改弹出框编辑器
+        })
             //保存
             
             $('.customerSubmit').click(function(){
@@ -237,7 +243,7 @@
 					gdlx: $('#typeclassId').val(),//工单类型id
 					gdzt:$('#State').val(),//工单状态id  
 					province:$("#Province").val(),
-					fkcont:$('#feedBackCon').val(),//反馈内容    
+					fkcont:encodeURIComponent(changeEditor.html()),//反馈内容    
 					sendmsg:$('#express').val() ,//快递信息     
 					note1: $('#remark1').val(),//备注一     
 					note2: $('#remark2').val(),//备注二     

CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

@@ -255,10 +255,10 @@ function Detail(val){
 	if(val) {
 					var str = '<div '
 				
-						str = str + ' title="' + val + '" ';
+						str = str + ' title="' +decodeURIComponent(val)+ '" ';
 				
 					
-					return str + '>' + val + '</div>';
+					return str + '>' +decodeURIComponent(val)+ '</div>';
 }				
 
 }

CallCenterWeb.UI/js/kindeditor/kindeditor.js

@@ -255,14 +255,8 @@ K.options = {
 	minChangeSize : 50,
 	zIndex : 811213,
 	items : [
-		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
-		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
-		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
-		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
 		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
-		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
-		'anchor', 'link', 'unlink', '|', 'about'
+		'italic', 'underline'
 	],
 	noDisableItems : ['source', 'fullscreen'],
 	colorTable : [