fix

WebUI/CallCenterWeb.UI/Appeal/AddAppeal.html

@@ -141,7 +141,7 @@
                             </select>
                         </td>
                     </tr>
-                    <tr class="phonetype-wrapper" style="display: none;">
+                    <tr class="phonetype-wrapper">
                         <th class="">电话类别:</th>
                         <td>
                             <select class="select_" id="phonetype">
@@ -402,8 +402,8 @@
                             $("<option value='" + n.F_ValueId + "'>" + n.F_Value + "</option>")
                                 .appendTo(obj);
                         })
-
                     }
+                    obj.val("1")
                 }
             });
         }

WebUI/CallCenterWeb.UI/Appeal/Lawsuit.html

@@ -235,13 +235,21 @@
         }
 
         .Min-width {
+            display: inline-block;
             width: 280px;
+            margin-right: 30px;
         }
 
         .btn-default {
             background: #ffffff;
             color: #000000;
         }
+        .nameJustified {
+            width: 5em;
+            display: inline-block;
+            text-align: justify;
+            text-align-last: justify;
+        }
     </style>
 </head>
 
@@ -288,7 +296,7 @@
                                 <td>
                                     <input type="text" placeholder="输入工单号" id="wids" class="form-control" />
                                 </td>
-                                <th>来电人：</th>
+                                <th><span class="nameJustified">来电人：</span></th>
                                 <td>
                                     <input type="text" id="name" class="form-control" autocomplete="off" />
                                 </td>
@@ -325,7 +333,7 @@
                                     <input type="text" placeholder="输入来电内容" id="workOrderContent"
                                         class="form-control" />
                                 </td>
-                                <th>审核员：</th>
+                                <th><span class="nameJustified">审核员：</span></th>
                                 <td>
                                     <select id="yardman" name="select" class="selectpicker show-tick form-control"
                                         multiple data-live-search="true">
@@ -379,8 +387,6 @@
                                 <th>来电类型：</th>
                                 <td>
                                     <select class="form-control Min-width" id="type"></select>
-                                </td>
-                                <td>
                                     <botton class="btns Seach">搜索</botton>
                                 </td>
                             </tr>
@@ -424,9 +430,9 @@
                                             已公开
                                         </option>
                                     </select>
+                                    <botton class="btns Export">导出</botton>
                                 </td>
                                 <td>
-                                    <botton class="btns Export">导出</botton>
                                 </td>
                             </tr>
                             <tr>

WebUI/CallCenterWeb.UI/Appeal/integratedQuery.html

@@ -235,13 +235,21 @@
         }
 
         .Min-width {
+            display: inline-block;
             width: 280px;
+            margin-right: 30px;
         }
 
         .btn-default {
             background: #ffffff;
             color: #000000;
         }
+        .nameJustified {
+            width: 5em;
+            display: inline-block;
+            text-align: justify;
+            text-align-last: justify;
+        }
     </style>
 </head>
 
@@ -288,7 +296,7 @@
                                 <td>
                                     <input type="text" placeholder="输入工单号" id="wids" class="form-control" />
                                 </td>
-                                <th>来电人：</th>
+                                <th><span class="nameJustified">来电人：</span></th>
                                 <td>
                                     <input type="text" id="name" class="form-control" autocomplete="off" />
                                 </td>
@@ -316,8 +324,6 @@
                                 <td>
                                     <select class="form-control Min-width" id="sourceAreas"></select>
                                 </td>
-                                <td></td>
-                                <td></td>
                             </tr>
                             <tr>
                                 <th>来电内容：</th>
@@ -325,7 +331,7 @@
                                     <input type="text" placeholder="输入来电内容" id="workOrderContent"
                                         class="form-control" />
                                 </td>
-                                <th>审核员：</th>
+                                <th><span class="nameJustified">审核员：</span></th>
                                 <td>
                                     <select id="yardman" name="select" class="selectpicker show-tick form-control"
                                         multiple data-live-search="true">
@@ -379,8 +385,6 @@
                                 <th>来电类型：</th>
                                 <td>
                                     <select class="form-control Min-width" id="type"></select>
-                                </td>
-                                <td>
                                     <botton class="btns Seach">搜索</botton>
                                 </td>
                             </tr>
@@ -424,8 +428,6 @@
                                             已公开
                                         </option>
                                     </select>
-                                </td>
-                                <td>
                                     <botton class="btns Export">导出</botton>
                                 </td>
                             </tr>

WebUI/CallCenterWeb.UI/CommonHtml/AddAppeal.html

@@ -245,11 +245,12 @@
             if (wid) {
                 $.ajax({
                     type: "get",
-                    url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrder",
+                    url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrderNew",
                     dataType: 'json',
                     async: false,
                     data: {
                         workorderid: wid,
+                        type: 0, // 工单信息
                         token: $.cookie("token")
                     },
                     success: function (data) {

WebUI/CallCenterWeb.UI/CommonHtml/AddAppealDCL.html

@@ -287,7 +287,7 @@
                 layer.open({
                     type: 2,
                     content: "../CommonHtml/associatWorkOrder.html?wid=" +
-                    wid, //iframe的url，no代表不显示滚动条
+                        wid, //iframe的url，no代表不显示滚动条
                     title: "关联工单",
                     area: ["90%", "90%"], //宽高
                 });
@@ -296,12 +296,12 @@
             if (wid) {
                 $.ajax({
                     type: "get",
-                    url: huayi.config.callcenter_url +
-                        "WorkOrder/GetWorkOrder",
+                    url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrderNew",
                     dataType: "json",
                     async: false,
                     data: {
                         workorderid: wid,
+                        type: 0, // 工单信息
                         token: $.cookie("token"),
                     },
                     success: function (data) {
@@ -339,7 +339,7 @@
                             //来源
                             $("#source option:selected").val(Data[0].F_InfoSource + "");
                             $("#source option:selected").text(Data[0].SourceName); //来源
-                            if(Data[0].F_InfoSource + "" === "4") {
+                            if (Data[0].F_InfoSource + "" === "4") {
                                 $(".leaderCharge-wrapper").show()
                                 $("#leaderCharge").val(Data[0].splituser)
                             }
@@ -690,7 +690,7 @@
                 },
             });
         }
-        $("#source").click(function() {
+        $("#source").click(function () {
             if ($("#source").val() === "4") {
                 $(".leaderCharge-wrapper").show()
             } else {

WebUI/CallCenterWeb.UI/CommonHtml/PrintPreview-1.html

@@ -717,7 +717,7 @@
                     var a = document.createElement('a')
                     var aurl = window.URL.createObjectURL(blob)
                     a.href = aurl;
-                    a.download = wid + "_安阳市12345政务服务热线交办单.docx";
+                    a.download = wid + "_安阳市12345政务服务热线交办单.doc";
                     a.click();
                 }
             }

WebUI/CallCenterWeb.UI/CommonHtml/WorkDatil.html

@@ -979,6 +979,8 @@
                                         $('.ZT').text("待审核");
                                     } else if (State == 11) {
                                         $('.ZT').text("重办待交办");
+                                    } else if (State == 13) {
+                                        $('.ZT').text("重办驳回");
                                     }
                                     //办理方式
                                     if (CLFS == 0) {

WebUI/CallCenterWeb.UI/MarketingManagement/LawsuitMarketing.html

@@ -235,13 +235,21 @@
         }
 
         .Min-width {
+            display: inline-block;
             width: 280px;
+            margin-right: 30px;
         }
 
         .btn-default {
             background: #ffffff;
             color: #000000;
         }
+        .nameJustified {
+            width: 5em;
+            display: inline-block;
+            text-align: justify;
+            text-align-last: justify;
+        }
     </style>
 </head>
 
@@ -288,7 +296,7 @@
                                 <td>
                                     <input type="text" placeholder="输入工单号" id="wids" class="form-control" />
                                 </td>
-                                <th>来电人：</th>
+                                <th><span class="nameJustified">来电人：</span></th>
                                 <td>
                                     <input type="text" id="name" class="form-control" autocomplete="off" />
                                 </td>
@@ -325,7 +333,7 @@
                                     <input type="text" placeholder="输入来电内容" id="workOrderContent"
                                         class="form-control" />
                                 </td>
-                                <th>审核员：</th>
+                                <th><span class="nameJustified">审核员：</span></th>
                                 <td>
                                     <select id="yardman" name="select" class="selectpicker show-tick form-control"
                                         multiple data-live-search="true">
@@ -379,8 +387,6 @@
                                 <th>来电类型：</th>
                                 <td>
                                     <select class="form-control Min-width" id="type"></select>
-                                </td>
-                                <td>
                                     <botton class="btns Seach">搜索</botton>
                                 </td>
                             </tr>
@@ -424,8 +430,6 @@
                                             已公开
                                         </option>
                                     </select>
-                                </td>
-                                <td>
                                     <botton class="btns Export">导出</botton>
                                 </td>
                             </tr>

WebUI/CallCenterWeb.UI/MultimediaWorkOrder/LawsuitMedia.html

@@ -234,13 +234,22 @@
         }
 
         .Min-width {
+            display: inline-block;
             width: 280px;
+            margin-right: 30px;
         }
 
         .btn-default {
             background: #ffffff;
             color: #000000;
         }
+
+        .nameJustified {
+            width: 5em;
+            display: inline-block;
+            text-align: justify;
+            text-align-last: justify;
+        }
     </style>
 </head>
 
@@ -287,7 +296,7 @@
                                 <td>
                                     <input type="text" placeholder="输入工单号" id="wids" class="form-control" />
                                 </td>
-                                <th>来电人：</th>
+                                <th><span class="nameJustified">来电人：</span></th>
                                 <td>
                                     <input type="text" id="name" class="form-control" autocomplete="off" />
                                 </td>
@@ -315,8 +324,6 @@
                                 <td>
                                     <select class="form-control Min-width" id="sourceAreas"></select>
                                 </td>
-                                <td></td>
-                                <td></td>
                             </tr>
                             <tr>
                                 <th>来电内容：</th>
@@ -324,7 +331,7 @@
                                     <input type="text" placeholder="输入来电内容" id="workOrderContent"
                                         class="form-control" />
                                 </td>
-                                <th>审核员：</th>
+                                <th><span class="nameJustified">审核员：</span></th>
                                 <td>
                                     <select id="yardman" name="select" class="selectpicker show-tick form-control"
                                         multiple data-live-search="true">
@@ -378,8 +385,6 @@
                                 <th>来电类型：</th>
                                 <td>
                                     <select class="form-control Min-width" id="type"></select>
-                                </td>
-                                <td>
                                     <botton class="btns Seach">搜索</botton>
                                 </td>
                             </tr>
@@ -423,8 +428,6 @@
                                             已公开
                                         </option>
                                     </select>
-                                </td>
-                                <td>
                                     <botton class="btns Export">导出</botton>
                                 </td>
                             </tr>

WebUI/CallCenterWeb.UI/OtherPhoneManagement/LawsuitOtherPhone.html

@@ -235,13 +235,21 @@
         }
 
         .Min-width {
+            display: inline-block;
             width: 280px;
+            margin-right: 30px;
         }
 
         .btn-default {
             background: #ffffff;
             color: #000000;
         }
+        .nameJustified {
+            width: 5em;
+            display: inline-block;
+            text-align: justify;
+            text-align-last: justify;
+        }
     </style>
 </head>
 
@@ -288,7 +296,7 @@
                                 <td>
                                     <input type="text" placeholder="输入工单号" id="wids" class="form-control" />
                                 </td>
-                                <th>来电人：</th>
+                                <th><span class="nameJustified">来电人：</span></th>
                                 <td>
                                     <input type="text" id="name" class="form-control" autocomplete="off" />
                                 </td>
@@ -325,7 +333,7 @@
                                     <input type="text" placeholder="输入来电内容" id="workOrderContent"
                                         class="form-control" />
                                 </td>
-                                <th>审核员：</th>
+                                <th><span class="nameJustified">审核员：</span></th>
                                 <td>
                                     <select id="yardman" name="select" class="selectpicker show-tick form-control"
                                         multiple data-live-search="true">
@@ -379,8 +387,6 @@
                                 <th>来电类型：</th>
                                 <td>
                                     <select class="form-control Min-width" id="type"></select>
-                                </td>
-                                <td>
                                     <botton class="btns Seach">搜索</botton>
                                 </td>
                             </tr>
@@ -424,8 +430,6 @@
                                             已公开
                                         </option>
                                     </select>
-                                </td>
-                                <td>
                                     <botton class="btns Export">导出</botton>
                                 </td>
                             </tr>

WebUI/CallCenterWeb.UI/ReportForm/superviseDataStatistics.html

@@ -111,6 +111,16 @@
             font-size: 16px;
             text-align: center;
         }
+        .select {
+            width: 200px;
+            height: 32px;
+            border: 1px solid rgb(229, 230, 231);
+        }
+        .footerDataStatistics {
+            /* padding: 0 0 0 20px; */
+            margin: 10px 0 0 10px;
+            font-size: 18px;
+        }
     </style>
 </head>
 
@@ -147,6 +157,8 @@
                                 <ul id="deptTree" class="ztree"></ul>
                             </div>
                         </div>
+                        工单来源：
+                        <select class="select" id="source"></select>
                         <button class="btns search_1">查询</button>
                         <a class="btns" id="exportPublicSentiments">导出</a>
                     </div>
@@ -280,7 +292,8 @@
                                 <th data-field="Chargeback" data-formatter="backCountList" data-align="center">退单件</th>
                                 <th data-field="Chargebackrate" data-align="center">有效回复率</th>
                                 <th data-field="Chargebackscore" data-align="center">得分（15分）</th>
-                                <th data-field="Comment" data-formatter="visitCountList" data-formatter="visitCountList" data-align="center">群众评议总数</th>
+                                <th data-field="Comment" data-formatter="visitCountList" data-formatter="visitCountList"
+                                    data-align="center">群众评议总数</th>
                                 <th data-field="dissatisfied" data-formatter="dissatisfiedCountList"
                                     data-align="center">不满意件</th>
                                 <th data-field="satisfiedrate" data-align="center">满意率</th>
@@ -291,6 +304,7 @@
                         </thead>
                     </table>
                 </div>
+                <div class="footerDataStatistics">统计时段：00:00—23:59:59</div>
             </div>
         </div>
     </div>
@@ -309,6 +323,7 @@
 
             initTable();
             bindtree();
+        	LY($("#source"));
         });
         //表格
         function initTable() {
@@ -319,6 +334,7 @@
                     starttime: $('#squeryTime').val(),
                     endtime: $('#equeryTime').val(),
                     deptid: $("#deptid").val(),
+                    source: $("#source").val(),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -486,6 +502,34 @@
                 area: ['90%', '90%'], //宽高
             });
         }
+        //来源
+        function LY(obj) {
+            obj.empty();
+            obj.append(
+                '<option selected="selected" value="">请选择</option>'
+            );
+            $.getJSON(
+                huayi.config.callcenter_url +
+                "Dictionary/GetDicValueListById", {
+                    token: $.cookie("token"),
+                    id: 1,
+                },
+                function (data) {
+                    if (data.state.toLowerCase() == "success") {
+                        var content = data.data;
+                        $(content).each(function (i, n) {
+                            $(
+                                "<option value='" +
+                                n.F_ValueId +
+                                "'>" +
+                                n.F_Value +
+                                "</option>"
+                            ).appendTo(obj);
+                        });
+                    }
+                }
+            );
+        }
     </script>
 </body>
 

WebUI/CallCenterWeb.UI/ReportForm/superviseStatisticsList.html

@@ -25,8 +25,12 @@
                         <th data-field="DeptName" data-align="center">承办单位</th>
                         <th data-field="UserName" data-align="center">受理人</th>
                         <th data-field="F_WorkState" data-align="center" data-formatter="States">办理状态</th>
-                        <th data-field="OverState" data-formatter="OverTime" data-align="center">时限</th>
-                        <th data-field="LimitTime" data-formatter="BanTime" data-align="center">办理时限</th>
+                        <th data-field="F_ComContent" data-align="center">来电内容</th>
+                        <th data-field="OverState" data-formatter="OverTime" data-class="OverState" data-align="center">
+                            时限</th>
+                        <th data-field="LimitTime" data-formatter="BanTime" data-class="LimitTime" data-align="center">
+                            办理时限</th>
+                        <th data-field="Dissatisfied" data-class="Dissatisfied" data-align="center">不满意原因</th>
                     </tr>
                 </thead>
                 <tbody class="list"></tbody>
@@ -83,14 +87,56 @@
                     return param;
                 },
                 onLoadSuccess: function (data) { //加载成功时执行
-                    //layer.msg("加载成功");
-                    //console.log(data);
+                    listJudgment();
                 },
                 onLoadError: function () { //加载失败时执行
                     //layer.msg("加载数据失败", { time: 1500, icon: 2 });
                 }
             });
         }
+
+        /* 
+        1、承办件弹出的工单列表中去掉“时限、办理时限”，增加显示出来电内容
+
+        2、超期件弹出的工单列表中增加显示出来电内容
+
+        3、未果件弹出的工单列表中去掉“时限、办理时限”，增加显示出来电内容
+
+        4、退单件弹出的工单列表中去掉“时限、办理时限”，增加显示出来电内容
+
+        5、群众评议总数弹出的工单列表中去掉“时限、办理时限”，增加显示出来电内容
+
+        6、不满意件弹出的工单列表中去掉“时限、办理时限”，增加显示出来电内容、不满意件原因
+        */
+        function listJudgment() {
+            if (dbtype === "0") {
+                $("#orderlist").find(".OverState").hide()
+                $("#orderlist").find(".LimitTime").hide()
+                $("#orderlist").find(".Dissatisfied").hide()
+            } else if (dbtype === "1") {
+                // $(".OverState").hide()
+                // $(".LimitTime").hide()
+                $("#orderlist").find(".Dissatisfied").hide()
+            } else if (dbtype === "2") {
+                $("#orderlist").find(".OverState").hide()
+                $("#orderlist").find(".LimitTime").hide()
+                $("#orderlist").find(".Dissatisfied").hide()
+            } else if (dbtype === "3") {
+                $("#orderlist").find(".OverState").hide()
+                $("#orderlist").find(".LimitTime").hide()
+                $("#orderlist").find(".Dissatisfied").hide()
+            } else if (dbtype === "4") {
+                $("#orderlist").find(".OverState").hide()
+                $("#orderlist").find(".LimitTime").hide()
+                $("#orderlist").find(".Dissatisfied").hide()
+            } else if (dbtype === "5") {
+                $("#orderlist").find(".OverState").hide()
+                $("#orderlist").find(".LimitTime").hide()
+                $("#orderlist").find(".Dissatisfied").show()
+            }
+
+        }
+
         //状态
         function States(val, row) {
             var html = '';
@@ -207,7 +253,8 @@
             var dbdata = 1;
 
             var url = huayi.config.callcenter_url + "WorkOrder/GetList?token=" + $.cookie("token");
-            url += "&starttime=" + starttime + "&endtime=" + endtime + "&dbdata=" + dbdata + "&deptid=" + deptId + "&dbtype=" + dbtype + "&isdc=1";
+            url += "&starttime=" + starttime + "&endtime=" + endtime + "&dbdata=" + dbdata + "&deptid=" + deptId +
+                "&dbtype=" + dbtype + "&isdc=1";
             window.location.href = url;
         }
     </script>

WebUI/CallCenterWeb.UI/css/init.css

@@ -41,9 +41,9 @@
 .btns {
 	background: #00a1cb;
 	color: #fff;
-	padding: 6px 10px;
+	padding: 8px 18px;
 	outline: none;
-	font-size: 12px;
+	/* font-size: 14px; */
 	margin-left: 15px;
 	border: 0;
 	border-radius: 3px;

WebUI/CallCenterWeb.UI/home.html

@@ -1358,10 +1358,10 @@
                                     <i class="iconfont fa-5x Meeting"></i>
                                     <p>多方通话</p>
                                 </li>
-                                <li datafun="MeetingTakeBack">
+                                <!-- <li datafun="MeetingTakeBack">
                                     <i class="iconfont fa-5x MeetingTakeBack"></i>
                                     <p>多方通话回签</p>
-                                </li>
+                                </li> -->
                                 <li datafun="Transfer">
                                     <i class="iconfont fa-5x Transfer"></i>
                                     <p>转移</p>

WebUI/CallCenterWeb.UI/js/WorkOrder/WorkOrderList.js

@@ -17,10 +17,10 @@ function View(val, row) {
         '<span style="color: #FF0000">' +
         workIdAddress +
         "</span>" +
-        '<span style="color: #32CD32">' +
+        '<span style="color: #008000">' +
         workIdDate +
         "</span>" +
-        '<span style="color: #BA55D3">' +
+        '<span style="color: #800080">' +
         workIdSerialNumber +
         "</span>" +
         "</a></div>"

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

@@ -246,7 +246,7 @@ function depart() {
 
 function treeReactionCategory() {
 	$.get(
-		huayi.config.callcenter_url + "Dictionary/GetZTreeList", {
+		huayi.config.callcenter_url + "Dictionary/GetZTreeListNew", {
 			token: $.cookie("token"),
 			pid: 38
 		},

WebUI/CallCenterWeb.UI/js/ztreeSelect.js

@@ -22,7 +22,7 @@ $('.Cleans').click(function() {
 
 function tree() {
 	$.get(
-		huayi.config.callcenter_url + "Dictionary/GetZTreeList", {
+		huayi.config.callcenter_url + "Dictionary/GetZTreeListNew", {
 			token: $.cookie("token"),
 			pid: 38
 		},