3.22

WebChartNewest/Script/Common/huayi.config.js

@@ -3,8 +3,8 @@ if (huayi == undefined) {
     var huayi = {};
 }
 huayi.config = {
-//	callcenter_url: "http://192.168.8.9:1042/",//生产环境  
-	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
+	callcenter_url: "http://192.168.8.9:1042/",//生产环境  
+//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/",
     socket_ip: "222.143.106.43",//ip 61.54.2.122:8081   ws://222.143.106.43:8081/
     socket_port: "8081",// 端口
     indextime: 30000//报表刷新时间

WebChartNewest/index.html

@@ -885,15 +885,15 @@
 						data-pagination="true">
 						<thead>
 							<tr>
-								<th data-field="F_WorkOrderId" data-align="center" data-formatter="getformatter">工单编号
+								<th data-field="F_WorkOrderId" data-align="center"  data-width="100" data-formatter="getformatter">工单编号
 								</th>
-								<th data-field="F_ComTitle" data-align="center"  data-formatter="getformatterTitle">工单标题</th>
+								<th data-field="F_ComTitle" data-align="center"  data-formatter="getformatterTitle" data-width="230">工单标题</th>
 								<th data-field="DeptName" data-align="center">承办单位</th>
-								<th data-field="F_ComContent" data-align="center" data-width="150"
-									data-formatter="getDeptnameC">工单内容</th>
-								<th data-field="UserName" data-align="center">受理人</th>
-								<th data-field="F_CusPhone" data-align="center">联系方式</th>
+								<th data-field="F_ComContent" data-align="center" data-width="500" data-formatter="getDeptnameC">工单内容</th>
+								<!--<th data-field="UserName" data-align="center">受理人</th>
+								<th data-field="F_CusPhone" data-align="center">联系方式</th>--> 
 								<th data-field="F_AssignTime" data-align="center">转办时间</th>
+								<th data-field="ClassificationName" data-align="center" data-visible="false">主题分类</th>
 								<th data-field="KeyName" data-align="center" data-formatter="getProblem">问题分类</th>
 							</tr>
 						</thead>
@@ -924,9 +924,9 @@
 							data-pagination="true" style="table-layout: fixed;">
 							<thead>
 								<tr>
-									<th data-field="F_WorkOrderId"  data-width="252" data-align="center" data-formatter="getformatterDetail">工单编号
+									<th data-field="F_WorkOrderId"  data-width="160" data-align="center" data-formatter="getformatterDetail">工单编号
 									</th>
-									<th data-field="F_ComTitle" data-align="center"  data-formatter="getformatterTitle">工单标题</th>
+									<th data-field="F_ComTitle"  data-width="300" data-align="center"  data-formatter="getformatterTitleDetail">工单标题</th>
 								</tr>
 							</thead>
 							<tbody class="list">

WebChartNewest/js/dispatTopic/dispatTopic.js

@@ -104,7 +104,7 @@ function cutHotThings() {
 				$('#themeRate').text(res.data[0].Proportion);
 			}
 			for(var i = 0; i < secData.length; i++) {
-				maxNum.push(Math.max.apply(null, conNum) + 200);
+				maxNum.push(Math.max.apply(null, conNum) + 10);
 			}
 			newHotThingsChart('hotThings', nameData, conNum, maxNum, -30,conNumData)
 		}

WebChartNewest/js/workOrder.js

@@ -1,4 +1,5 @@
 //工单列表
+var classificationFlag
 function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,timetype,handling,source,dptype, date, Township, strworkid, stime, etime, isspecial, classification, time = 0, specialid) {
 	$('#orderTel').val('');
 	$('#orderKey').val('');
@@ -19,6 +20,12 @@ function workTable(KeyId,deptid,sourceId,PhoneType,keyword ,type,sourceArea,key,
 		$('#themeIdHidden').val('')
 	})
 	
+	if (classification) {
+		classificationFlag  = true
+	} else{
+		classificationFlag  = false
+	}
+	
 	var param = {
 //				token: $.cookie("token"),
 //				page: params.pageNumber,
@@ -100,7 +107,9 @@ function initTable(parm) {
 			};
 		},
 		onLoadSuccess: function(res) { //加载成功时执行
-			
+				if (classificationFlag) {
+					$('.workListTable').bootstrapTable('showColumn', 'ClassificationName');
+				}
 		},
 		onLoadError: function() { //加载失败时执行
 			//layer.msg("加载数据失败", { time: 1500, icon: 2 });
@@ -241,12 +250,22 @@ function backWorkTable(deptid,type) {
 //列表操作
 function getformatter(v) {
 	// workStateAct = 2
-	return '<span class="workAct" onclick="btn_detail(\'' + v + '\')">' + v + '</span>'
+	 
+	return '<span class="workAct" onclick="btn_detail(\'' + v + '\')" style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:120px;text-align: center;">' + v + '</span>'
 }
+
+
 function getformatterDetail(v,row){
-//	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')">' + v + '</span>'
-	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')">' + v + '</span></br><span class="workAct" ' + row.F_ComTitle + '</span>'
+	//	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')">' + v + '</span>'
+	//style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:80px;text-align: center;"
+	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')"  style="display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:160px;text-align: center;">' + v + '</span>'
+//	return '<span class="workAct" onclick="detailHandle(\'' + v + '\')"  >' + v + '</span></br><span class="workAct" ' + row.F_ComTitle + '</span>'
 }
+function getformatterTitleDetail(val) { 
+//	style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:100px;margin:0 auto;'
+	return "<div style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:300px;margin:0 auto;'>" +
+	val + "</div>"
+ }
 
 function getWorkState(v, r) {
 	if (r.F_WorkState == 0) {
@@ -277,18 +296,22 @@ function getWorkState(v, r) {
 		return "<span>重办驳回</span>";
 	}
 }
+
 function getDeptnameC(v) {
-	return "<span style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:150px;text-align: center;'>" +
+	return "<span style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:500px;text-align: center;'>" +
 		v + "</span>"
 }
+
 function getProblem(v){
 	return "<div style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:150px;margin:0 auto;'>" +
 		v + "</div>"
 }
 function getformatterTitle(val) { 
-	return "<div style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:150px;margin:0 auto;'>" +
+	return "<div style='display: block;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:230px;margin:0 auto;'>" +
 	val + "</div>"
  }
+
+
 function detailHandle(id){
 	console.log(id)
 	detailId = id;

WebUI/CallCenterWeb.UI/Appeal/integratedQuery.html

@@ -536,20 +536,64 @@
             return html;
         }
         //音频
-        function setCode(val) {
+//      function setCode(val) {
+//          if (val) {
+//              return (
+//                  '<div class="imgs" style="cursor: pointer;">' +
+//                  '<img src="../img/vice.png" alt="" onclick= "helper.luyin.view(this)" item="' +
+//                  val +
+//                  '" />' +
+//                  "</div>"
+//              );
+//          } else {
+//              return "";
+//          }
+//      }
+		//音频
+        function setCode(val, data) {
+        	console.log(val, data, 'ssss')
             if (val) {
-                return (
-                    '<div class="imgs" style="cursor: pointer;">' +
-                    '<img src="../img/vice.png" alt="" onclick= "helper.luyin.view(this)" item="' +
-                    val +
-                    '" />' +
-                    "</div>"
-                );
+                return '<div class="imgs">' +
+                    '<img src="../img/vice.png" alt="" onclick="inputPwd(' +data.F_CallRecordId+ ')" item="' + val + '" />' +
+                    '</div>';
             } else {
-                return "";
+                return '';
             }
         }
+         function inputPwd(val) {
+
+        	layer.prompt({
+        		formType: 1,
+        		title: '请输入密码',
+        	}, function(value, index, elem) {
 
+        		if(!value) {
+        			layer.msg('请输入密码')
+        			return
+        		}
+        		$.ajax({
+        			type: "get",
+        			url: huayi.config.callcenter_url + "Callrecords/GetCallFilePath", //获取数据的Servlet地址,
+        			async: true,
+        			dataType: "json",
+        			data: {
+        				CallRecordsId: val,
+        				password: value,
+        				token: $.cookie("token")
+        			},
+        			success: function(res) {
+        				if(res.state.toLowerCase() === "success") {
+
+
+        					layer.close(index);
+        					helper.luyin.view(null, res.data)
+        				}
+        			}
+        		});
+
+        	});
+
+        }
         //编号
         function serialNumber(val, row, index) {
             return index + 1;

WebUI/CallCenterWeb.UI/CommonHtml/banli.html

@@ -71,7 +71,35 @@
             		<span id="workremark" name="" rows="6" cols="" readonly="readonly"></span>
             	</td>
             </tr>
-            <tr>
+            <tr class="Importent">
+            	<th>
+                    调查情况:
+                </th>
+                <td>
+                    <select class="select_" id="issurvey">
+                        <option value="1">属实</option>
+                        <option value="2">部分属实</option>
+                        <option value="2">不属实</option>
+                    </select>
+                </td>
+              </tr>
+              <tr>
+            	<th>
+                    调查情况说明:
+                </th>
+                <td colspan="5">
+                    <textarea data-adaptheight id="survey" name="" rows="3" cols=""></textarea>
+                </td>
+              </tr>
+              <tr>
+            	<th>
+                    办理依据:
+                </th>
+                <td colspan="5">
+                    <textarea data-adaptheight id="accordingto" name="" rows="3" cols=""></textarea>
+                </td>
+              </tr>
+            <!--<tr>
                 <th class="Importent">是/否向当事人反馈:</th>
                 <td id="isProResultRadio" style="font-size: 12px">
                     <label style="margin-right: 10px">
@@ -81,7 +109,7 @@
                         <input type="radio" value="0" name="isDisposeResult" style="vertical-align: -2px" />否
                     </label>
                 </td>
-            </tr>
+            </tr>-->
             <tr class="dealWithRemark-wrapper">
                 <th>已办未果备注:</th>
                 <td colspan="5">
@@ -116,11 +144,14 @@
                     <input type="text" id="connectmode" />
                 </td>
             </tr>
-            <tr class="isstaisfied-wrapper">
-                <th>是否满意:</th>
+            <tr  class="Importent">
+                <th>回访情况:</th>
                 <td id="isStaisfiedRadio" style="font-size: 12px" colspan="5">
+                	<label style="margin-right: 10px">
+                        <input type="radio" value="0" name="isstaisfied" style="vertical-align: -2px" />未回访
+                    </label>
                     <label style="margin-right: 10px">
-                        <input type="radio" value="1" name="isstaisfied" style="vertical-align: -2px" />满意
+                        <input type="radio" value="1" name="isstaisfied" style="vertical-align: -2px"  />满意
                     </label>
                     <label style="margin-right: 10px">
                         <input type="radio" value="2" name="isstaisfied" style="vertical-align: -2px" />基本满意
@@ -172,6 +203,7 @@
         var simpleDetailStrStart = "";
         var simpleDetailStrEnd = "";
         var simpleDetailStr = "";
+        var isproresult
         Detail();
         $(document).ready(function () {
             laydate.skin("blue");
@@ -197,95 +229,113 @@
                 $(".fjnr").text("");
                 $("#scfj").hide();
             });
-            $(".BC").click(function () {
-                if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "1") {
-                    if ($("#dealman").val() == "") {
-                        layer.msg("办理人不能为空");
-                    } else if ($("#situation").val() == "") {
-                        layer.msg("处理情况不能为空");
-                    } else if ($("#dealcontact").val() == "") {
-                        layer.msg("联系方式不能为空");
-                    } else if ($("#duties").val() == "") {
-                        layer.msg("职务不能为空");
-                    } else if ($("#result").val() == "") {
-                        layer.msg("请生成办理结果");
-                    } else {
-                        State = 0;
-                        JA();
-                    }
-                } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "2") {
-                    State = 0;
-                    JA();
-                } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "0") {
-                    State = 0;
-                    JA();
-                } else {
-                    layer.msg("请选择是/否向当事人反馈");
-                }
-            });
+//          $(".BC").click(function () {
+//              if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "1") {
+//                  if ($("#dealman").val() == "") {
+//                      layer.msg("办理人不能为空");
+//                  } else if ($("#situation").val() == "") {
+//                      layer.msg("处理情况不能为空");
+//                  } else if ($("#dealcontact").val() == "") {
+//                      layer.msg("联系方式不能为空");
+//                  } else if ($("#duties").val() == "") {
+//                      layer.msg("职务不能为空");
+//                  } else if ($("#result").val() == "") {
+//                      layer.msg("请生成办理结果");
+//                  } else {
+//                      State = 0;
+//                      JA();
+//                  }
+//              } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "2") {
+//                  State = 0;
+//                  JA();
+//              } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "0") {
+//                  State = 0;
+//                  JA();
+//              } else {
+//                  layer.msg("请选择是/否向当事人反馈");
+//              }
+//          });
             $(".Submit").click(function () {
             	if(decodeURI(isSPT) === '省12345平台' && $("#situation").val().length > 1000){  
            		    layer.msg("办理结果不能超过1000字");
            		    return; 
             	}
-                if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "1") {
-                    if ($("#dealman").val() == "") {
-                        layer.msg("办理人不能为空");
-                    } else if ($("#situation").val() == "") {
-                        layer.msg("处理情况不能为空");
-                    } else if ($("#dealcontact").val() == "") {
-                        layer.msg("联系方式不能为空");
-                    } else if ($("#duties").val() == "") {
-                        layer.msg("职务不能为空");
-                    } 
-//                  else if ($("#result").val() == "") {
-//                      layer.msg("请生成办理结果");
-//                  }
-                    else {
-                        State = 1;
-                        //$("#situation").val(stripscript($("#situation").val()));
-                        $("#result").val($("#situation").val().replace(simpleDetailStrStart, ''))
-                        JA();
-                    }
-                } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "2") {
-                    State = 1;
-                    JA();
-                } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "0") {
-                    State = 1;
-                    JA();
+            	if (!$('#isStaisfiedRadio input[name="isstaisfied"]:checked').val()) {
+                	layer.msg("回访情况不能为空");
                 } else {
-                    layer.msg("请选择是/否向当事人反馈");
+                	if($('#isStaisfiedRadio input[name="isstaisfied"]:checked').val() === '0'){
+                		 State = 1;
+                		 isproresult = 0
+                    	JA();
+                	} else{
+                		if ($("#dealman").val() == "") {
+	                        layer.msg("办理人不能为空");
+	                    } else if ($("#situation").val() == "") {
+	                        layer.msg("处理情况不能为空");
+	                    } else if ($("#dealcontact").val() == "") {
+	                        layer.msg("联系方式不能为空");
+	                    } else if ($("#duties").val() == "") {
+	                        layer.msg("职务不能为空");
+	                    } else if (!$('#isStaisfiedRadio input[name="isstaisfied"]:checked').val()) {
+	                    	layer.msg("回访情况不能为空");
+	                    } else {
+	                        State = 1;
+	                        isproresult = 1
+	                        $("#result").val($("#situation").val().replace(simpleDetailStrStart, ''))
+	                        JA();
+	                    }
+                	}
                 }
+            	
+            	
+//              if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "1") {
+//                  if ($("#dealman").val() == "") {
+//                      layer.msg("办理人不能为空");
+//                  } else if ($("#situation").val() == "") {
+//                      layer.msg("处理情况不能为空");
+//                  } else if ($("#dealcontact").val() == "") {
+//                      layer.msg("联系方式不能为空");
+//                  } else if ($("#duties").val() == "") {
+//                      layer.msg("职务不能为空");
+//                  } else if (!$('#isStaisfiedRadio input[name="isstaisfied"]:checked').val()) {
+//                  	layer.msg("回访情况不能为空");
+//                  } else {
+//                      State = 1;
+//                      debugger
+//                      //$("#situation").val(stripscript($("#situation").val()));
+//                      $("#result").val($("#situation").val().replace(simpleDetailStrStart, ''))
+//                      JA();
+//                  }
+//              } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "2") {
+//                  State = 1;
+//                  JA();
+//              } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == "0") {
+//                  State = 1;
+//                  JA();
+//              } else {
+//                  layer.msg("请选择是/否向当事人反馈");
+//              }
             });
-
             $(".prosituation-wrapper").hide(); //处理方案/进程
             $(".annotation-wrapper").hide(); //注释
             $(".connecttime-wrapper").hide(); //沟通时间
             $(".connectmode-wrapper").hide(); //沟通方式
-            //			$(".replycontent-wrapper").hide(); //答复内容
-            $(".isstaisfied-wrapper").hide(); //是否满意
+//          $(".isstaisfied-wrapper").hide(); //是否满意
             $(".dealWithRemark-wrapper").hide(); // 已办未果备注
-
             /*
              * 处理结果
              * 默认 0
              * 是 1
              * 否 2
              */
-            $("#isProResultRadio")
-                .find('input[type="radio"]')
-                .on("change", function () {
-                    $("#prosituation").val(""); //处理方案/进程
-                    $("#connecttime").val(""); //沟通时间
-                    $("#connectmode").val(""); //沟通方式
-                    //					$("#replycontent").val(""); //答复内容
-                    $("#result").val(""); //办理结果
-                    $(
-                        '#isStaisfiedRadio input[name="isstaisfied"]:checked'
-                    ).prop("checked", false); //是否满意
-                    isProResultJudge($(this).val());
-                });
-
+            $("#isProResultRadio").find('input[type="radio"]').on("change", function () {
+                $("#prosituation").val(""); //处理方案/进程
+                $("#connecttime").val(""); //沟通时间
+                $("#connectmode").val(""); //沟通方式
+                $("#result").val(""); //办理结果
+                $('#isStaisfiedRadio input[name="isstaisfied"]:checked').prop("checked", false); //是否满意
+                isProResultJudge($(this).val());
+            });
             $(".handleBtn").click(function () {
                 // if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() === "1") {
                 //     var isStaisfiedRadioData;
@@ -360,6 +410,10 @@
             $.post(
                 huayi.config.callcenter_url + "WorkOrder/FeedBackWorkOrder", {
                     workorderid: wid,
+                    issurvey:$("#issurvey").val(),
+                    survey:$("#survey").val(),
+                    accordingto: $("#accordingto").val(), 
+                    
                     dealman: $("#dealman").val(), //承办人
                     dealcontact: $("#dealcontact").val(), //联系方式
                     duties: $("#duties").val(), //职务
@@ -369,9 +423,7 @@
                     situation: $("#situation").val().replace(simpleDetailStrStart, ''), //处理情况
 //                  result: $("#result").val(), //办理结果
                     result: $("#situation").val(), //办理结果
-                    isproresult: $(
-                        '#isProResultRadio input[name="isDisposeResult"]:checked'
-                    ).val(), //处理结果
+                    isproresult: isproresult, //处理结果
                     // IsProResult: $(
                     //     '#isProResultRadio input[name="isDisposeResult"]:checked'
                     // ).val(), // 已办未果
@@ -381,9 +433,7 @@
                     connecttime: $("#connecttime").val(), //沟通时间
                     connectmode: $("#connectmode").val(), //沟通方式
                     //              replycontent: $("#replycontent").val(), //答复内容
-                    isstaisfied: $(
-                        '#isStaisfiedRadio input[name="isstaisfied"]:checked'
-                    ).val(), //是否满意
+                    isstaisfied: $('#isStaisfiedRadio input[name="isstaisfied"]:checked').val(), //是否满意
                     state: State,
                     feedbackid: a,
                     files: $("#file").val(),
@@ -436,26 +486,13 @@
                             //                      $("#result").text(result.data[0].F_Result); //办理结果
                             $("#situation").val(result.data[0].F_Situation); //处理情况
                             $("#duties").val(result.data[0].F_Duties); //职务
-                            $('#isProResultRadio input[name="isDisposeResult"][value="' + result.data[0]
-                                .F_IsProResult + '"]').prop("checked", true); //是/否向当事人反馈
-                            $("#prosituation").val(
-                                result.data[0].F_ProSituation
-                            ); //处理方案/进程
-                            $("#dealcontact").val(
-                                result.data[0].F_DealUserContact
-                            ); //联系方式
-                            $("#connecttime").val(
-                                result.data[0].F_ConnectTime
-                            ); //沟通时间
-                            $("#connectmode").val(
-                                result.data[0].F_ConnectMode
-                            ); //沟通方式
-                            //						$("#replycontent").val(result.data[0].F_ReplyContent); //答复内容
-                            $(
-                                '#isStaisfiedRadio input[name="isstaisfied"][value="' +
-                                result.data[0].F_IsSatisfied +
-                                '"]'
-                            ).prop("checked", true); //是否满意
+                            isproresult =  result.data[0].F_IsProResult
+//                          $('#isProResultRadio input[name="isDisposeResult"][value="' + result.data[0].F_IsProResult + '"]').prop("checked", true); //是/否向当事人反馈
+                            $("#prosituation").val(result.data[0].F_ProSituation); //处理方案/进程
+                            $("#dealcontact").val(result.data[0].F_DealUserContact); //联系方式
+                            $("#connecttime").val(result.data[0].F_ConnectTime); //沟通时间
+                            $("#connectmode").val(result.data[0].F_ConnectMode); //沟通方式
+                            $('#isStaisfiedRadio input[name="isstaisfied"][value="' +result.data[0].F_IsSatisfied +'"]').prop("checked", true); //是否满意
                             a = result.data[0].F_Id;
                         }
                     }

WebUI/CallCenterWeb.UI/CommonHtml/banli_zilei.html

@@ -114,7 +114,35 @@
             		<span id="workremark" name="" rows="6" cols="" readonly="readonly"></span>
             	</td>
             </tr>
-            <tr>
+            <tr class="Importent">
+            	<th>
+                    调查情况:
+                </th>
+                <td>
+                    <select class="select_" id="issurvey">
+                        <option value="1">属实</option>
+                        <option value="2">部分属实</option>
+                        <option value="2">不属实</option>
+                    </select>
+                </td>
+              </tr>
+              <tr>
+            	<th>
+                    调查情况说明:
+                </th>
+                <td colspan="5">
+                    <textarea data-adaptheight id="survey" name="" rows="3" cols=""></textarea>
+                </td>
+              </tr>
+              <tr>
+            	<th>
+                    办理依据:
+                </th>
+                <td colspan="5">
+                    <textarea data-adaptheight id="accordingto" name="" rows="3" cols=""></textarea>
+                </td>
+              </tr>
+            <!--<tr>
                 <th class="Importent">是/否向当事人反馈:</th>
                 <td id="isProResultRadio" style="font-size: 12px">
                     <label style="margin-right: 10px">
@@ -124,7 +152,7 @@
                         <input type="radio" value="0" name="isDisposeResult" style="vertical-align: -2px;" />否
                     </label>
                 </td>
-            </tr>
+            </tr>-->
             <!-- <tr class="dealWithRemark-wrapper">
                 <th>已办未果备注:</th>
                 <td colspan="5">
@@ -160,9 +188,12 @@
                 	<textarea id="replycontent" name="" rows="6" cols="" ></textarea>
             	</td>
             </tr>-->
-            <tr class="isstaisfied-wrapper">
-                <th>是否满意:</th>
+            <tr  class="Importent">
+                <th>回访情况:</th>
                 <td id="isStaisfiedRadio" style="font-size: 12px" colspan="5">
+                	<label style="margin-right: 10px">
+                        <input type="radio" value="0" name="isstaisfied" style="vertical-align: -2px" />未回访
+                    </label>
                     <label style="margin-right: 10px;">
                         <input type="radio" value="1" name="isstaisfied" style="vertical-align: -2px;" />满意
                     </label>
@@ -213,6 +244,7 @@
         var simpleDetailStrStart = "";
         var simpleDetailStrEnd = "";
         var simpleDetailStr = "";
+        var isproresult
         Detail();
         $(document).ready(function () {
             laydate.skin('blue');
@@ -255,22 +287,48 @@
             //
             //				})
             $('.Submit').click(function () {
-                if ($("#dealman").val() == "") {
-                    layer.msg("办理人不能为空");
-                } else if ($("#situation").val() == "") {
-                    layer.msg("处理结果不能为空");
-                } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == null) {
-                    layer.msg("请选择是/否向当事人反馈");
-                } else if ($("#dealcontact").val() == "") {
-                    layer.msg("联系方式不能为空")
-                } else if ($("#duties").val() == "") {
-                    layer.msg("职务不能为空")
-                } else if ($("#result").val() == "") {
-                    layer.msg("请生成办理结果")
+            	if (!$('#isStaisfiedRadio input[name="isstaisfied"]:checked').val()) {
+                	layer.msg("回访情况不能为空");
                 } else {
-                    State = 1;
-                    JA();
+                	if($('#isStaisfiedRadio input[name="isstaisfied"]:checked').val() === '0'){
+                		 State = 1;
+                		 isproresult = 0
+                    	JA();
+                	} else{
+                		if ($("#dealman").val() == "") {
+	                        layer.msg("办理人不能为空");
+	                    } else if ($("#situation").val() == "") {
+	                        layer.msg("处理情况不能为空");
+	                    } else if ($("#dealcontact").val() == "") {
+	                        layer.msg("联系方式不能为空");
+	                    } else if ($("#duties").val() == "") {
+	                        layer.msg("职务不能为空");
+	                    } else if (!$('#isStaisfiedRadio input[name="isstaisfied"]:checked').val()) {
+	                    	layer.msg("回访情况不能为空");
+	                    } else {
+	                        State = 1;
+	                        isproresult = 1
+	                        $("#result").val($("#situation").val().replace(simpleDetailStrStart, ''))
+	                        JA();
+	                    }
+                	}
                 }
+//              if ($("#dealman").val() == "") {
+//                  layer.msg("办理人不能为空");
+//              } else if ($("#situation").val() == "") {
+//                  layer.msg("处理结果不能为空");
+//              } else if ($('#isProResultRadio input[name="isDisposeResult"]:checked').val() == null) {
+//                  layer.msg("请选择是/否向当事人反馈");
+//              } else if ($("#dealcontact").val() == "") {
+//                  layer.msg("联系方式不能为空")
+//              } else if ($("#duties").val() == "") {
+//                  layer.msg("职务不能为空")
+//              } else if ($("#result").val() == "") {
+//                  layer.msg("请生成办理结果")
+//              } else {
+//                  State = 1;
+//                  JA();
+//              }
             })
 
             $(".prosituation-wrapper").hide(); //处理方案/进程
@@ -311,13 +369,18 @@
         function JA() {
             $.post(huayi.config.callcenter_url + 'WorkOrder/DealWorkOrder', {
                 workorderid: wid,
+                issurvey:$("#issurvey").val(),
+                survey:$("#survey").val(),
+                accordingto: $("#accordingto").val(), 
+                    
                 dealman: $("#dealman").val(), //承办人
                 AuditUser: $("#auditUser").val(), //审核领导
                 post: $("#auditUserDuties").val(), //审核领导职务
                 auditContact: $("#auditContact").val(), //审核领导联系方式
                 result: $('#result').val(), //处理情况
                 situation: $("#situation").val(), //办理结果
-                isproresult: $('#isProResultRadio input[name="isDisposeResult"]:checked').val(), //处理结果
+                isproresult: isproresult, //处理结果
+//              isproresult: $('#isProResultRadio input[name="isDisposeResult"]:checked').val(), //处理结果
                 // IsProResult: $('#isProResultRadio input[name="isDisposeResult"]:checked').val(), // 已办未果
                 prosituation: $("#prosituation").val(), //处理方案/进程
                 // Unsuccessful: $("#dealWithRemark").val(), //已办未果备注
@@ -597,8 +660,9 @@
                         $("#duties").val(result.data[0].F_Duties); //职务
                         //                      $("#result").text(result.data[0].F_Result); //处理结果
                         $("#situation").val(result.data[0].F_Situation); //处理情况
-                        $('#isProResultRadio input[name="isDisposeResult"][value="' + result.data[0]
-                            .F_IsProResult + '"]').prop("checked", true); //是/否向当事人反馈
+                        isproresult =  result.data[0].F_IsProResult
+//                      $('#isProResultRadio input[name="isDisposeResult"][value="' + result.data[0]
+//                          .F_IsProResult + '"]').prop("checked", true); //是/否向当事人反馈
                         $("#prosituation").val(result.data[0].F_ProSituation); //处理方案/进程
                         $("#dealcontact").val(result.data[0].F_DealUserContact); //联系方式
                         $("#connecttime").val(result.data[0].F_ConnectTime); //沟通时间

WebUI/CallCenterWeb.UI/CommonHtml/callerName.html

@@ -17,9 +17,7 @@
 					<th style="width: 120px;">来电人：</th>
 					<td>
 						<span class="callerName"></span>
-						
 					</td>
-
 				</tr>
 			</table>
 		</div>

WebUI/CallCenterWeb.UI/CommonHtml/callerNumber.html

@@ -18,7 +18,7 @@
                 <td>
                 	<span class="phoneNumber" style="display: none;"></span>
                 	<div style="display: inline-block;" class="passwordSearch">
-                		<input type="number" id="password" value="" autocomplete="off" />
+                		<input type="password" id="password" value="" autocomplete="off" />
                 		<button onclick="getPhone()">查询</button>
                 	</div>
                 </td>

WebUI/CallCenterWeb.UI/Media/MediaWorkOrderList.html

@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="../css/init.css" />
     <link rel="stylesheet" href="../css/WorkOrder/WorkOrderList.css">
     <link rel="stylesheet" href="../js/layui/css/layui.css">
+    <link rel="stylesheet" href="../css/WorkOrder/WorkOrderList.css">
 </head>
 
 <body class="gray-bg">
@@ -73,10 +74,24 @@
                                     <select class="form-control" id="type">
                                     </select>
                                 </td>
-                                <th></th>
+                                <!--<th></th>
                                 <td style="text-align: center;">
-                                </td>
+                                </td>-->
+                                
+                                <th>反映类别：</th>
+								<td style="position: relative;">
+									<div class="inpBox">
+										<input type="text" class="inpsReactionCategory" />
+										<input type="hidden" id="keyid" />
+										<i class="CleansReactionCategory fa fa-close"></i>
+										<i class="xlReactionCategory xl_one"></i>
+										<div class="addTreeReactionCategory xlAddReactionCategory">
+											<ul id="addTreeDemoReactionCategory" class="ztree"></ul>
+										</div>
+									</div>
+								</td>
                             </tr>
+                            
                         </table>
                     </div>
                 </div>
@@ -86,9 +101,7 @@
                             data-pagination="true">
                             <thead>
                                 <tr>
-                                    <th data-formatter="serialNumber" data-align="center">
-                                        序号
-                                    </th>
+                                    <th data-formatter="serialNumber" data-align="center">序号</th>
                                     <th data-field="F_WorkOrderId" data-formatter="View" data-align="center">工单单号</th>
                                     <th data-field="F_ComTitle" data-formatter="GetCont" data-align="center">诉求标题</th>
                                     <th data-field="UserName" data-align="center">受理人</th>
@@ -109,12 +122,13 @@
     <script src="../My97DatePicker/WdatePicker.js"></script>
     <script src="../js/zTree/jquery.ztree.core.js"></script>
     <script src="../js/WorkOrder/WorkOrderList.js"></script>
+    <script src="../js/WorkOrder/treeListCommon.js"></script>
     <script>
         $(document).ready(function () {
             load();
             LY($("#source"));
             LB($("#type"));
-            ZT($("#keyid"));
+            treeReactionCategory(4258);
             //ZX($("#ZX"));
             laydate.skin('blue');
             laydate({
@@ -142,6 +156,7 @@
                 }
             })
         });
+        
         //获取查询信息
         function load() {
             //先销毁表格

WebUI/CallCenterWeb.UI/ReportForm/comhtml/reportOrderList.html

@@ -86,6 +86,7 @@
 					url += `&${key}=${params[key]}`
 				}
 			})
+			console.log(url)
 			window.location.href = url;
 		}
         //获取查询信息

WebUI/CallCenterWeb.UI/Script/Common/huayi.config.js

@@ -3,9 +3,9 @@
 }
 //var AYWebUrl = window.document.location.href
 huayi.config = {
-//	callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
-	//	callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
-		callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
+	//	callcenter_url: "http://192.168.8.9:1042/",// 生产环境	39.164.159.226
+		callcenter_url: "http://39.164.159.226:1042/",// 生产环境	39.164.159.226
+//	callcenter_url: "http://docking.zwfw.anyang.gov.cn:65527/", // 生产环境 
 	socket_ip: "ws://39.164.159.226:8081", //ip 
 	// socket_ip: "wss://12345sp.zwfw.anyang.gov.cn:8082", //ip 
 	//	translation_socket:"ws://125.45.12.102:12233",

WebUI/CallCenterWeb.UI/TelCall/CallRecord.html

@@ -672,7 +672,8 @@
 
         	});
 
-        }// 电话号码
+        }
+        // 电话号码
         function formatterCallNum(val, row) {
             var phoneNumber
             if (val.length === 12) {

WebUI/CallCenterWeb.UI/js/WorkOrder/treeListCommon.js

@@ -0,0 +1,65 @@
+
+
+// 所属分类下拉
+$(".inpsReactionCategory").focus(function() {
+	$(".xlAddReactionCategory").css("display", "block");
+});
+$(".xlReactionCategory").click(function() {
+	if($(".xlAddReactionCategory").css("display") == "block") {
+		$(".xlAddReactionCategory").css("display", "none");
+	} else {
+		$(".xlAddReactionCategory").css("display", "block");
+	}
+});
+$(".addTreeReactionCategory").mouseleave(function() {
+	$(this).css("display", "none");
+});
+//清除
+$(".CleansReactionCategory ").click(function() {
+	$(".inpsReactionCategory").val("");
+	$("#keyid").val("");
+});
+
+function treeReactionCategory(pid) {
+	$.get(
+		huayi.config.callcenter_url + "Dictionary/GetZTreeListNew", {
+			token: $.cookie("token"),
+			pid: pid,
+		},
+		function(result) {
+			result = $.parseJSON(result);
+			$.fn.zTree.init(
+				$("#addTreeDemoReactionCategory"),
+				settingReactionCategory,
+				result.data
+			); //实例化树形图
+		}
+	);
+}
+
+var settingReactionCategory = {
+	data: {
+		key: {
+			name: "text",
+		},
+		simpleData: {
+			enable: true,
+			idKey: "id",
+			rootPId: 0,
+		},
+	},
+	callback: {
+		onClick: zTreeOnClicksettingReactionCategory,
+	},
+};
+
+function zTreeOnClicksettingReactionCategory(event, treeId, treeNode) {
+	console.log(treeNode.children);
+	// if(!treeNode.children) {
+	$(".inpsReactionCategory").val(treeNode.text);
+	$("#keyid").val(treeNode.id);
+	$(".CleansReactionCategory").show();
+	// }else{
+	// 	layer.msg("请选择最后一级");
+	// }
+}

WebUI/CallCenterWeb.UI/spManage/js/samplePool.js

@@ -0,0 +1,47 @@
+$(".importFile").click(function () {
+    $("#upFile").trigger("click");
+});
+
+$("#upFile").change(function () {
+    upload();
+});
+
+function upload() {
+    if (document.getElementById("upFile").files.length > 0) {
+        var formData = new FormData();
+        formData.append("upFile", document.getElementById("upFile").files[0]);
+        formData.append("specialid", selectThemeId);
+        formData.append("token", $.cookie("token"));
+        $.ajax({
+            url: huayi.config.callcenter_url + "SamplePool/ImportExcel",
+            type: "POST",
+            data: formData,
+            contentType: false,
+            processData: false,
+            success: function (result) {
+                $("#upFile").change(function () {
+                    upload();
+                });
+                var r = $.parseJSON(result);
+                if (r.state.toLowerCase() == "success") {
+                    layer.msg("导入成功");
+                    initOrderTable(selectThemeId)
+                }
+            },
+        });
+    } else {
+        layer.confirm("请上传文件！", {
+            btn: ["确定"],
+        });
+    }
+}
+
+$(".exportTemplate").click(function () {
+    var a = document.createElement("a");
+    a.style.display = "none";
+    a.download = "办事指南模板.xlsx";
+    a.href = "../static/xls/办事指南模板.xlsx";
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+});

WebUI/CallCenterWeb.UI/spManage/theme.html

@@ -168,8 +168,10 @@
 											<button id="searchOrder" class="btns" style="margin-bottom: 10px;">查询</button>
 											<button id="exportOrder" class="btns" style="margin-bottom: 10px;">导出工单</button>
 											<button id="addOrder" class="btns" style="margin-bottom: 10px;">添加工单</button>
+											<button class="btns exportTemplate" style="margin-bottom: 10px;">模板</button>
+							                <button class="btns importFile" style="margin-bottom: 10px;">导入</button>
+							                <input type="file" id="upFile" name="upFile"  accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel" style="display: none;">
 										</div>
-
 									</div>
 									<!--<button id="addOrder" class="btns" style="margin-bottom: 10px;">导出工单</button>
 									<button id="addOrder" class="btns" style="margin-bottom: 10px;">添加工单</button>-->
@@ -245,7 +247,7 @@
 		<script src="../js/comboSelect/jquery.combo.select.js"></script>
 		<script src="../js/WorkOrder/orderListOperation.js"></script>
 		<script src="../js/WorkOrder/WorkOrderList.js"></script>
-
+		<script src="./js/samplePool.js"></script>
 		<script>
 			var exportParams;
 			var table = $("#table1"); //右边表格
@@ -254,28 +256,21 @@
 			var selectThemeId = '';
 			var selectTreeNode;
 			$(document).ready(function() {
-
 				bindtree();
-				//				initTable();
-				//				initOrderTable();
+				//	initTable();
+				//	initOrderTable();
 
 				layui.form.on('select(fylb)', function(data) {
-					//					console.log(data.elem); //得到select原始DOM对象
-					//					console.log(data.value); //得到被选中的值
-					//					console.log(data.othis); //得到美化后的DOM对象
 					$('#proporation').text('');
 					if(data.value) {
 						getProp(data.value);
 					}
 				});
-
 			})
 
 			function Cr(val, row, index) {
 				return index + 1;
-
 			}
-
 			function getProp(id) {
 				// 获取占比
 				$.getJSON(
@@ -287,12 +282,10 @@
 					function(result) {
 						if(result.state.toLowerCase() == "success") {
 							$('#proporation').text(result.data.Proportion);
-
 						}
 					}
 				);
 			}
-
 			function save() {
 				console.log('sava')
 				var keyId = $('#fylb').val();
@@ -302,7 +295,6 @@
 					});
 					return;
 				}
-
 				$.post(huayi.config.callcenter_url + 'Theme/Proportion', {
 					id: selectThemeId,
 					Proportion: keyId,
@@ -314,7 +306,6 @@
 					}
 				})
 			}
-
 			//状态
 			function States(val, row) {
 				var html = "";
@@ -478,14 +469,12 @@
 			});
 
 			$(".addclass").click(function() {
-
 				layer.open({
 					type: 2,
 					content: "editTheme.html?type=2&themeid=" + selectThemeId, //iframe的url，no代表不显示滚动条
 					title: '新增分类',
 					area: ['50%', '50%'], //宽高
 					end: function() {
-						console.log('关闭')
 						initTable();
 					}
 				});
@@ -502,7 +491,6 @@
 					title: '修改主题',
 					area: ['50%', '80%'], //宽高
 					end: function() {
-
 						bindtree();
 					}
 				});
@@ -523,7 +511,6 @@
 					layer.msg("请选择要主题");
 					return;
 				}
-
 				var str = '';
 				if(selectTreeNode.F_StatisticsBeginTime) {
 					str += '&startTime=' + selectTreeNode.F_StatisticsBeginTime;
@@ -531,7 +518,6 @@
 				if(selectTreeNode.F_StatisticsEndTime) {
 					str += '&endTime=' + selectTreeNode.F_StatisticsEndTime;
 				}
-
 				layer.open({
 					type: 2,
 					content: "workorder.html?id=" + selectThemeId + str, //iframe的url，no代表不显示滚动条
@@ -549,9 +535,7 @@
 					layer.msg("请选择要删除的数据");
 					return;
 				}
-
 				layer.confirm('确定删除该主题吗?', function(index) {
-
 					$.post(huayi.config.callcenter_url + 'Theme/DelModel', {
 						ids: selectThemeId,
 						"token": $.cookie("token")
@@ -563,7 +547,6 @@
 							layer.close(index);
 						}
 					})
-
 				});
 
 			});
@@ -584,17 +567,13 @@
 
 			function PoolDispose(val, row) {
 				var optionStr = '<div class="imgs" ><a class="xg" onclick="delPool(\'' + row.F_WorkOrderId + '\')">移除</a>';
-
 				if(row.Theme && row.Theme.length > 0) {
 					optionStr += '<a class="xg" onclick="updateClass(\'' + row.F_WorkOrderId + '\')">变更</a>';
 				} else {
 					optionStr += '<a class="xg" onclick="transDispatch(\'' + row.F_WorkOrderId + '\')")">转调度</a>';
 				}
-
 				optionStr += '</div>';
-
 				return optionStr;
-
 				//				return '<div class="imgs" >' +
 				//					'<a class="xg" onclick="xg(' + row.F_ID + ')">编辑</a>' +
 				//					'<a class="xg" onclick="remove(' + row.F_ID + ')">移除</a>' + '<a class="xg" onclick="getKeys(' + row.F_ID + ')">关键词 </a>' +
@@ -617,7 +596,6 @@
 
 			//变更分类
 			function updateClass(id) {
-
 				layer.open({
 					type: 2,
 					content: "../CommonHtml/reschedule.html?wid=" + id + '&themeid=' + selectThemeId, //iframe的url，no代表不显示滚动条
@@ -644,7 +622,6 @@
 						if(result.state.toLowerCase() == "success") {
 							layer.msg("操作成功");
 						}
-
 						initOrderTable();
 					})
 					layer.close(index);
@@ -691,7 +668,6 @@
 
 			function remove(id) {
 				layer.confirm('确定删除该分类吗?', function(index) {
-
 					$.post(huayi.config.callcenter_url + 'Theme/DelModel', {
 						ids: id,
 						"token": $.cookie("token")
@@ -815,19 +791,15 @@
 					},
 					onLoadSuccess: function(data) {
 						//加载成功时执行
-
 						console.log(data, 'datas')
-
 						if(data.rows && data.rows.length > 0) {
 							// orderClass
 							var optionStr = '<option selected="selected" value="">请选择</option>';
 							data.rows.forEach(function(o) {
 								optionStr += '<option value="' + o.F_ID + '">' + o.F_Name + '</option>';
 							})
-
 							$('#orderClass').append(optionStr)
 						}
-
 						//layer.msg("加载成功");
 					},
 					onLoadError: function() {
@@ -1003,9 +975,7 @@
 				selectThemeId = treeNode.F_ID
 				selectTreeNode = treeNode
 				$("#fylb").empty();
-				console.log('bindtree')
 				$("#orderClass").empty();
-
 				$('#addClassBut').show();
 				initTable(treeNode.F_ID);
 				selectThemeIdTable(treeNode.F_ID)
@@ -1013,9 +983,7 @@
 				if(treeNode.F_StatisticsBeginTime) {
 					$('#time').html(`${treeNode.F_StatisticsBeginTime} ~ ${treeNode.F_StatisticsEndTime}`)
 				}
-
 				getDicValueList(treeNode);
-
 			}
 		</script>
 	</body>