浏览代码

文档问题修改

liuyifan 5 年之前
父节点
当前提交
f7c9f313f0

+ 1 - 1
CallCenterWeb.UI/Message/MessageSend.html

@@ -155,7 +155,7 @@
155 155
 //                  });
156 156
 //                  return;
157 157
 //              }
158
-                $.post(huayi.config.callcenter_url + "SMS/SendSMS",
158
+                $.post(huayi.config.callcenter_url + "SMS/SendSMSBySdk",
159 159
                     {
160 160
                         // type: $("#type").val(),
161 161
 						sendWay:$('#order_isover').find('input[type="radio"]:checked').val(), 

+ 1 - 1
CallCenterWeb.UI/WorkOrder/WorkOrderParty.html

@@ -81,7 +81,7 @@
81 81
 							
82 82
 							<!-- <th data-field="CBCount" data-align="center">催办</th>-->
83 83
 							 
84
-							<!-- <th data-field="WorkOrderID" data-class="workOprate workOprate5" data-formatter="formatterOprateParty" data-align="center">操作工单</th> -->
84
+							<th data-field="WorkOrderID" data-class="workOprate workOprate5" data-formatter="formatterOprateParty" data-align="center">操作工单</th>
85 85
 						</tr>
86 86
 					</thead>
87 87
 				</table>

+ 1 - 0
CallCenterWeb.UI/callScreen/call.js

@@ -393,6 +393,7 @@ function getSearchCustomer() {
393 393
  * 根据电话获取 客户信息
394 394
  * */
395 395
 function getCustomer() {
396
+    $("#head_phone").val(phoneNumber); //客户电话
396 397
     $.ajax({
397 398
         url: huayi.config.callcenter_url + "CustomerNew/GetCustomerByTel",
398 399
         type: "get",

+ 4 - 0
CallCenterWeb.UI/callScreen/css/call.css

@@ -1266,6 +1266,10 @@ html,
1266 1266
 	right: 20px;
1267 1267
 }
1268 1268
 
1269
+.detail-con {
1270
+    height: 230px;
1271
+    overflow: auto;
1272
+}
1269 1273
 
1270 1274
 @media (max-width: 1680px) {
1271 1275
 

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

@@ -262,7 +262,8 @@ function formatterOprateDispose(val, row) {
262 262
 function formatterOprateParty(val, row) {
263 263
 	return '<ul class="tool_downs">' +
264 264
 		// '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_delete_' + row.ID + '" onclick="btn_delete(\'' + row.ID + '\')" title="删除">删除</a></li>' +
265
-		// '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_comment_' + row.ID + '" onclick="btn_comment(\'' + val + '\')" title="评论">评论</a></li>' +
265
+        // '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_comment_' + row.ID + '" onclick="btn_comment(\'' + val + '\')" title="评论">评论</a></li>' +
266
+        '<li><a href="javascript:;" class="aBtn" authorize="yes" id="HY_end_' + row.ID + '" onclick="btn_xiug(\'' + row.ID + '\')" title="修改">修改</a></li>'
266 267
 		'</ul>';
267 268
 }
268 269
 

+ 24 - 8
CallCenterWeb.UI/js/index.js

@@ -122,16 +122,34 @@ $(document).ready(function () {
122 122
         $(".change_over").removeClass("fadeInDown").addClass("fadeOutUp");
123 123
         $(".change_over").addClass("hidens");
124 124
     });
125
-    //键盘事件外呼
126
-    document.onkeydown = function (e) {
127
-        var theEvent = window.event || e;
128
-        var code = theEvent.keyCode || theEvent.which;
129
-        if (code == 13) {
125
+    // 按回车外呼
126
+    $('#WH_Result').bind('keypress', function (event) {
127
+        if (event.keyCode == "13") {
128
+            var phone = $("#WH_Result").val()
129
+            $("#Result").val(phone)
130 130
             $(".CallOut").click();
131 131
         }
132
-    };
132
+    });
133
+    // 按回车三方通话
134
+    $('#three_call_Result').bind('keypress', function (event) {
135
+        if (event.keyCode == "13") {
136
+            var phone = $("#three_call_Result").val()
137
+            $("#Result").val(phone)
138
+            $(".CallOut").click();
139
+        }
140
+    });
141
+    // 按回车转移
142
+    $('#change_over_Result').bind('keypress', function (event) {
143
+        if (event.keyCode == "13") {
144
+            var phone = $("#change_over_Result").val()
145
+            $("#Result").val(phone)
146
+            $(".CallOut").click();
147
+        }
148
+    });
149
+    
133 150
     //外呼呼出
134 151
     $(".CallOut").click(function (event) {
152
+        console.log(123, $("#Result").val())
135 153
         event.stopPropagation();
136 154
         if ($("#Result").val()) {
137 155
             $.ajax({
@@ -189,8 +207,6 @@ $(document).ready(function () {
189 207
     });
190 208
     //外呼弹屏数字键盘号码截取
191 209
     $(".WH_img").click(function () {
192
-        console.log("123123");
193
-        // var Result = $("#Result").val() + "";
194 210
         var Result = $("#WH_Result").val() + "";
195 211
         Result = Result.substr(0, Result.length - 1);
196 212
         $("#Result").val(Result);

+ 12 - 2
CallCenterWeb.UI/zhiShiKu/js/addOrEditKnowledge.js

@@ -9,6 +9,14 @@ var limitNum = 6; //限制数量
9 9
 var edit_id = helper.request.queryString("edit_id");
10 10
 var token = $.cookie("token");
11 11
 
12
+KindEditor.ready(function (K) {
13
+    window.kn_content = K.create("#kn_content", {
14
+        uploadJson: "../../js/kindeditor/asp.net/upload_json.ashx",
15
+        fileManagerJson: "../../js/kindeditor/asp.net/file_manager_json.ashx",
16
+        allowFileManager: true,
17
+    }); //添加弹出框编辑器
18
+});
19
+
12 20
 $(function () {
13 21
     autosize($("textarea"));
14 22
     getChangeTree();
@@ -88,7 +96,8 @@ function getDetail() {
88 96
             var con = data.data;
89 97
             $("#kn_title").val(con.F_Title);
90 98
             $("#kn_key").val(con.F_KeyWords);
91
-            $("#kn_content").val(con.F_Description);
99
+            kn_content.html(con.F_Description);
100
+            // $("#kn_content").val(con.F_Description);
92 101
             $("#kn_type").val(con.F_Expand1);
93 102
             $("#kn_type").attr("data-id", con.F_CategoryId);
94 103
 
@@ -194,7 +203,8 @@ function saveKnowledge() {
194 203
             infoid: edit_id,
195 204
             title: $("#kn_title").val(),
196 205
             key: $("#kn_key").val(),
197
-            con: helper.filter.delHtmlTag($("#kn_content").val()),
206
+            con: encodeURIComponent(kn_content.html()),
207
+            // con: helper.filter.delHtmlTag($("#kn_content").val()),
198 208
             pid: $("#kn_type").attr("data-id"),
199 209
             fileids: proimglist && proimglist.join(","),
200 210
             token: token,

+ 1 - 1
CallCenterWeb.UI/zhiShiKu/js/zhiShiKuManger.js

@@ -155,7 +155,7 @@ $('.add').click(function() {
155 155
 		moveType: 1, //拖拽类型 默认的拖拽风格正如你所见到的,会有个过度的透明框。但是如果你不喜欢,你可以设定moveType: 1切换到传统的拖拽模式
156 156
 		moveOut: false, //拖拽到窗口外
157 157
 		//resize: true,//是否允许拉伸
158
-		area: ['70%', '50%'],
158
+		area: ['70%', '70%'],
159 159
 		content: "template/addOrEditKnowledge.html"
160 160
 	});
161 161
 })

+ 6 - 1
CallCenterWeb.UI/zhiShiKu/template/addOrEditKnowledge.html

@@ -41,7 +41,10 @@
41 41
                 <tr>
42 42
                     <th>内容:</th>
43 43
                     <td colspan="3">
44
-                        <textarea id="kn_content" rows="3"></textarea>
44
+                        <textarea name="" data-adaptheight id="kn_content"
45
+                            style="width: 100%;height: 300px;"></textarea>
46
+
47
+                        <!-- <textarea id="kn_content" rows="3"></textarea> -->
45 48
                     </td>
46 49
                 </tr>
47 50
                 <tr>
@@ -68,6 +71,8 @@
68 71
     </div>
69 72
 
70 73
 </body>
74
+<script src="../../js/kindeditor/kindeditor-all-min.js"></script>
75
+<script src="../../js/kindeditor/lang/zh-CN.js"></script>
71 76
 <script src="../../js/zTree/jquery.ztree.core.js"></script>
72 77
 <script src="../../js/webuploader/webuploader.min.js"></script>
73 78
 <script src="../../js/autosize/autosize.min.js"></script>