问题修改

WebChart/.project

@@ -60,5 +60,14 @@
 				<arguments>1.0-name-matches-false-false-node_modules</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1626234389736</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>

WebChartBig/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>安阳WebChartBig</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1626234283040</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

WebChartBig/Script/Common/huayi.config.js

@@ -6,8 +6,7 @@ huayi.config = {
     callcenter_url: "http://192.168.8.13:1001/",//生产环境
     //callcenter_data: "http://192.168.4.18:4032/",//市县选择
 // callcenter_url: "http://12345.shangqiu.gov.cn:8819/",//生产环境
-    //callcenter_url: "http://localhost:63662/"//测试环境
-
+//  callcenter_url: "http://localhost:63662/"//测试环境
 //  socket_ip: "192.168.5.8",//ip
     socket_ip: "192.168.4.3",//ip
     socket_port: "8081",//端口

WebChartBigNew/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>安阳WebChartBigNew</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1626234317024</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

WebChartBigNew2/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>安阳WebChartBigNew2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1626234338662</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

WebChat/Script/Common/huayi.config.js

@@ -3,6 +3,5 @@
 }
 huayi.config = {
     //callcenter_url: "http://117.158.196.116:4010/"//生产环境
-	//callcenter_url: "http://117.160.143.195:4010/"//生产环境
-	callcenter_url: "http://12345.shangqiu.gov.cn:8819/"//生产环境
+	callcenter_url: "http://192.168.8.9:1042/" //测试环境
 };

WebChat/html/myTouSu.html

@@ -24,7 +24,7 @@
             width: 100%;
         }
 
-        .mui-table-view .mui-table-view-cell > a:not(.mui-btn) {
+        .mui-table-view .mui-table-view-cell>a:not(.mui-btn) {
             text-align: center;
         }
 
@@ -62,11 +62,13 @@
             padding-right: 1px !important;
             padding-left: 51px !important;
         }
+
         .ztext {
             width: 100%;
             margin: 0;
             border: 0;
         }
+
         .action {
             padding: 11px 15px;
         }
@@ -125,7 +127,8 @@
                 <div class="mui-input-row">
                     <label class="label">主题词：</label>
                     <input type="text" id='zhuTiResult' class="ui-alert type_con" data-index="" readonly="readonly" />
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
+                    <a href="javascript:void(0)"><span
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
                 </div>
             </li>
 
@@ -150,7 +153,8 @@
             </li>
             <li class="mui-table-view-cell">
                 <div class="mui-input-row">
-                    <textarea class="ztext content" name="" id="textarea" rows="3" cols="" placeholder="请详细描述您的问题..."></textarea>
+                    <textarea class="ztext content" name="" id="textarea" rows="3" cols=""
+                        placeholder="请详细描述您的问题..."></textarea>
                 </div>
             </li>
             <li class="mui-table-view-cell">
@@ -178,22 +182,28 @@
             <li class="mui-table-view-cell" id='showCityPicker3'>
                 <div class="mui-input-row">
                     <label class="label adress"></label>
-                    <input type="text" id='cityResult3' data-index="" class="ui-alert type_con" placeholder="请选择市县" readonly="readonly" />
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
+                    <input type="text" id='cityResult3' data-index="" class="ui-alert type_con" placeholder="请选择市县"
+                        readonly="readonly" />
+                    <a href="javascript:void(0)"><span
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
                 </div>
             </li>
             <li class="mui-table-view-cell" id='showtown'>
                 <div class="mui-input-row">
                     <label class="label">街道：</label>
-                    <input type="text" id='town' data-index="" class="ui-alert type_con" placeholder="请选择街道" readonly="readonly" />
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
+                    <input type="text" id='town' data-index="" class="ui-alert type_con" placeholder="请选择街道"
+                        readonly="readonly" />
+                    <a href="javascript:void(0)"><span
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
                 </div>
             </li>
             <li class="mui-table-view-cell" id='showvillage'>
                 <div class="mui-input-row">
                     <label class="label">村庄：</label>
-                    <input type="text" id='village' data-index="" class="ui-alert type_con" placeholder="请选择村庄" readonly="readonly" />
-                    <a href="javascript:void(0)"><span class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
+                    <input type="text" id='village' data-index="" class="ui-alert type_con" placeholder="请选择村庄"
+                        readonly="readonly" />
+                    <a href="javascript:void(0)"><span
+                            class="type_down mui-icon mui-icon-arrowdown mui-pull-right"></span></a>
                 </div>
             </li>
             <li class="mui-table-view-cell">
@@ -220,7 +230,8 @@
             <span style="color: #f81737;">如事件内容地址填写不详细，将影响到你事件办理，请填写详细</span>
         </p>
         <!--<button type="button" class="mui-btn mui-btn-primary mui-btn-block block_button">提交</button>-->
-        <button type="button" data-loading-text="提交中" class="mui-btn mui-btn-primary mui-btn-block block_button submit">提交</button>
+        <button type="button" data-loading-text="提交中"
+            class="mui-btn mui-btn-primary mui-btn-block block_button submit">提交</button>
     </div>
     <script src="../layui/layui.js"></script>
     <script src="../js/mui.min.js"></script>
@@ -231,14 +242,18 @@
     <script src="../Script/Common/huayi.http.js"></script>
     <script src="../js/feedback-page.js"></script>
     <script type="text/javascript">
-//      $(document).ready(function () {
-	 		var townPicker, villagePicker,areaList = [],townList = [],villageList = [],keyList = [];
-            var openid = helper.cookies.get("openid");
-            //var openid = "obwtK6JT-bTCeSbtqu4lkw4lIz0o";
+        var townPicker, villagePicker, areaList = [],
+            townList = [],
+            villageList = [],
+            keyList = [];
+        var openid = "obwtK6JT-bTCeSbtqu4lkw4lIz0o";
+        var menuCode = "WYTS";
+//          var openid = helper.cookies.get("openid");
+        // var menuCode = helper.request.queryString("menuCode");
+        $(document).ready(function () {
             if (!openid) {
                 window.location.replace("../html/error.html");
             }
-            var menuCode = helper.request.queryString("menuCode");
 
             if (menuCode == 'WYBY') {
                 $('.adress').html('市县:');
@@ -248,11 +263,31 @@
                 $('.baoMi').show();
             }
             switch (menuCode) {
-                case "WYZX": $("title").html("我要咨询"); $('#userResult').attr('data-index', '9'); $('#userResult').val('咨询'); break;
-                case "WYQZ": $("title").html("我要求助"); $('#userResult').attr('data-index', '10'); $('#userResult').val('求助'); break;
-                case "WYTS": $("title").html("我要投诉"); $('#userResult').attr('data-index', '11'); $('#userResult').val('投诉'); break;
-                case "WYJY": $("title").html("我要建议"); $('#userResult').attr('data-index', '12'); $('#userResult').val('建议 '); break;
-                case "WYBY": $("title").html("我要表扬"); $('#userResult').attr('data-index', '13'); $('#userResult').val('表扬'); break;
+                case "WYZX":
+                    $("title").html("我要咨询");
+                    $('#userResult').attr('data-index', '9');
+                    $('#userResult').val('咨询');
+                    break;
+                case "WYQZ":
+                    $("title").html("我要求助");
+                    $('#userResult').attr('data-index', '10');
+                    $('#userResult').val('求助');
+                    break;
+                case "WYTS":
+                    $("title").html("我要投诉");
+                    $('#userResult').attr('data-index', '11');
+                    $('#userResult').val('投诉');
+                    break;
+                case "WYJY":
+                    $("title").html("我要建议");
+                    $('#userResult').attr('data-index', '12');
+                    $('#userResult').val('建议 ');
+                    break;
+                case "WYBY":
+                    $("title").html("我要表扬");
+                    $('#userResult').attr('data-index', '13');
+                    $('#userResult').val('表扬');
+                    break;
             }
             //提交按钮
             $('.submit').on('tap', function () {
@@ -266,8 +301,7 @@
                     if (a) {
                         if (str_ary) {
                             str_ary = str_ary + ',' + a;
-                        }
-                        else {
+                        } else {
                             str_ary = a;
                         }
                     }
@@ -291,8 +325,7 @@
                 if (!$('#phone').val()) {
                     mui.alert('请输入联系电话！');
                     return;
-                }
-                else {
+                } else {
 
                     var regTel = /^(([0\+]\d{2,3}-)?((0\d{2,3}))?(-)?)?(\d{7,8})(-(\d{3,}))?$/;
                     var regMobile = /^([+-]?)\d*\.?\d+$/;
@@ -317,17 +350,18 @@
                     async: true,
                     data: {
                         openid: openid,
-                        cusname: $('#name').val(),//投诉人姓名
-                        cusphone: $('#phone').val(),//投诉人电话
-                        conphone: $('#phone').val(),//客户电话
-                        title: $('#title').val(),//投诉主题
-                        content: $('.content').val(),//投诉内容
-                        sourcearea: $('#cityResult3').attr('data-index'),//事发地域id
-                        sourceaddress: $('#town').val()+" "+$('#village').val()+" "+$('#detail_address').val(),//详细地址
-                        keys: $('#zhuTiResult').attr('data-index'),//关键词
-                        type: $('#userResult').attr('data-index'),//诉求类型
+                        cusname: $('#name').val(), //投诉人姓名
+                        cusphone: $('#phone').val(), //投诉人电话
+                        conphone: $('#phone').val(), //客户电话
+                        title: $('#title').val(), //投诉主题
+                        content: $('.content').val(), //投诉内容
+                        sourcearea: $('#cityResult3').attr('data-index'), //事发地域id
+                        sourceaddress: $('#town').val() + " " + $('#village').val() + " " + $(
+                            '#detail_address').val(), //详细地址
+                        keys: $('#zhuTiResult').attr('data-index'), //关键词
+                        type: $('#userResult').attr('data-index'), //诉求类型
                         files: str_ary,
-                        isprotect: $('input[name="secret"]:checked').val()//(0普通1保密)
+                        isprotect: $('input[name="secret"]:checked').val() //(0普通1保密)
                     },
                     success: function (data) {
                         var str = JSON.parse(data);
@@ -350,13 +384,15 @@
 
             if (openid) {
                 //事发地域
-                getArea(1,0);
+                getArea(1, 0);
                 //主题词
                 $.ajax({
                     type: "get",
                     url: huayi.config.callcenter_url + 'WxLogin/GetKeyList',
                     async: false,
-                    data: { openid: openid },
+                    data: {
+                        openid: openid
+                    },
                     dataType: 'json',
                     success: function (data) {
                         var key_data = data.data;
@@ -369,48 +405,47 @@
                     }
                 });
             }
-//      })
-        
-        function getArea(arrType,ids){
-        	townList = [];
-        	villageList = [];
-        	$.ajax({
-                    type: "get",
-                    url: huayi.config.callcenter_url + 'Web/GetWebAreaListById',
-                    async: false,
-                    data: {
-                    	openid: openid,
-                    	id: ids
-                    },
-                    dataType: 'json',
-                    success: function (data) {
-                        var area_data = data.data;
-                        $(area_data).each(function (i, n) {
-                            var obj = {};
-                            obj.value = n.F_AreaId;
-                            obj.text = n.F_AreaName;
-                            if(arrType==1){
-                            	areaList.push(obj)
-                            }else if(arrType==2){
-                            	console.log(arrType)
-                            	townList.push(obj)
-                            	townPicker.setData(townList);
-                            }else{
-                            	villageList.push(obj)
-                            		villagePicker.setData(villageList);
-                            }
-                            
-                        })
-//                      console.log(townList)
-//                       if(arrType==2){
-//                          	townPicker.setData(townList);
-//                          }else if(arrType==3){
-//                          	villagePicker.setData(villageList);
-//                          }
-                    }
-                });
+        })
+
+        function getArea(arrType, ids) {
+            townList = [];
+            villageList = [];
+            $.ajax({
+                type: "get",
+                url: huayi.config.callcenter_url + 'Web/GetWebAreaListById',
+                async: false,
+                data: {
+                    openid: openid,
+                    id: ids
+                },
+                dataType: 'json',
+                success: function (data) {
+                    var area_data = data.data;
+                    $(area_data).each(function (i, n) {
+                        var obj = {};
+                        obj.value = n.F_AreaId;
+                        obj.text = n.F_AreaName;
+                        if (arrType == 1) {
+                            areaList.push(obj)
+                        } else if (arrType == 2) {
+                            console.log(arrType)
+                            townList.push(obj)
+                            townPicker.setData(townList);
+                        } else {
+                            villageList.push(obj)
+                            villagePicker.setData(villageList);
+                        }
+                    })
+                    // console.log(townList)
+                    // if(arrType==2){
+                    //     townPicker.setData(townList);
+                    //     }else if(arrType==3){
+                    //     villagePicker.setData(villageList);
+                    //     }
+                }
+            });
         }
-        
+
         //工单类型
         //      var typeList=[];
         //      $.ajax({
@@ -431,7 +466,7 @@
         //      });
 
 
-       
+
         (function ($, doc) {
             $.init();
             $.ready(function () {
@@ -473,29 +508,30 @@
                 var showCityPickerButton = doc.getElementById('showCityPicker3');
                 var cityResult3 = doc.getElementById('cityResult3');
                 showCityPickerButton.addEventListener('tap', function (event) {
-//                  if (areaList.length > 0) {
-                        cityPicker3.show(function (items) {
-                            cityResult3.value = (items[0].text ? items[0].text : "");
-                            cityResult3.setAttribute("data-index", items[0].value);
-                            //返回 false 可以阻止选择框的关闭
-                            //return false;
-                             getArea(2,items[0].value);
-                              if (townList.length == 0) {
-		                            doc.getElementById('town').value="暂无数据";
-		                        } else {
-		                        	doc.getElementById('town').value="";
-		                            doc.getElementById('town').setAttribute("placeholder", "请选择街道");
-		                            doc.getElementById('village').value="";
-		                              doc.getElementById('village').setAttribute("placeholder", "请选择村庄");
-		                        }
-                        });
-//                  }
+                    //                  if (areaList.length > 0) {
+                    cityPicker3.show(function (items) {
+                        cityResult3.value = (items[0].text ? items[0].text : "");
+                        cityResult3.setAttribute("data-index", items[0].value);
+                        //返回 false 可以阻止选择框的关闭
+                        //return false;
+                        getArea(2, items[0].value);
+                        if (townList.length == 0) {
+                            doc.getElementById('town').value = "暂无数据";
+                        } else {
+                            doc.getElementById('town').value = "";
+                            doc.getElementById('town').setAttribute("placeholder", "请选择街道");
+                            doc.getElementById('village').value = "";
+                            doc.getElementById('village').setAttribute("placeholder",
+                                "请选择村庄");
+                        }
+                    });
+                    //                  }
                 }, false);
                 //街道
-               		townPicker= new $.PopPicker({
+                townPicker = new $.PopPicker({
                     layer: 1
                 });
-//              townPicker.setData(townList);
+                //              townPicker.setData(townList);
                 var townPickerPickerButton = doc.getElementById('showtown');
                 var townResult = doc.getElementById('town');
                 townPickerPickerButton.addEventListener('tap', function (event) {
@@ -505,35 +541,35 @@
                             townResult.setAttribute("data-index", items[0].value);
                             //返回 false 可以阻止选择框的关闭
                             //return false;
-                            getArea(3,items[0].value);
+                            getArea(3, items[0].value);
                             if (villageList.length == 0) {
-		                            doc.getElementById('village').value="暂无数据";
-//		                            doc.getElementById('village').setAttribute("placeholder", "暂无数据");
-		                        } else {
-		                        	doc.getElementById('village').value="";
-		                            doc.getElementById('village').setAttribute("placeholder", "请选择村庄");
-		                        }
+                                doc.getElementById('village').value = "暂无数据";
+                                //		                            doc.getElementById('village').setAttribute("placeholder", "暂无数据");
+                            } else {
+                                doc.getElementById('village').value = "";
+                                doc.getElementById('village').setAttribute("placeholder",
+                                    "请选择村庄");
+                            }
                         });
                     }
                 }, false);
                 //村庄
-                	 villagePicker= new $.PopPicker({
+                villagePicker = new $.PopPicker({
                     layer: 1
                 });
-//              townPicker.setData(townList);
+                //              townPicker.setData(townList);
                 var villagePickerPickerButton = doc.getElementById('showvillage');
                 var villageResult = doc.getElementById('village');
                 villagePickerPickerButton.addEventListener('tap', function (event) {
-//                  if (townList.length > 0) {
-                        villagePicker.show(function (items) {
-                            villageResult.value = (items[0].text ? items[0].text : "");
-                            villageResult.setAttribute("data-index", items[0].value);
-                            //返回 false 可以阻止选择框的关闭
-                            //return false;
-                        });
-//                  }
+                    //                  if (townList.length > 0) {
+                    villagePicker.show(function (items) {
+                        villageResult.value = (items[0].text ? items[0].text : "");
+                        villageResult.setAttribute("data-index", items[0].value);
+                        //返回 false 可以阻止选择框的关闭
+                        //return false;
+                    });
+                    //                  }
                 }, false);
-
             })
         })(mui, document);
     </script>

WebChat/index.html

@@ -15,7 +15,8 @@
         <script src="Script/Common/huayi.config.js"></script>
         <script src="Script/Common/huayi.http.js"></script>
 		<script type="text/javascript">
-            var openid = helper.cookies.get("openid");
+            // var openid = helper.cookies.get("openid");
+         	var openid = "obwtK6JT-bTCeSbtqu4lkw4lIz0o";
             var code = helper.request.queryString("code");
             var menucode = helper.request.queryString("menucode");
             if (!openid) {

WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html

@@ -571,7 +571,7 @@
                     if (data.state.toLowerCase() == "success") {
                         var content = data.data;
                         $(content).each(function (i, n) {
-                            $("<option value='" + n.F_Value + "'>" + n.F_Value + "</option>")
+                            $("<option value='" + n.F_Value + "'>" + n.F_Remark + "</option>")
                                 .appendTo(obj);
                         })
                     }

WebUI/CallCenterWeb.UI/Business/LeaderYJA.html

@@ -411,6 +411,7 @@
                 html += html1;
 
             }
+            html += '<a class="xg" onclick="unsuccessful(\'' + row.F_WorkOrderId + '\')">已办未果&nbsp</a>';
             return html;
         }
 
@@ -698,6 +699,24 @@
             });
         }
 
+        // 已办未果
+        function unsuccessful(str) {
+            layer.confirm('确认已办未果吗？', {
+                btn: ['是', '否'] //按钮
+            }, function () {
+                $.post(huayi.config.callcenter_url + 'WorkOrder/Transfer', {
+                    workorderid: str,
+                    "token": $.cookie("token")
+                }, function (result) {
+                    result = JSON.parse(result);
+                    if (result.state.toLowerCase() == "success") {
+                        layer.msg("操作成功");
+                        $("#orderlist").bootstrapTable('refresh');
+                    }
+                })
+            });
+        }
+
         $('.Appeal').click(function () {
             layer.open({
                 type: 2,

WebUI/CallCenterWeb.UI/CommonHtml/AddAppealDCL.html

@@ -55,20 +55,20 @@
                     <tr>
                         <th class="Importent">标题:</th>
                         <td colspan="7">
-                            <input id="title" type="text" style="width: 100%" />
+                            <input id="title" class="form-control" type="text" />
                         </td>
                     </tr>
                     <tr class="content-wrapper">
                         <th class="Importent">来电内容:</th>
                         <td colspan="7">
-                            <textarea data-adaptheight id="content" name="" rows="" cols="" style="width: 100%"
+                            <textarea data-adaptheight id="content" class="form-control" name="" rows="" cols="" 
                                 readonly="readonly"></textarea>
                         </td>
                     </tr>
                     <tr class="workcontent-wrapper">
                         <th class="Importent">工单内容:</th>
                         <td colspan="7">
-                            <textarea data-adaptheight id="workcontent" name="" rows="" cols=""
+                            <textarea data-adaptheight id="workcontent" class="form-control" name="" rows="" cols=""
                                 style="width: 100%;"></textarea>
                         </td>
                     </tr>
@@ -104,11 +104,11 @@
                     <tr>
                         <th class="Importent">姓名:</th>
                         <td>
-                            <input type="text" id="cusname" />
+                            <input type="text" id="cusname" class="form-control" />
                         </td>
                         <th>性别:</th>
                         <td>
-                            <select class="select_" id="SEX">
+                            <select class="form-control" id="SEX">
                                 <option value="">请选择</option>
                                 <option value="0">男</option>
                                 <option value="1">女</option>
@@ -116,17 +116,17 @@
                         </td>
                         <th>来源:</th>
                         <td>
-                            <select class="select_" id="source"></select>
+                            <select class="form-control" id="source"></select>
                         </td>
                         <th class="Importent">来电号码:</th>
                         <td>
-                            <input type="text" id="cusphone" />
+                            <input type="text" id="cusphone" class="form-control" />
                         </td>
                     </tr>
                     <tr>
                         <th>类型：</th>
                         <td>
-                            <select class="select_" id="type"></select>
+                            <select class="form-control" id="type"></select>
                         </td>
                         <th class="Importent">反映类别:</th>
                         <td class="reflectCategory-wrapper">
@@ -156,7 +156,7 @@
                         </td>
                         <th>紧急程度:</th>
                         <td>
-                            <select class="select_" id="level">
+                            <select class="form-control" id="level">
                                 <!--<option value="0">选择</option>-->
                                 <option value="1">普通</option>
                                 <option value="2">紧急</option>
@@ -165,16 +165,18 @@
                     </tr>
                     <tr>
                         <th>承办单位：</th>
-                        <td colspan="3">
-                            <select id="jbSelect" name="select" class="selectpicker show-tick  form-control" multiple
+                        <td colspan="7">
+                            <input type="text" id="jbSelectText" class="form-control" style="width: 100%"/>
+                            <input type="hidden" id="jbSelect">
+                            <!-- <select id="jbSelect" name="select" class="selectpicker show-tick  form-control" multiple
                                 data-live-search="true">
-                            </select>
+                            </select> -->
                         </td>
                     </tr>
                     <tr class="leaderCharge-wrapper" style="display: none;">
                         <th class="">分管领导:</th>
                         <td>
-                            <select class="select_" id="leaderCharge">
+                            <select class="select_ form-control" id="leaderCharge">
                                 <option value="">请选择</option>
                                 <option value="省长">省长</option>
                                 <option value="市长">市长</option>
@@ -184,7 +186,7 @@
                     <tr class="limittimeWrapper">
                         <th>办理时限：</th>
                         <td colspan="3">
-                            <select class="startTime" id="startTime"
+                            <select class="startTime form-control" id="startTime"
                                 style="width: 200px; height: 30px; line-height: 30px;">
                                 <!--<option value="0">选择</option>-->
                                 <option value="1">一天</option>
@@ -197,13 +199,13 @@
                     <tr class="limittimesWrapper">
                         <th>紧急时限：</th>
                         <td colspan="">
-                            <input type="text" id="limittimes">
+                            <input type="text" id="limittimes" class="form-control">
                         </td>
                     </tr>
                     <tr class="limittimesWrapperCB" style="display: none;">
                         <th>办理时限：</th>
                         <td colspan="">
-                            <input type="text" id="limittimesCB" autocomplete="off">
+                            <input type="text" id="limittimesCB" class="form-control" autocomplete="off">
                         </td>
                     </tr>
                     <tr>
@@ -220,13 +222,13 @@
                     <tr>
                         <th class="Importent">事件地址:</th>
                         <td colspan="7">
-                            <select class="select_" id="sourcearea"></select>
+                            <select class="select_ form-control" id="sourcearea"></select>
                         </td>
                     </tr>
                     <tr>
                         <th class="Importent"></th>
                         <td colspan="7">
-                            <input id="sourceaddress" type="text" placeholder="输入详细地址"
+                            <input id="sourceaddress" class="form-control" type="text" placeholder="输入详细地址"
                                 style="width: 50%; padding-left: 15px" />
                         </td>
                     </tr>
@@ -262,7 +264,7 @@
             LY($("#source"));
             LB($("#type"));
             ZT($("#keys"));
-            jbSelect($("#jbSelect"));
+            jbSelect($("#jbSelectText"));
             getReactionCategory();
             laydate.skin("blue");
             laydate({
@@ -862,6 +864,17 @@
             parent.layer.msg("操作成功");
         }
 
+        $("#jbSelectText").click(function() {
+            var jbSelect = $("#jbSelect").val();
+            var jbSelectText = encodeURIComponent($("#jbSelectText").val());
+            layer.open({
+                type: 2,
+                content: "../CommonHtml/organizer.html?jbSelect=" + jbSelect + "&jbSelectText=" + jbSelectText, //iframe的url，no代表不显示滚动条
+                title: '承办单位',
+                area: ['60%', '80%'], //宽高
+            });
+        })
+
         function jbSelect(obj) {
             obj.empty();
             $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {

WebUI/CallCenterWeb.UI/CommonHtml/organizer.html

@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <script src="../Script/Common/huayi.load.js"></script>
+    <script src="../Script/Common/huayi.config.js"></script>
+    <link href="../css/layer/need/layer.css" />
+    <link rel="stylesheet" href="../css/init.css" />
+    <link rel="stylesheet" href="../js/layui/css/layui.css">
+    <title>承办单位</title>
+    <style>
+        .reminderContent {
+            width: 90%;
+            margin: 0 auto;
+        }
+
+        .organizerListStyle {
+            display: inline-block;
+            height: 300px;
+            width: 40%;
+            overflow: auto;
+            border: 1px solid rgb(229, 230, 231);
+        }
+
+        .organizerListStyle li {
+            padding: 0 0 0 5px;
+        }
+
+        .organizerListStyle li:hover {
+            background: #00a1cb;
+        }
+
+        table tr th {
+            text-align: right;
+        }
+
+        .btns {
+            padding: 3px 18px;
+        }
+
+        .btn_box {
+            text-align: center !important;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="Common reminderContent">
+        <table>
+            <tr>
+                <th class="Importent">承办单位:</th>
+                <td>
+                    <input id="organizer" class="form-control" type="text">
+                </td>
+                <td><button class="search btns">搜索</button></td>
+            <tr>
+                <td colspan="3">
+                    <ul id="organizerList" class="organizerListStyle">
+                    </ul>
+                    <ul id="addOrganizerList" class="organizerListStyle">
+                    </ul>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="3" class="btn_box">
+                    <button id="save" class="btns">保存</button>
+                </td>
+            </tr>
+        </table>
+        <div class="btn_box">
+        </div>
+    </div>
+    <script src="../js/layui/layui.js"></script>
+    <script src="../css/laydate/laydate.js"></script>
+    <script src="../js/adjustHeight.js"></script>
+    <script>
+        var jbSelect = helper.request.queryString("jbSelect");
+        var jbSelectText = decodeURIComponent(helper.request.queryString("jbSelectText"));
+        $(document).ready(function () {
+            getOrganizer($("#organizerList"));
+            if (jbSelect.length > 0 && jbSelectText.length > 0) {
+                var id = jbSelect.split(",");
+                var text = jbSelectText.split(",");
+                for (var i = 0; i < id.length; i++) {
+                    $("<li data-id='" + id[i] + "'>" + text[i] + "</li>")
+                        .appendTo($("#addOrganizerList"));
+                }
+            }
+        })
+
+        // 承办单位
+        function getOrganizer(obj) {
+            obj.empty();
+            $.getJSON(huayi.config.callcenter_url + "Department/GetDeptList", {
+                token: $.cookie("token"),
+                iscbdw: 2,
+            }, function (data) {
+                if (data.state.toLowerCase() == "success") {
+                    var content = data.data;
+                    $(content).each(function (i, n) {
+                        $("<li data-id='" + n.F_DeptId + "'>" + n.F_DeptName + "</li>")
+                            .appendTo(
+                                obj);
+                    })
+                }
+            })
+        }
+
+        // 搜索承办单位
+        function searchOrganizer(obj) {
+            obj.empty();
+            $.getJSON(
+                huayi.config.callcenter_url + "Department/GetDeptListByDept", {
+                    token: $.cookie("token"),
+                    dept: $("#organizer").val(),
+                },
+                function (data) {
+                    if (data.state.toLowerCase() == "success") {
+                        var content = data.data;
+                        $(content).each(function (i, n) {
+                            $("<li data-id='" + n.F_DeptId + "'>" + n.F_DeptName + "</li>")
+                            .appendTo(
+                                obj);
+                        });
+                    }
+                }
+            );
+        }
+
+
+        $(".search").click(function () {
+            searchOrganizer($("#organizerList"));
+        })
+
+        $("#organizerList").on("click", "li", function () {
+            $("<li data-id='" + $(this).attr("data-id") + "'>" + $(this).text() + "</li>")
+                .appendTo($("#addOrganizerList"));
+        });
+        $("#addOrganizerList").on("click", "li", function () {
+            $(this).remove();
+        });
+
+        $("#save").click(function () {
+            var id = "";
+            var text = "";
+            $("#addOrganizerList").find("li").each(function (i, n) {
+                console.log("11", n);
+                id += $(this).attr("data-id") + ",";
+                text += $(this).text() + ",";
+            })
+            id = id.substring(0, (id.length - 1));
+            text = text.substring(0, (text.length - 1));
+            parent.$("#jbSelectText").val(text);
+            parent.$("#jbSelect").val(id);
+            var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+            parent.layer.close(index); //再执行关闭
+        })
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/MultimediaWorkOrder/WorkIsproresultMedia.html

@@ -373,7 +373,6 @@
             } else {
                 usercodeID = "";
             }
-
             //      	调度员
             var ddusercodeID = "";
             var ddusercode_ = $("#yardman").val(); //坐席

WebUI/CallCenterWeb.UI/OtherPhoneManagement/LawsuitOtherPhone.html

@@ -1201,7 +1201,7 @@
                     if (data.state.toLowerCase() == "success") {
                         var content = data.data;
                         $(content).each(function (i, n) {
-                            $("<option value='" + n.F_Value + "'>" + n.F_Value + "</option>")
+                            $("<option value='" + n.F_Value + "'>" + n.F_Remark + "</option>")
                                 .appendTo(obj);
                         })
                     }

WebUI/CallCenterWeb.UI/SystemManager/js/shuJuZiDian.js

@@ -193,6 +193,7 @@ $(".addCun").click(function () {
                 pid: addPid, //当前选择节点ID
                 name: addDeptname, //部门名称
                 deptid: $("#Dpment").val(), //部门名称id
+                remark: $("#addRemarks").val(), //备注
                 token: token,
             },
             success: function (data) {
@@ -204,6 +205,7 @@ $(".addCun").click(function () {
                     $(".inps1").val("");
                     $(".inps2").val("");
                     $(".inps3").val("");
+                    $("#addRemarks").val();
                 }
             },
         });
@@ -224,7 +226,7 @@ $(".change").click(function () {
         });
         return;
     } else {
-        // if (pid == "38") {
+        // if (String(pid) === "38") {
             $(".editkey").show();
         // } else {
         //     $(".editkey").hide();
@@ -232,8 +234,6 @@ $(".change").click(function () {
         changeAjax(id);
         $(".changeModel").css("display", "block");
         $(".chtps").html(name);
-        //			console.log(pidName);
-        //			console.log(pid);
         $(".inps4").val(pidName);
         chbcPid = pid;
         changeTreeCont();
@@ -328,6 +328,7 @@ function changeAjax(id) {
             $(".inps5").val(chanCon.F_Value);
             $(".inps3").val(chanCon.F_DeptName);
             $("#Dpment").val(chanCon.F_Deptid);
+            $("#changeRemarks").val(chanCon.F_Remark);
             //				$('.inps6').val(chanCon.sort);
             //				chbcSort = chanCon.sort;
             chbcName = chanCon.F_Value;
@@ -346,6 +347,7 @@ function changeBaoCunAjax(id, chbcPid, chbcName) {
             pid: chbcPid,
             name: chbcName,
             deptid: $("#Dpment").val(), //部门名称id
+            remark: $("#changeRemarks").val(), //备注
             token: token,
         },
         success: function (data) {

WebUI/CallCenterWeb.UI/SystemManager/shuJuZiDian.html

@@ -53,6 +53,7 @@
                     </div>
                 </div>
                 <div>分类名称：<input class="inps inps2" type="text" /></div>
+                <div>字典备注：<input id="addRemarks" class="inps" type="text" /></div>
                 <div class="addkey">部门名称:
                     <div class="inpBox">
                         <input type="text" class="inps3" />
@@ -109,6 +110,7 @@
                     </div>
                 </div>
                 <div>分类名称：<input class="inps inps5" type="text" style="margin-left: 5px" /></div>
+                <div>字典备注：<input id="changeRemarks" class="inps" type="text" style="margin-left: 5px" /></div>
                 <div class="editkey">部门名称：
                     <div class="inpBox">
                         <input type="text" class="inps3" />

WebUI/CallCenterWeb.UI/TelCall/CallRecord.html

@@ -469,7 +469,7 @@
 
                     if (stype == '1') {
                         param.usercode = usercodeID;
-                        param.phone = $("#tel").val();
+                        param.phone = $("#tel").val().replace(/\s+/g, "");
                         param.starttime = $("#start").val();
                         param.endtime = $("#end").val();
                         param.callstate = $("#ss_hjzt").val();
@@ -477,7 +477,7 @@
                         param.type = $("#callType").val(); //type=通话类型
                         param.actiontype = $("#ss_HJLX").val(); //呼叫类型
                         param.tasktype = $("#sf_hf").val(); //呼叫类型
-                        param.extnumber = $("#extnumber").val();
+                        param.extnumber = $("#extnumber").val().replace(/\s+/g, "");
                         param.phoneType = $("#phoneType").val();
                         param.islike = $("#islike").val(); // 查询类型
                     } else if (stype == '2') {
@@ -490,7 +490,7 @@
                         param.type = $("#callType").val(); //type=通话类型
                         param.actiontype = $("#ss_HJLX").val(); //呼叫类型
                         param.tasktype = $("#sf_hf").val(); //呼叫类型
-                        param.extnumber = $("#extnumber").val();
+                        param.extnumber = $("#extnumber").val().replace(/\s+/g, "");
                         param.phoneType = $("#phoneType").val();
                         param.islike = $("#islike").val(); // 查询类型
                     }
@@ -666,7 +666,7 @@
                     if (data.state.toLowerCase() == "success") {
                         var content = data.data;
                         $(content).each(function (i, n) {
-                            $("<option value='" + n.F_Value + "'>" + n.F_Value + "</option>")
+                            $("<option value='" + n.F_Value + "'>" + n.F_Remark + "</option>")
                                 .appendTo(obj);
                         })
                     }

WebUI/CallCenterWeb.UI/css/call.css

@@ -404,6 +404,6 @@ a {
 }
 .layui-menu li {
     margin: 0 !important;
-    height: 24px;
-    line-height: 16px !important;
+    height: 20px;
+    line-height: 12px !important;
 }

WebUI/CallCenterWeb.UI/css/init.css

@@ -344,6 +344,6 @@
 }
 .layui-menu li {
     margin: 0 !important;
-    height: 24px;
-    line-height: 16px !important;
+    height: 20px;
+    line-height: 12px !important;
 }

WebUI/CallCenterWeb.UI/css/style.min862f.css

@@ -201,7 +201,7 @@ body.body-small .navbar-top-links li:last-child {
 }
 
 .nav>li.active {
-	/*border-left: 4px solid #19aa8d;*/
+	border-left: 2px solid #00a1cb;
 	background: #00a1cb;
 }
 
@@ -565,7 +565,7 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
 }
 
 .top-navigation .nav>li.active>a {
-	color: #1ab394
+	color: #00a1cb
 }
 
 .top-navigation .navbar-right {
@@ -3562,10 +3562,10 @@ nav.page-tabs .page-tabs-content {
 	cursor: default
 }
 
-.nav.nav-tabs li {
+/* .nav.nav-tabs li {
 	background: 0 0;
 	border: none
-}
+} */
 
 .nav-tabs>li>a {
 	color: #A7B1C2;

WebUI/CallCenterWeb.UI/home.html

@@ -1661,6 +1661,8 @@
         <!--右侧边栏结束-->
     </div>
     <!--==========================================================================================-->
+    <!-- 弹屏状态 -->
+    <input id="bounceScreenStatus" type="hidden" />
     <!--来电弹屏开始-->
     <div class="ldtp-con clearfix animated fadeInDown">
         <div class="minBacha clearfix">
@@ -1939,13 +1941,13 @@
                                         <span class="col-sm-1">
                                             来电人:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <input type="text" class="khmc form-control" id="cusname" />
                                         </span>
                                         <span class="col-sm-1">
                                             性别:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <select name="" id="" class="form-control">
                                                 <option value="0">
                                                     男
@@ -1958,15 +1960,13 @@
                                         <span class="col-sm-1 Import">
                                             来电号码:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <input type="text" class="tsdh form-control" id="cusphone" />
                                         </span>
-                                    </div>
-                                    <div class="form-group clearfix">
                                         <span class="col-sm-1">
                                             类型:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <select name="" id="type" class="form-control">
                                                 <option value="咨询">
                                                     咨询
@@ -1985,36 +1985,13 @@
                                                 </option>
                                             </select>
                                         </span>
-                                        <span class="col-sm-1">
-                                            反映类别:
-                                        </span>
-                                        <span class="col-sm-3">
-                                            <input type="text" id="reflectCategory" class="form-control" autocomplete="off" />
-                                            <div class="reflectCategoryList-wrapper">
-                                                <ul id="reflectCategoryList">
-                                                </ul>
-                                            </div>                
-                                        </span>
-                                        <!-- <span class="col-sm-1 Import">
-                                            反映类别:
-                                        </span>
-                                        <span class="col-sm-3" style="position: relative">
-                                            <div class="inpBox">
-                                                <input type="text" class="inps" onkeyup="darptSearch()" />
-                                                <i class="Cleans fa fa-close"></i>
-                                                <i class="xl xl_one"></i>
-                                                <div class="addTree xlAdd">
-                                                    <ul id="addTreeDemo" class="ztree"></ul>
-                                                </div>
-                                            </div>
-                                            <div class="selDpart1">
-                                                <ul id="sponsor"></ul>
-                                            </div>
-                                        </span> -->
+                                    </div>
+                                    <div class="form-group clearfix">
+                                        
                                         <span class="col-sm-1 Import">
                                             紧急程度:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <select name="" id="level" class="form-control">
                                                 <!--<option value="0">请选择</option>-->
                                                 <option value="1" selected="selected">
@@ -2025,12 +2002,10 @@
                                                 </option>
                                             </select>
                                         </span>
-                                    </div>
-                                    <div class="form-group clearfix">
                                         <span class="col-sm-1">
                                             回访方式:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <select name="" id="visittype" class="form-control">
                                                 <option value="0" selected="selected">
                                                     正常回访
@@ -2041,9 +2016,9 @@
                                             </select>
                                         </span>
                                         <span class="col-sm-1">
-                                            自动派单
+                                            自动派单:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-2">
                                             <select name="" id="automaticDispatch" class="form-control">
                                                 <option value="">请选择</option>
                                                 <option value="1">
@@ -2056,10 +2031,36 @@
                                         </span>
                                     </div>
                                     <div class="form-group clearfix">
+                                        <span class="col-sm-1">
+                                            反映类别:
+                                        </span>
+                                        <span class="col-sm-5">
+                                            <input type="text" id="reflectCategory" class="form-control" autocomplete="off" />
+                                            <div class="reflectCategoryList-wrapper">
+                                                <ul id="reflectCategoryList">
+                                                </ul>
+                                            </div>            
+                                        </span>
+                                        <!-- <span class="col-sm-1 Import">
+                                            反映类别:
+                                        </span>
+                                        <span class="col-sm-3" style="position: relative">
+                                            <div class="inpBox">
+                                                <input type="text" class="inps" onkeyup="darptSearch()" />
+                                                <i class="Cleans fa fa-close"></i>
+                                                <i class="xl xl_one"></i>
+                                                <div class="addTree xlAdd">
+                                                    <ul id="addTreeDemo" class="ztree"></ul>
+                                                </div>
+                                            </div>
+                                            <div class="selDpart1">
+                                                <ul id="sponsor"></ul>
+                                            </div>
+                                        </span> -->
                                         <span class="col-sm-1 ">
                                             电话类别:
                                         </span>
-                                        <span class="col-sm-3">
+                                        <span class="col-sm-5">
                                             <select name="" id="phonetype" class="form-control">
                                                 <option value="">
                                                     请选择
@@ -2067,6 +2068,8 @@
                                             </select>
                                         </span>
                                     </div>
+                                    <div class="form-group clearfix">
+                                    </div>
                                     <div class="form-group clearfix" style="text-align: center">
                                         <!--<div class="bton addt_"><a>保存</a></div>-->
                                         <a class="btns addt_">保存</a>

WebUI/CallCenterWeb.UI/js/bootstrap-select.js

@@ -2499,12 +2499,12 @@
         if (!!that.$searchbox.val()) {
           that.$searchbox.val('');
         }
-        setTimeout(function () {
-            that.selectpicker.search.elements = [];
-            that.selectpicker.search.data = [];
-            that.$menuInner.scrollTop(0);
-            that.createView(false);
-        },100);
+        // setTimeout(function () {
+        //     that.selectpicker.search.elements = [];
+        //     that.selectpicker.search.data = [];
+        //     that.$menuInner.scrollTop(0);
+        //     that.createView(false);
+        // }, 100);
       });
 
       this.$searchbox.on('click.bs.dropdown.data-api focus.bs.dropdown.data-api touchend.bs.dropdown.data-api', function (e) {

WebUI/CallCenterWeb.UI/js/index.js

@@ -1792,7 +1792,7 @@ function getPhoneType(obj) {
                         "<option value='" +
                             n.F_Value +
                             "'>" +
-                            n.F_Value +
+                            n.F_Remark +
                             "</option>"
                     ).appendTo(obj);
                 });

WebUI/CallCenterWeb.UI/js/main.js

@@ -304,6 +304,13 @@ function IncomingBack(data) {
 
     $('.head-pic .lahei .la-after').hide();
     $(".Bacha").hide();
+    /* 
+        弹屏状态
+       bounceScreenStatus
+       0、关闭
+       1、打开
+    */
+    $("#bounceScreenStatus").val("1")
     // 历史记录 历史工单
     loadOld()
 }
@@ -313,7 +320,7 @@ function DropCallBack() {
     $("#top-search li i").removeClass("active");
     $(".Logout").addClass("active");
     $(".SayBusy").removeClass("active");
-    $(".SayFree").addClass("active");
+    // $(".SayFree").addClass("active");
     $(".MakeCall").addClass("active");
     $(".td-call").hide();
     $(".zxzt").removeClass("bl").removeClass("br").addClass("by");
@@ -367,8 +374,7 @@ function LineStateAgentBack(data) {
         $(".Logout").addClass("active");
         if($("#isml").val()==0){
 			$(".SayBusy").addClass("active");
-		}
-		else{
+		} else {
 			$(".SayFree").addClass("active");
 		}
 //      $(".SayBusy").addClass("active");
@@ -501,10 +507,15 @@ function SetStateCookie(state) {
 function SetState(obj) {
     if (obj.State == '5') {
         $(".SayBusy").removeClass("active");
-        $(".SayFree").addClass("active");
         $(".zxzt").removeClass("bl").removeClass("br").addClass("by");
         $(".hwzt").text('忙碌');
         $("#isml").val(1);
+        if($("#bounceScreenStatus").val() === "1"){
+			$(".SayFree").removeClass("active");
+		} else {
+            $(".SayFree").addClass("active");
+        }
+        $("#bounceScreenStatus").val("0")
         // SetStateCookie(1);
     }
     if (obj.State == '2') {
@@ -648,10 +659,11 @@ function LineStateBack(data) {
 }
 //后台排队
 function backstageQueue(data) {
+    console.log("123")
     var obj = $("iframe:visible")
-    if (obj.attr("data-id") == "index_v1.html") {
+    // if (obj.attr("data-id") == "index_v1.html") {
         window.frames[obj.attr("name")].realTimeMonitorQueue(data.WaitCount);
-    }
+    // }
 }
 //录音返回
 function RecordPathBack(data) {

WebUI/CallCenterWeb.UI/js/search/screen.js

@@ -102,7 +102,7 @@ function yardman(obj) {
         },
         function (data) {
             if (data.state.toLowerCase() == "success") {
-                var content = data.data;
+                var content = data.data.Table1;
                 $(content).each(function (i, n) {
                     $(
                         "<option value='" +

WebUI/CallCenterWeb.UI/widgets.html

@@ -1264,6 +1264,7 @@
                 );
             }
             function realTimeMonitorQueue(data) {
+                console.log("456");
                 $("#backstageQueue").text(data)
             }
         </script>