d123 7 anni fa
parent
commit
5581a9911d

File diff suppressed because it is too large
+ 10 - 4
CallCenterWeb.UI/WorkOrder/AddWorkOrder.html


+ 2 - 0
CallCenterWeb.UI/WorkOrder/WorkOrderExpedite.html

154
 							<th data-field="Files" data-align="center" data-formatter="Detail">快递信息</th>
154
 							<th data-field="Files" data-align="center" data-formatter="Detail">快递信息</th>
155
                         <th data-field="WorkOrderID" data-formatter="OverTime" data-align="center">工单超时</th>
155
                         <th data-field="WorkOrderID" data-formatter="OverTime" data-align="center">工单超时</th>
156
                         <th data-field="WorkOrderID" data-formatter="Expedite" data-align="center">操作</th>
156
                         <th data-field="WorkOrderID" data-formatter="Expedite" data-align="center">操作</th>
157
+                        <th data-field="ID" data-formatter="Remove" data-align="center">删除</th>
157
                     </tr>
158
                     </tr>
158
                 </thead>
159
                 </thead>
159
             </table>
160
             </table>
174
 							<th data-field="CBCount" data-align="center">催办</th>
175
 							<th data-field="CBCount" data-align="center">催办</th>
175
 							<th data-field="WorkOrderID" data-formatter="OverTime" data-align="center">工单超时</th>
176
 							<th data-field="WorkOrderID" data-formatter="OverTime" data-align="center">工单超时</th>
176
 							<th data-field="WorkOrderID" data-formatter="Expedite" data-align="center">操作</th>
177
 							<th data-field="WorkOrderID" data-formatter="Expedite" data-align="center">操作</th>
178
+							<th data-field="ID" data-formatter="Remove" data-align="center">删除</th>
177
 						</tr>
179
 						</tr>
178
 					</thead>
180
 					</thead>
179
 				</table>
181
 				</table>

+ 7 - 1
CallCenterWeb.UI/js/WorkOrder/AddWorkOrder.js

13
 			success: function(data) {
13
 			success: function(data) {
14
 				if(data.state.toLowerCase()=='success'){
14
 				if(data.state.toLowerCase()=='success'){
15
 					if(data.data.groname=='客服组'){
15
 					if(data.data.groname=='客服组'){
16
+						console.log(data.data.groname)
16
 						$('.customerService').show();	
17
 						$('.customerService').show();	
17
 						ns=1;
18
 						ns=1;
18
 					}else{
19
 					}else{
40
             getAccount('#feedbackDep');
41
             getAccount('#feedbackDep');
41
 //          getAccount('#feedbackDep_market');
42
 //          getAccount('#feedbackDep_market');
42
   
43
   
44
+  //编译器
45
+  	//编辑器配置
46
+ KindEditor.ready(function(K) {
47
+                window.changeEditor = K.create('#feedBackCon');//修改弹出框编辑器
48
+        })
43
             //保存
49
             //保存
44
             
50
             
45
             $('.customerSubmit').click(function(){
51
             $('.customerSubmit').click(function(){
237
 					gdlx: $('#typeclassId').val(),//工单类型id
243
 					gdlx: $('#typeclassId').val(),//工单类型id
238
 					gdzt:$('#State').val(),//工单状态id  
244
 					gdzt:$('#State').val(),//工单状态id  
239
 					province:$("#Province").val(),
245
 					province:$("#Province").val(),
240
-					fkcont:$('#feedBackCon').val(),//反馈内容    
246
+					fkcont:encodeURIComponent(changeEditor.html()),//反馈内容    
241
 					sendmsg:$('#express').val() ,//快递信息     
247
 					sendmsg:$('#express').val() ,//快递信息     
242
 					note1: $('#remark1').val(),//备注一     
248
 					note1: $('#remark1').val(),//备注一     
243
 					note2: $('#remark2').val(),//备注二     
249
 					note2: $('#remark2').val(),//备注二     

+ 2 - 2
CallCenterWeb.UI/js/WorkOrder/WorkOrder.js

255
 	if(val) {
255
 	if(val) {
256
 					var str = '<div '
256
 					var str = '<div '
257
 				
257
 				
258
-						str = str + ' title="' + val + '" ';
258
+						str = str + ' title="' +decodeURIComponent(val)+ '" ';
259
 				
259
 				
260
 					
260
 					
261
-					return str + '>' + val + '</div>';
261
+					return str + '>' +decodeURIComponent(val)+ '</div>';
262
 }				
262
 }				
263
 
263
 
264
 }
264
 }

+ 1 - 7
CallCenterWeb.UI/js/kindeditor/kindeditor.js

255
 	minChangeSize : 50,
255
 	minChangeSize : 50,
256
 	zIndex : 811213,
256
 	zIndex : 811213,
257
 	items : [
257
 	items : [
258
-		'source', '|', 'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut', 'copy', 'paste',
259
-		'plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright',
260
-		'justifyfull', 'insertorderedlist', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
261
-		'superscript', 'clearhtml', 'quickformat', 'selectall', '|', 'fullscreen', '/',
262
 		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
258
 		'formatblock', 'fontname', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
263
-		'italic', 'underline', 'strikethrough', 'lineheight', 'removeformat', '|', 'image', 'multiimage',
264
-		'flash', 'media', 'insertfile', 'table', 'hr', 'emoticons', 'baidumap', 'pagebreak',
265
-		'anchor', 'link', 'unlink', '|', 'about'
259
+		'italic', 'underline'
266
 	],
260
 	],
267
 	noDisableItems : ['source', 'fullscreen'],
261
 	noDisableItems : ['source', 'fullscreen'],
268
 	colorTable : [
262
 	colorTable : [