fix

WebUI/CallCenterWeb.UI/Business/LeaderYJA.html

@@ -965,6 +965,17 @@
                 area: ["50%", "40%"], //宽高
             });
         }
+
+        //修改
+        function editProcessingResult(str) {
+            layer.open({
+                type: 2,
+                content: "../CommonHtml/editProcessingResult.html?wid=" + str, //iframe的url，no代表不显示滚动条
+                title: "修改",
+                area: ["50%", "40%"], //宽高
+            });
+        }
+
         $('.Appeal').click(function () {
             layer.open({
                 type: 2,

WebUI/CallCenterWeb.UI/Business/haveAduit.html

@@ -303,7 +303,10 @@
                                 </td>
                                 <th>时间：</th>
                                 <td colspan="3">
-                                    <input id="starttime" class="photo x-color laydate-icon" type="text" autocomplete="off" style="height: 35px;" />-<input id="endtime" class="photo x-color laydate-icon" type="text" autocomplete="off" style="height: 35px;" />
+                                    <input id="starttime" class="photo x-color laydate-icon" type="text"
+                                        autocomplete="off" style="height: 35px;" />-<input id="endtime"
+                                        class="photo x-color laydate-icon" type="text" autocomplete="off"
+                                        style="height: 35px;" />
                                 </td>
                                 <!-- <th>工单状态：</th>
                                 <td>
@@ -368,20 +371,6 @@
                                 <td>
                                     <select class="select_" id="sourceAreas"></select>
                                 </td>
-                                <th>承办单位:</th>
-                                <td 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>
-                                </td>
                             </tr>
                             <tr>
                                 <th>坐席：</th>
@@ -400,7 +389,21 @@
                                         </option>
                                     </select>
                                 </td>
-                                <td colspan="7" style="text-align: center">
+                                <th>承办单位:</th>
+                                <td 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>
+                                </td>
+                                <td colspan="" style="text-align: center">
                                     <botton class="btns Seach">搜索</botton>
                                     <botton class="btns Export">导出</botton>
                                 </td>
@@ -663,7 +666,7 @@
                 return "";
             }
         }
-        
+
         function View(val, row) {
             return '<div class="imgs" ><a class="" index="' + row.CreateUser +
                 '" onclick= ckxq("' + row.F_WorkOrderId + '") >' + val + '</a></div>';
@@ -875,7 +878,7 @@
                 type: 2,
                 // content: "../CommonHtml/Supervision_.html?wid=" + str +"&type=1" + "&state=1" + "&pageName=haveAduit", //iframe的url，no代表不显示滚动条
                 content: "../CommonHtml/Supervision_.html?wid=" + str + "&type=1" +
-                "&state=1", //iframe的url，no代表不显示滚动条
+                    "&state=1", //iframe的url，no代表不显示滚动条
                 title: "督办",
                 area: ["90%", "90%"], //宽高
             });
@@ -1108,6 +1111,15 @@
                 area: ["50%", "40%"], //宽高
             });
         }
+        //修改
+        function editProcessingResult(str) {
+            layer.open({
+                type: 2,
+                content: "../CommonHtml/editProcessingResult.html?wid=" + str, //iframe的url，no代表不显示滚动条
+                title: "修改",
+                area: ["50%", "40%"], //宽高
+            });
+        }
         //上传文件
         function upload() {
             if (document.getElementById("upFile").files.length > 0) {

WebUI/CallCenterWeb.UI/CommonHtml/editProcessingResult.html

@@ -0,0 +1,119 @@
+<!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 rel="stylesheet" href="../css/init.css" />
+    <title>修改</title>
+</head>
+
+<body>
+    <div class="Common">
+        <table>
+            <tr>
+                <th class="Importent">办理结果:</th>
+                <td colspan="7"><textarea data-adaptheight id="result" name="" rows="" cols=""></textarea></td>
+            </tr>
+            <tr>
+                <th class="Importent">工单内容:</th>
+                <td colspan="7"><textarea data-adaptheight id="content" name="" rows="" cols=""></textarea></td>
+            </tr>
+        </table>
+        <div class="btn_box">
+            <input type="hidden" id="F_guid" value="" />
+            <button class="btns CB">保存</button>
+            <button class="btns mediaTransfer">转公开</button>
+        </div>
+    </div>
+
+    <!--<script src="../js/main.js?v=1.5"></script>-->
+    <script src="../js/adjustHeight.js"></script>
+    <script src="../js/guid.js"></script>
+    <script>
+        var wid = helper.request.queryString("wid");
+        $(document).ready(function () {
+            $('.CB').click(function () {
+                CB();
+            })
+            getDetail()
+        });
+        //重办
+        function CB() {
+            if ($('#replace').val() == '') {
+                layer.msg("请输入重办原因");
+                return;
+            }
+            $.post(huayi.config.callcenter_url + 'WorkOrder/EditResult', {
+                workorderid: wid,
+                result: $("#result").val(),
+                content: $("#content").val(),
+                token: $.cookie("token")
+            }, function (result) {
+                result = JSON.parse(result);
+                if (result.state.toLowerCase() == "success") {
+                    var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+                    parent.layer.close(index); //再执行关闭
+                    parent.$('#orderlist').bootstrapTable('refresh');
+                    parent.layer.msg("操作成功");
+                }
+            })
+        }
+        //转媒体
+        $('.mediaTransfer').click(function () {
+            layer.open({
+                content: '是否要转公开？',
+                btn: ['是', '否'],
+                yes: function (index, layero) {
+                    $.post(huayi.config.callcenter_url + "WorkOrder/ReleaseWorkOrder", {
+                        workorderid: wid, //工单编号
+                        isrelease: 1, //(0撤回，1转媒体)
+                        isopen: 1,
+                        token: $.cookie("token")
+                    }, function (result) {
+                        var data = JSON.parse(result);
+                        if (data.state == "success") {
+                            $(".mediaTransfer").hide();
+                            var index = parent.layer.getFrameIndex(window
+                                .name); //先得到当前iframe层的索引
+                            parent.layer.close(index); //再执行关闭
+                            parent.$('#orderlist').bootstrapTable('refresh');
+                            parent.layer.msg("操作成功");
+                        }
+                    })
+                }
+            })
+        });
+
+        // 获取详情
+        function getDetail() {
+            $.ajax({
+                type: "get",
+                url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrder",
+                dataType: 'json',
+                async: false,
+                data: {
+                    workorderid: wid,
+                    token: $.cookie("token")
+                },
+                success: function (result) {
+                    if (result.state.toLowerCase() == "success") {
+                        var content = result.data;
+                        var bldataLength = content.bldata.length
+                        if (content.data[0].F_Content === "" || content.data[0].F_Content === null) {
+                            $("#content").text(content.data[0].F_ComContent)
+                        } else {
+                            $("#content").text(content.data[0].F_Content)
+                        }
+                        if ( bldataLength > 0) {
+                            $("#result").val(content.bldata[bldataLength - 1].F_Result)
+                        }
+                    }
+                }
+            })
+        }
+    </script>
+</body>
+
+</html>

WebUI/CallCenterWeb.UI/CommonHtml/handle.html

@@ -625,7 +625,7 @@
                 if (data.state.toLowerCase() == "success") {
 
                     var content = data.data;
-                    content = content.slice(1, content.length)
+                    // content = content.slice(1, content.length)
                     $("<option value=''>请选择</option>").appendTo(obj);
                     $(content).each(function (i, n) {
                         $("<option value='" + n.F_DeptId + "'>" + n.F_DeptName + "</option>").appendTo(

WebUI/CallCenterWeb.UI/CommonHtml/processing_audit.html

@@ -55,6 +55,10 @@
 				</div>-->
         </table>
         <table>
+            <tr>
+                <th>工单内容：</th>
+                <td id="workOrderContent"></td>
+            </tr>
             <!-- <tr>
                 <th class="Importent" style="text-align: left;"> 审核意见:</th>
             </tr>
@@ -80,7 +84,7 @@
             //				HGXX();
             BLNR();
             Hove();
-
+            getDetail();
             //上传附件
             $("#scwj").click(function () {
                 $("#upFile").trigger("click");
@@ -129,6 +133,31 @@
                 }
             })
         }
+
+        // 获取详情
+        function getDetail() {
+            $.ajax({
+                type: "get",
+                url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrder",
+                dataType: 'json',
+                async: false,
+                data: {
+                    workorderid: wid,
+                    token: $.cookie("token")
+                },
+                success: function (result) {
+                    var content = result.data;
+                    if (result.state.toLowerCase() == "success") {
+                        if (content.data[0].F_Content === "" || content.data[0].F_Content === null) {
+                            $("#workOrderContent").text(content.data[0].F_ComContent)
+                        } else {
+                            $("#workOrderContent").text(content.data[0].F_Content)
+                        }
+                    }
+                }
+            })
+        }
+
         //			工单详情
         //			function HGXX() {
         //				$.getJSON(huayi.config.callcenter_url + 'WorkOrder/GetSecondDealInfo', {

WebUI/CallCenterWeb.UI/CommonHtml/replyUnsuccessful.html

@@ -59,7 +59,7 @@
         var callid = helper.request.queryString("callid");
         var depId = helper.request.queryString("depId");
         $(document).ready(function () {
-            getDetails()
+            getDetail()
             $(".replyBtn").click(function () {
                 replyhande();
             })
@@ -83,7 +83,7 @@
             })
         }
         //催单
-        function getDetails() {
+        function getDetail() {
             $.ajax({
                 type: "get",
                 url: huayi.config.callcenter_url + "WorkOrder/GetWorkOrder",

WebUI/CallCenterWeb.UI/MultimediaWorkOrder/LeaderYJAMedia.html

@@ -966,6 +966,16 @@
                 area: ["50%", "40%"], //宽高
             });
         }
+        //修改
+        function editProcessingResult(str) {
+            layer.open({
+                type: 2,
+                content: "../CommonHtml/editProcessingResult.html?wid=" + str, //iframe的url，no代表不显示滚动条
+                title: "修改",
+                area: ["50%", "40%"], //宽高
+            });
+        }
+
         $('.Appeal').click(function () {
             layer.open({
                 type: 2,

WebUI/CallCenterWeb.UI/MultimediaWorkOrder/haveAduitMedia.html

@@ -371,20 +371,6 @@
                                 <td>
                                     <select class="select_" id="sourceAreas"></select>
                                 </td>
-                                <th>承办单位:</th>
-                                <td 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>
-                                </td>
                             </tr>
                             <tr>
                                 <th>坐席：</th>
@@ -403,7 +389,21 @@
                                         </option>
                                     </select>
                                 </td>
-                                <td colspan="7" style="text-align: center">
+                                <th>承办单位:</th>
+                                <td 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>
+                                </td>
+                                <td colspan="" style="text-align: center">
                                     <botton class="btns Seach">搜索</botton>
                                     <botton class="btns Export">导出</botton>
                                 </td>
@@ -1113,6 +1113,16 @@
                 area: ["50%", "40%"], //宽高
             });
         }
+        //修改
+        function editProcessingResult(str) {
+            layer.open({
+                type: 2,
+                content: "../CommonHtml/editProcessingResult.html?wid=" + str, //iframe的url，no代表不显示滚动条
+                title: "修改",
+                area: ["50%", "40%"], //宽高
+            });
+        }
+
         //上传文件
         function upload() {
             if (document.getElementById("upFile").files.length > 0) {

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

@@ -48,7 +48,7 @@ huayi.config = {
         "<a class='xg' onclick='messagesUrge(\"data\")' title='催办'>催办</a>", //催办
         "<a class='xg' onclick='returnRedoThreeLevel(\"data\")' title='退回'>退回</a>", //退回
         "<a class='xg' onclick='returnAuditor(\"data\")' title='退回'>退回</a>", //退回
-        "<a class='xg' onclick='editProcessingResult(\"data\")' title='修改'>修改</a>", //退回
+        "<a class='xg' onclick='editProcessingResult(\"data\")' title='修改'>修改</a>", //修改
     ],
     kapArr: [
         "<a class='xg' onclick='goDetail(\"data\",\"data_id\")' title='查看'>查看</a>",

WebUI/CallCenterWeb.UI/YeWu/ZX.html

@@ -100,8 +100,7 @@
                                 </li>-->
                                 <li>
                                     创建时间：
-                                    <input class="photo x-color inputs laydate-icon" type="text" id="startTimes" />
-                                    <!-- <input class="photo x-color inputs laydate-icon" type="text" id="endTimes" /> -->
+                                    <input id="starttime" class="photo x-color laydate-icon" type="text" autocomplete="off" style="height: 35px;" />-<input id="endtime" class="photo x-color laydate-icon" type="text" autocomplete="off" style="height: 35px;" />
                                 </li>
                                 <li>
                                     <a class="sc_btn btns db">搜索</a>
@@ -134,13 +133,23 @@
         </div>
     </div>
 
-    <script src="../js/laydate/laydate.js"></script>
+    <!-- <script src="../js/laydate/laydate.js"></script> -->
+    <script src="../css/laydate/laydate.js"></script>
+
     <script>
         $(document).ready(function () {
-            laydate.render({
-                elem: "#startTimes", //指定元素
-                type: "datetime",
-                range: "~",
+            laydate.skin('blue');
+            laydate({
+                elem: '#starttime',
+                event: 'focus',
+                istime: true,
+                format: 'YYYY-MM-DD hh:mm:ss'
+            });
+            laydate({
+                elem: '#endtime',
+                event: 'focus',
+                istime: true,
+                format: 'YYYY-MM-DD hh:mm:ss'
             });
 
             //导出
@@ -161,10 +170,8 @@
                 url: huayi.config.callcenter_url + 'WorkOrderReport/GetUserAccountAssessment',
                 type: 'get',
                 data: {
-                    start: $("#startTimes").val() &&
-                        $("#startTimes").val().split(" ~ ")[0],
-                    end: $("#startTimes").val() &&
-                        $("#startTimes").val().split(" ~ ")[1],
+                    start: $("#startTimes").val(),
+                    end: $("#endtime").val(),
                     token: $.cookie("token")
                 },
                 dataType: "json",
@@ -182,10 +189,8 @@
 
 
         function dcexcel(obj) {
-            var start = $("#startTimes").val() &&
-                        $("#startTimes").val().split(" ~ ")[0]
-            var end = $("#startTimes").val() &&
-                        $("#startTimes").val().split(" ~ ")[1]
+            var start = $("#startTimes").val()
+            var end = $("#endtime").val()
             var url = huayi.config.callcenter_url + "WorkOrderReport/GetUserAccountAssessment?token=" + $.cookie(
                 "token");
             url += "&start=" + start + "&end=" + end + "&isExport=true";

WebUI/CallCenterWeb.UI/js/index.js

@@ -774,6 +774,7 @@ $(document).ready(function () {
     $(".btnVerificationCode").click(function () {
         getVerificationCode();
     });
+    //是否需要编辑用户信息
     function getWhetherEditInformation() {
         $.ajax({
             type: "post",