套接问题描述页面

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -552,6 +552,15 @@ public class AdminCustomerController {
         }
     }
 
+    @RequiresPermissions("customer:get:visit")
+    @RequestMapping("/_visit_info")
+    public ModelAndView toVisitInfo(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("cm/customer/visit_detail");
+        String customerId = request.getParameter("customerId");
+        mv.addObject("customerId", customerId);
+        return mv;
+    }
+
     /**
      * 获取回访信息详情
      *
@@ -580,6 +589,21 @@ public class AdminCustomerController {
     }
 
     /**
+     * 进入问题描述页面
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("customer:get:describe")
+    @RequestMapping("/_question_describe")
+    public ModelAndView toQuestionDescribe(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("cm/customer/describe_detail");
+        String customerId = request.getParameter("customerId");
+        mv.addObject("customerId", customerId);
+        return mv;
+    }
+
+    /**
      * 获取问题描述信息
      *
      * @param request

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -104,67 +104,70 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-10 col-sm-10">
-                <ul class="time-line-list">
-                    <!--<li id="li-1"><span class="arrow"></span><div id="number-1" class="number">1</div><div id="txt-1">录入客诉</div></li>
-                    <li id="li-2"><span class="arrow"></span><div id="number-2" class="number">2</div><div id="txt-2">督促用户寄回</div></li>
-                    <li id="li-3"><span class="arrow"></span><div id="number-3" class="number">3</div><div id="txt-3">录入快递单号</div></li>
-                    <li id="li-4"><span class="arrow"></span><div id="number-4" class="number">4</div><div id="txt-4">仓库收货</div></li>
-                    <li id="li-5"><span class="arrow"></span><div id="number-5" class="number">5</div><div id="txt-5">换新发货</div></li>
-                    <li id="li-6"><span class="arrow"></span><div id="number-6" class="number">6</div><div id="txt-6">发货通知用户</div></li>
-                    <li id="li-7"><span class="arrow"></span><div id="number-7" class="number">7</div><div id="txt-7">收货后回访</div></li>-->
-                </ul>
+        <div id="div_costomer" style="display: none;">
+            <div class="row cl">
+                <label class="form-label col-1 col-sm-1"></label>
+                <div class="formControls col-10 col-sm-10">
+                    <ul class="time-line-list">
+                        <!--<li id="li-1"><span class="arrow"></span><div id="number-1" class="number">1</div><div id="txt-1">录入客诉</div></li>
+                        <li id="li-2"><span class="arrow"></span><div id="number-2" class="number">2</div><div id="txt-2">督促用户寄回</div></li>
+                        <li id="li-3"><span class="arrow"></span><div id="number-3" class="number">3</div><div id="txt-3">录入快递单号</div></li>
+                        <li id="li-4"><span class="arrow"></span><div id="number-4" class="number">4</div><div id="txt-4">仓库收货</div></li>
+                        <li id="li-5"><span class="arrow"></span><div id="number-5" class="number">5</div><div id="txt-5">换新发货</div></li>
+                        <li id="li-6"><span class="arrow"></span><div id="number-6" class="number">6</div><div id="txt-6">发货通知用户</div></li>
+                        <li id="li-7"><span class="arrow"></span><div id="number-7" class="number">7</div><div id="txt-7">收货后回访</div></li>-->
+                    </ul>
+                </div>
             </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">订单信息</label>
-            <div class="formControls col-7 col-sm-7 text-c">
-                <table class="table table-border table-bg table-bordered">
-                    <tr>
-                        <th>销售</th>
-                        <th>订单号</th>
-                        <th>姓名</th>
-                        <th>电话</th>
-                        <th>订单金额</th>
-                        <th>购买产品</th>
-                        <th>购买日期</th>
-                    </tr>
-                    <tr>
-                        <td id="companyName"></td>
-                        <td id="salesOrderId"></td>
-                        <td id="salesAddressName"></td>
-                        <td id="salesAddressTel"></td>
-                        <td id="salesPayMoney"></td>
-                        <td id="salesItem"></td>
-                        <td id="salesPayTime"></td>
-                    </tr>
-                </table>
-            </div>
-        </div>
-        <div class="row cl" id="divCloseProdcue">
-            <label class="form-label col-1 col-sm-1">寄回产品：</label>
-            <div class="formControls col-5 col-sm-5">
-                <label id="closeprodcue"></label>
-                <!--TDS收集-->
-                <label id="customerTDS"></label>
+            <div class="row cl">
+                <label class="form-label col-1 col-sm-1">订单信息</label>
+                <div class="formControls col-7 col-sm-7 text-c">
+                    <table class="table table-border table-bg table-bordered">
+                        <tr>
+                            <th>销售</th>
+                            <th>订单号</th>
+                            <th>姓名</th>
+                            <th>电话</th>
+                            <th>订单金额</th>
+                            <th>购买产品</th>
+                            <th>购买日期</th>
+                        </tr>
+                        <tr>
+                            <td id="companyName"></td>
+                            <td id="salesOrderId"></td>
+                            <td id="salesAddressName"></td>
+                            <td id="salesAddressTel"></td>
+                            <td id="salesPayMoney"></td>
+                            <td id="salesItem"></td>
+                            <td id="salesPayTime"></td>
+                        </tr>
+                    </table>
+                </div>
             </div>
+            <div class="row cl" id="divCloseProdcue">
+                <label class="form-label col-1 col-sm-1">寄回产品：</label>
+                <div class="formControls col-5 col-sm-5">
+                    <label id="closeprodcue"></label>
+                    <!--TDS收集-->
+                    <label id="customerTDS"></label>
+                </div>
 
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">收货地址：</label>
-            <div class="formControls col-5 col-sm-5">
-                <label id="relationSendMergeAddress"></label>
             </div>
+            <div class="row cl">
+                <label class="form-label col-1 col-sm-1">收货地址：</label>
+                <div class="formControls col-5 col-sm-5">
+                    <label id="relationSendMergeAddress"></label>
+                </div>
 
-        </div>
-        <div class="row cl" id="divSendProdcue">
-            <label class="form-label col-1 col-sm-1">寄送产品：</label>
-            <div class="formControls col-10 col-sm-10">
-                <label id="sendprodcue"></label>
+            </div>
+            <div class="row cl" id="divSendProdcue">
+                <label class="form-label col-1 col-sm-1">寄送产品：</label>
+                <div class="formControls col-10 col-sm-10">
+                    <label id="sendprodcue"></label>
+                </div>
             </div>
         </div>
+
         <div class="row cl">
             <label class="form-label col-1 col-sm-1">处理描述：</label>
             <div class="formControls col-5 col-sm-5">
@@ -214,6 +217,11 @@
         getCustomerInfo();
     });
 
+    var sendprodcue = '';
+    var sendprodcueshow = false;    //寄送产品
+    var closeprodcue = '';
+    var closeprodcueshow = false;   //寄回产品
+
     /**
      * 查询客诉基本信息
      */
@@ -230,6 +238,7 @@
                     var customer = data.returnMsg.customer;
                     var customerCommon = data.returnMsg.customerCommon;
                     var salesOrder = data.returnMsg.salesOrder;
+
                     if (customer.customerIsSolve != 1 && customer.customerIsSolve != 2) {
                         resultshow(customer.customerIsSolve, customerCommon.relationBackStatus,customerCommon.relationSendStatus,
                                 customerCommon.maintenanceIsRepair,customerCommon.detectState);
@@ -279,30 +288,23 @@
                     $('#salesPayTime').html(salesOrder.salesPayTime);
                     $('#relationSendMergeAddress').html(customerCommon.relationSendMergeAddress+"-"+customerCommon.relationSendAddress);
                     $('#describeHandleDesc').val(customer.describeHandleDesc);
-                    var sendprodcue = '';
-                    var sendprodcueshow = false;
-                    var closeprodcue = '';
-                    var closeprodcueshow = false;
+
                     if (customerCommon.sendProdcues != null && customerCommon.sendProdcues.length > 0) {
-                        sendprodcueshow = true;
                         $.each(customerCommon.sendProdcues,function(index,item){
                             sendprodcue += this.sendProduceName + '*' + this.sendProdcueNumber
                         })
                     }
                     if (customerCommon.sendFittings != null && customerCommon.sendFittings.length > 0) {
-                        sendprodcueshow = true;
                         $.each(customerCommon.sendFittings,function(index,item){
                             sendprodcue += this.sendProductName + '*' + this.sendFittingNumber
                         })
                     }
                     if (customerCommon.closedProdcues != null && customerCommon.closedProdcues.length > 0) {
-                        closeprodcueshow = true;
                         $.each(customerCommon.closedProdcues,function(index,item){
                             closeprodcue += this.closedProductName + '*' + this.closedProdcueNumber
                         })
                     }
                     if (customerCommon.closedFittings != null && customerCommon.closedFittings.length > 0) {
-                        closeprodcueshow = true;
                         $.each(customerCommon.closedFittings,function(index,item){
                             closeprodcue += this.fittingName + '*' + this.closedFittingNumber
                         })
@@ -363,11 +365,33 @@
         switch (customerIsSolve) {
             case 1:result = isSolve.solved;break;
             case 2:result = isSolve.noSolved;break;
-            case 3:result = isSolve.renewed;break;
-            case 4:result = isSolve.maintain;break;
-            case 5:result = isSolve.reissue;break;
-            case 6:result = isSolve.backGoods;break;
-            case 7:result = isSolve.noReasonBack;break;
+            case 3:
+                result = isSolve.renewed;
+                $('#div_costomer').show();
+                sendprodcueshow = true;
+                closeprodcueshow = true;
+                break;
+            case 4:
+                result = isSolve.maintain;
+                $('#div_costomer').show();
+                sendprodcueshow = true;
+                closeprodcueshow = true;
+                break;
+            case 5:
+                result = isSolve.reissue;
+                $('#div_costomer').show();
+                sendprodcueshow = true;
+                break;
+            case 6:
+                result = isSolve.backGoods;
+                $('#div_costomer').show();
+                closeprodcueshow = true;
+                break;
+            case 7:
+                result = isSolve.noReasonBack;
+                $('#div_costomer').show();
+                closeprodcueshow = true;
+                break;
         }
         for(var i = 0;i < result.length;i++){
             var html = statusHtml.replace("status_index",i+1);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -16,7 +16,6 @@
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
-        .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
@@ -869,7 +868,7 @@
 
 
     <div class="mt-20">
-        <table class="table table-border table-bordered table-bg table-hover table-sort">
+        <table class="table table-border table-bg table-bordered">
         <thead>
         <tr class="text-c">
             <th width="50">跟进客服</th>
@@ -916,7 +915,7 @@
                             <td>
                                 ${customer.describeTitle!'暂无'}
                                     <#if customer.describeTitle??>
-                                        <a style="" href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
+                                        <a href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
                                             查看详情
                                         </a>&nbsp;
                                     </#if>
@@ -1227,51 +1226,24 @@
     }
 
     /**
-     * 查询回访内容
+     * 进入查询回访信息页面
+     */
+    function getDescribeInfo(customerId) {
+        layer_show("回访内容","${path}/admin/customer/_visit_info?customerId="+customerId,"800","500");
+    }
+
+    /**
+     * 进入查询回访信息页面
      */
     function getVisitInfo(customerId) {
-        $.ajax({
-            cache: true,
-            type: "POST",
-            data: {"customerId":customerId},
-            url: "${path}/admin/customer/get_visit_info",
-            async: false,
-            success: function(data){
-                if (data.returnCode == 200) {
-                    var visit = data.returnMsg.visit;
-                    $('#txtVisitCompleteDate').html(visit.visitCompleteDate);
-                    $('#txtVisitCompleteName').html(visit.visitCompleteName);
-                    $('#txtVisitCompleteTel').html(visit.visitCompleteTel);
-                    $('#txtVisitCompleteRemark').html(visit.visitCompleteRemark);
-                    $('#select-visit-finish').show();
-                }
-            },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-            }
-        })
+        layer_show("回访内容","${path}/admin/customer/_visit_info?customerId="+customerId,"800","500");
     }
 
     /**
-     * 查询问题描述信息
+     * 进入查询问题描述信息页面
      */
     function getDescribeInfo(customerId) {
-        $.ajax({
-            cache: true,
-            type: "POST",
-            data: {"customerId":customerId},
-            url: "${path}/admin/customer/get_describe_info",
-            async: false,
-            success: function(data){
-                if (data.returnCode == 200) {
-                    var describe = data.returnMsg.describe;
-                    $('#txtDescribeTitle').html(describe.describeTitle);
-                    $('#txtDescribeContent').html(describe.describeContent);
-                    $('#select-question-describe').show();
-                }
-            },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-            }
-        })
+        layer_show("问题描述","${path}/admin/customer/_question_describe?customerId="+customerId,"800","500");
     }
 
     /**

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/describe_detail.ftl

@@ -0,0 +1,76 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+    <link href="${path}/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+    <!--<link href="lib/icheck/icheck.css" rel="stylesheet" type="text/css" />-->
+    <link href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+    <!--<link href="lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css" />-->
+    <title></title>
+</head>
+<body>
+<article class="cl pd-20">
+    <form action="" method="post" class="form form-horizontal" id="form-article-add">
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2 text-r">
+                <strong>问题简述：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtDescribeTitle">
+
+            </div>
+
+        </div>
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2 text-r">
+                <strong>问题详情：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtDescribeContent">
+
+            </div>
+        </div>
+        <#--<div class="row cl">
+            <div class="formControls col-2 col-sm-2">
+
+            </div>
+            <div class="formControls col-10 col-sm-10">
+                <img src="images/image-1.jpg" />
+            </div>
+        </div>-->
+    </form>
+    </div>
+</article>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript">
+
+    var customerId = ${customerId!''};
+
+    $(function(){
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":customerId},
+            url: "${path}/admin/customer/get_describe_info",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var describe = data.returnMsg.describe;
+                    $('#txtDescribeTitle').html(describe.describeTitle);
+                    $('#txtDescribeContent').html(describe.describeContent);
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    });
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/visit_detail.ftl

@@ -0,0 +1,93 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/static/h-ui/css/H-ui.min.css" rel="stylesheet" type="text/css" />
+    <link href="${path}/common/static/h-ui.admin/css/H-ui.admin.css" rel="stylesheet" type="text/css" />
+    <!--<link href="lib/icheck/icheck.css" rel="stylesheet" type="text/css" />-->
+    <link href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
+    <!--<link href="lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css" />-->
+    <title></title>
+</head>
+<body>
+<article class="cl pd-20">
+    <form action="" method="post" class="form form-horizontal" id="form-article-add">
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2">
+                <strong>回访客服：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10">
+                王笑笑(杨继林指定)
+            </div>
+        </div>
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2">
+                <strong>回访日期：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtVisitCompleteDate">
+
+            </div>
+        </div>
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2">
+                <strong>回访客户：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtVisitCompleteName">
+
+            </div>
+        </div>
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2">
+                <strong>客户电话：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtVisitCompleteTel">
+
+            </div>
+        </div>
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2">
+                <strong>回访备注：</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10" id="txtVisitCompleteRemark">
+
+            </div>
+        </div>
+    </form>
+    </div>
+</article>
+<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript">
+
+    var customerId = ${customerId!''};
+
+    $(function(){
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":customerId},
+            url: "${path}/admin/customer/get_visit_info",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var visit = data.returnMsg.visit;
+                    $('#txtVisitCompleteDate').html(visit.visitCompleteDate);
+                    $('#txtVisitCompleteName').html(visit.visitCompleteName);
+                    $('#txtVisitCompleteTel').html(visit.visitCompleteTel);
+                    $('#txtVisitCompleteRemark').html(visit.visitCompleteRemark);
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    });
+</script>
+</body>
+</html>