Просмотр исходного кода

Merge branch 'develop' of http://192.168.1.222:3000/duhongyu/AnYang_UI into develop

liuzhihui лет назад: 3
Родитель
Сommit
4e16ebf6a5

+ 7 - 2
WebUI/CallCenterWeb.UI/CommonHtml/Back.html

263
                 issatisfie: $(' input[name="huifang"]:checked ').val(),
263
                 issatisfie: $(' input[name="huifang"]:checked ').val(),
264
                 state: State,
264
                 state: State,
265
                 visitid: a,
265
                 visitid: a,
266
+                callid: $.cookie("makeCallId"),
266
                 token: $.cookie("token")
267
                 token: $.cookie("token")
267
             }, function (result) {
268
             }, function (result) {
268
                 result = JSON.parse(result);
269
                 result = JSON.parse(result);
269
                 if (result.state.toLowerCase() == "success") {
270
                 if (result.state.toLowerCase() == "success") {
270
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
271
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
271
                     parent.layer.close(index); //再执行关闭
272
                     parent.layer.close(index); //再执行关闭
272
-                    parent.layer.msg("操作成功");
273
+                    if(!$.cookie("makeCallId")){
274
+						parent.layer.msg("操作成功,非站内拨打");
275
+					}else{
276
+						parent.layer.msg("操作成功");
277
+					}
273
                     parent.$('#orderlist').bootstrapTable('refresh');
278
                     parent.$('#orderlist').bootstrapTable('refresh');
274
-                    // parent.Lawsuit(wid);
279
+                    top.$.cookie("makeCallId", "");
275
                 }
280
                 }
276
             })
281
             })
277
 
282
 

+ 5 - 0
WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

845
                 $(".jbDiv").show()
845
                 $(".jbDiv").show()
846
                 $(".applicationDelay").show()
846
                 $(".applicationDelay").show()
847
                 $(".handle").show()
847
                 $(".handle").show()
848
+                
848
             } else {
849
             } else {
849
                 $(".return").hide()
850
                 $(".return").hide()
850
                 $(".jbDiv").hide()
851
                 $(".jbDiv").hide()
927
                                     } else{
928
                                     } else{
928
                                         $('.SL').text(Data[0].SourceName);
929
                                         $('.SL').text(Data[0].SourceName);
929
                                     }
930
                                     }
931
+                                    if(SLtext ==="2580"){
932
+                                    	$(".applicationDelay").hide()
933
+                                    }
930
                                     $(".DH").text(Data[0].F_WorkOrderId);
934
                                     $(".DH").text(Data[0].F_WorkOrderId);
931
                                     $(".LY").text(Data[0].SourceName); //工单来源
935
                                     $(".LY").text(Data[0].SourceName); //工单来源
932
                                     if(Data[0].SourceName==="人民网"){
936
                                     if(Data[0].SourceName==="人民网"){
933
                                     	$(".peopleRemark").show()
937
                                     	$(".peopleRemark").show()
934
                                     	$(".remarkRM").text(Data[0].remark)
938
                                     	$(".remarkRM").text(Data[0].remark)
935
                                     }
939
                                     }
940
+                                    
936
                                     $(".subjectWords").text(Data[0].KeyName);
941
                                     $(".subjectWords").text(Data[0].KeyName);
937
                                     $(".LX").text(Data[0].TypeName1);
942
                                     $(".LX").text(Data[0].TypeName1);
938
                                     $(".Result").text(Data[0].F_Result);
943
                                     $(".Result").text(Data[0].F_Result);

+ 7 - 2
WebUI/CallCenterWeb.UI/CommonHtml/auditBack.html

302
         })
302
         })
303
         //结案
303
         //结案
304
         function Closure() {
304
         function Closure() {
305
+        	
305
             $.post(huayi.config.callcenter_url + 'WorkOrder/VisitWorkOrder', {
306
             $.post(huayi.config.callcenter_url + 'WorkOrder/VisitWorkOrder', {
306
                 workorderid: wid,
307
                 workorderid: wid,
307
                 visituser: $("#visituser").val(), //审核人
308
                 visituser: $("#visituser").val(), //审核人
317
                 if (result.state.toLowerCase() == "success") {
318
                 if (result.state.toLowerCase() == "success") {
318
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
319
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
319
                     parent.layer.close(index); //再执行关闭
320
                     parent.layer.close(index); //再执行关闭
320
-                    parent.layer.msg("操作成功");
321
+                    if(!$.cookie("makeCallId")){
322
+						parent.layer.msg("操作成功,非站内拨打");
323
+					}else{
324
+						parent.layer.msg("操作成功");
325
+					}
321
                     parent.$('#orderlist').bootstrapTable('refresh');
326
                     parent.$('#orderlist').bootstrapTable('refresh');
322
-                    $.cookie("makeCallId", "");
327
+                    top.$.cookie("makeCallId", "");
323
                 }
328
                 }
324
             })
329
             })
325
         }
330
         }

+ 0 - 1
WebUI/CallCenterWeb.UI/ProvincialPlatformManagement/haveDoneToAuditProvincialPlatform.html

448
                     html1 = html1.replace("isProtect", row.F_IsProtect);
448
                     html1 = html1.replace("isProtect", row.F_IsProtect);
449
                     html1 = html1.replace("row", row.F_MainDeptId);
449
                     html1 = html1.replace("row", row.F_MainDeptId);
450
                 }
450
                 }
451
-                bl
452
                 html += html1;
451
                 html += html1;
453
             }
452
             }
454
             return html;
453
             return html;

+ 2 - 2
WebUI/CallCenterWeb.UI/TelCall/CallRecord.html

298
                             <td >
298
                             <td >
299
                                 <select id="Business" class="form-control" name="select">
299
                                 <select id="Business" class="form-control" name="select">
300
                                     <option value="">请选择</option>
300
                                     <option value="">请选择</option>
301
-                                    <option value="1">健康码</option>
301
+                                    <option value="1">疫情咨询</option>
302
                                     <option value="2">市民咨询</option>
302
                                     <option value="2">市民咨询</option>
303
                                     <option value="3">营商环境</option>
303
                                     <option value="3">营商环境</option>
304
                                     <option value="4">涉疫事项</option>
304
                                     <option value="4">涉疫事项</option>
754
        function formatBusinessType(val, row){
754
        function formatBusinessType(val, row){
755
         	if (row.CallType ===0) {
755
         	if (row.CallType ===0) {
756
         		if (val ===1) {
756
         		if (val ===1) {
757
-        			return '健康码'
757
+        			return '疫情咨询'
758
         		} else if (val ===3) {
758
         		} else if (val ===3) {
759
         			return '营商环境'
759
         			return '营商环境'
760
         		} else if (val ===4) {
760
         		} else if (val ===4) {