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

WebUI/CallCenterWeb.UI/CommonHtml/Back.html

@@ -263,15 +263,20 @@
                 issatisfie: $(' input[name="huifang"]:checked ').val(),
                 state: State,
                 visitid: a,
+                callid: $.cookie("makeCallId"),
                 token: $.cookie("token")
             }, function (result) {
                 result = JSON.parse(result);
                 if (result.state.toLowerCase() == "success") {
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                     parent.layer.close(index); //再执行关闭
-                    parent.layer.msg("操作成功");
+                    if(!$.cookie("makeCallId")){
+						parent.layer.msg("操作成功，非站内拨打");
+					}else{
+						parent.layer.msg("操作成功");
+					}
                     parent.$('#orderlist').bootstrapTable('refresh');
-                    // parent.Lawsuit(wid);
+                    top.$.cookie("makeCallId", "");
                 }
             })
 

WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

@@ -845,6 +845,7 @@
                 $(".jbDiv").show()
                 $(".applicationDelay").show()
                 $(".handle").show()
+                
             } else {
                 $(".return").hide()
                 $(".jbDiv").hide()
@@ -927,12 +928,16 @@
                                     } else{
                                         $('.SL').text(Data[0].SourceName);
                                     }
+                                    if(SLtext ==="2580"){
+                                    	$(".applicationDelay").hide()
+                                    }
                                     $(".DH").text(Data[0].F_WorkOrderId);
                                     $(".LY").text(Data[0].SourceName); //工单来源
                                     if(Data[0].SourceName==="人民网"){
                                     	$(".peopleRemark").show()
                                     	$(".remarkRM").text(Data[0].remark)
                                     }
+                                    
                                     $(".subjectWords").text(Data[0].KeyName);
                                     $(".LX").text(Data[0].TypeName1);
                                     $(".Result").text(Data[0].F_Result);

WebUI/CallCenterWeb.UI/CommonHtml/auditBack.html

@@ -302,6 +302,7 @@
         })
         //结案
         function Closure() {
+        	
             $.post(huayi.config.callcenter_url + 'WorkOrder/VisitWorkOrder', {
                 workorderid: wid,
                 visituser: $("#visituser").val(), //审核人
@@ -317,9 +318,13 @@
                 if (result.state.toLowerCase() == "success") {
                     var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                     parent.layer.close(index); //再执行关闭
-                    parent.layer.msg("操作成功");
+                    if(!$.cookie("makeCallId")){
+						parent.layer.msg("操作成功，非站内拨打");
+					}else{
+						parent.layer.msg("操作成功");
+					}
                     parent.$('#orderlist').bootstrapTable('refresh');
-                    $.cookie("makeCallId", "");
+                    top.$.cookie("makeCallId", "");
                 }
             })
         }

WebUI/CallCenterWeb.UI/ProvincialPlatformManagement/haveDoneToAuditProvincialPlatform.html

@@ -448,7 +448,6 @@
                     html1 = html1.replace("isProtect", row.F_IsProtect);
                     html1 = html1.replace("row", row.F_MainDeptId);
                 }
-                bl
                 html += html1;
             }
             return html;

WebUI/CallCenterWeb.UI/TelCall/CallRecord.html

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