修改了客诉详情页面

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerCommon.java

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * wxm 客诉处理公共类
@@ -65,6 +67,46 @@ public class CustomerCommon implements Serializable {
     private Date relationCreateTime;
     // 修改时间,
     private Date relationUpdateTime;
+    //售后寄出产品表
+    private List<SendProdcue> sendProdcues = new ArrayList<SendProdcue>();
+    //售后寄出产品配件表
+    private List<SendFitting> sendFittings = new ArrayList<SendFitting>();
+    //售后寄回产品表
+    private List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();
+    //售后寄回产品配件表
+    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();
+
+    public List<SendProdcue> getSendProdcues() {
+        return sendProdcues;
+    }
+
+    public void setSendProdcues(List<SendProdcue> sendProdcues) {
+        this.sendProdcues = sendProdcues;
+    }
+
+    public List<SendFitting> getSendFittings() {
+        return sendFittings;
+    }
+
+    public void setSendFittings(List<SendFitting> sendFittings) {
+        this.sendFittings = sendFittings;
+    }
+
+    public List<ClosedProdcue> getClosedProdcues() {
+        return closedProdcues;
+    }
+
+    public void setClosedProdcues(List<ClosedProdcue> closedProdcues) {
+        this.closedProdcues = closedProdcues;
+    }
+
+    public List<ClosedFitting> getClosedFittings() {
+        return closedFittings;
+    }
+
+    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+        this.closedFittings = closedFittings;
+    }
 
     public Integer getRelationId() {
         return relationId;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerInfo.java

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.cm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -48,6 +51,7 @@ public class CustomerInfo  implements Serializable {
 
     private String productName;         //客诉产品
     private String complaintClassName;  //客诉类型名称
+    private String questionProfile;     //问题回复
     private Integer complaintId;        //客诉类型id
     private String smallClassName;      //客诉小类名称
     private String describeTitle;       //客诉问题标题
@@ -61,7 +65,73 @@ public class CustomerInfo  implements Serializable {
     private Integer backStatus;         //寄回状态
     private Integer sendStatus;         //寄送状态
     private Integer visitStatus;        //回访状态
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date visitCompleteDate;     //回访完成时间
+    private String visitName;           //回访人姓名
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date visitDate;             //回访时间
+    private Integer visitTimeSelect;    //回访时间选择
+    private String visitCompleteName;   //回访联系人
+    private String visitCompleteTel;    //回访联系电话
+    private String describeHandleDesc;  //处理描述
+
+    public Date getVisitDate() {
+        return visitDate;
+    }
+
+    public void setVisitDate(Date visitDate) {
+        this.visitDate = visitDate;
+    }
+
+    public String getVisitName() {
+        return visitName;
+    }
+
+    public void setVisitName(String visitName) {
+        this.visitName = visitName;
+    }
+
+    public Integer getVisitTimeSelect() {
+        return visitTimeSelect;
+    }
+
+    public void setVisitTimeSelect(Integer visitTimeSelect) {
+        this.visitTimeSelect = visitTimeSelect;
+    }
+
+    public String getVisitCompleteName() {
+        return visitCompleteName;
+    }
+
+    public void setVisitCompleteName(String visitCompleteName) {
+        this.visitCompleteName = visitCompleteName;
+    }
+
+    public String getVisitCompleteTel() {
+        return visitCompleteTel;
+    }
+
+    public void setVisitCompleteTel(String visitCompleteTel) {
+        this.visitCompleteTel = visitCompleteTel;
+    }
+
+    public String getDescribeHandleDesc() {
+        return describeHandleDesc;
+    }
+
+    public void setDescribeHandleDesc(String describeHandleDesc) {
+        this.describeHandleDesc = describeHandleDesc;
+    }
+
+    public String getQuestionProfile() {
+        return questionProfile;
+    }
+
+    public void setQuestionProfile(String questionProfile) {
+        this.questionProfile = questionProfile;
+    }
 
     public Integer getVisitStatus() {
         return visitStatus;

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -36,6 +36,8 @@ public class SalesOrder implements Serializable {
     private Integer salesWaitMoney;         //待付金额
     private Integer salesLastMoney;         //本次支付金额
     private Integer salesShippingFee;       //邮费
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesPayTime;              //支付时间
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -7,6 +7,7 @@ import com.iamberry.rst.core.cm.Reissue;
 import com.iamberry.rst.core.page.PagedResult;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客诉基本信息
@@ -39,7 +40,7 @@ public interface CustomerService {
      * @param customerInfo
      * @return
      */
-    CustomerCommon getCustomerInfo(CustomerInfo customerInfo);
+    Map<String,Object> getCustomerInfo(CustomerInfo customerInfo);
 
     /**
      * 获取售后退货信息
@@ -54,4 +55,12 @@ public interface CustomerService {
      * @return
      */
     Reissue getReissue(Reissue reissue);
+
+    /**
+     * 查询寄回和寄出的产品和配件信息
+     * @param customerCommon
+     * @param isSolve
+     * @return
+     */
+    CustomerCommon selectProdcueAndFitting(CustomerCommon customerCommon, int isSolve);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -7,10 +7,13 @@ import com.iamberry.rst.core.pts.PtsSupplier;
 import com.iamberry.rst.faces.cm.CustomerService;
 import com.iamberry.rst.service.cm.mapper.*;
 import com.iamberry.rst.util.PageUtil;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -31,6 +34,14 @@ public class CustomerServiceImpl implements CustomerService {
     private ClosedFittingMapper closedFittingMapper;
     @Autowired
     private ClosedProdcueMapper closedProdcueMapper;
+    @Autowired
+    private SendProdcueMapper sendProdcueMapper;
+    @Autowired
+    private SendFittingMapper sendFittingMapper;
+    @Autowired
+    private SalesOrderMapper salesOrderMapper;
+    @Autowired
+    private CustomerService customerService;
 
     @Override
     public CustomerInfo getCustomerInfo(Integer customerId) {
@@ -120,7 +131,8 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
-    public CustomerCommon getCustomerInfo(CustomerInfo customerInfo) {
+    public Map<String,Object> getCustomerInfo(CustomerInfo customerInfo) {
+        Map<String,Object> map = new HashMap<String,Object>();
         CustomerCommon customerCommon = new CustomerCommon();
         //查询客诉列表
         List<CustomerInfo> customerList = customerInfoMapper.listCustomer(customerInfo);
@@ -128,42 +140,42 @@ public class CustomerServiceImpl implements CustomerService {
             return null;
         }
         CustomerInfo customer = customerList.get(0);
+        map.put("customer",customer);
+        int orderId = 0;
         switch (customer.getCustomerIsSolve().intValue()) {
             case 3://换新
-                //查询售后换新集合
                 Renewed renewedInfo = new Renewed();
                 renewedInfo.setRenewedState(1);
                 renewedInfo.setCustomerId(customerInfo.getCustomerId());
-                List<Renewed> renewedList = renewedMapper.listRenewed(renewedInfo);
-                if (renewedList == null || renewedList.size() == 0) {
-                    return null;
-                }
-                renewedInfo = renewedList.get(0);
+                //查询售后换新详情
+                renewedInfo = renewedMapper.getRenewedInfo(renewedInfo);
+                orderId = renewedInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(3,renewedInfo);
+                customerCommon = customerService.selectProdcueAndFitting(customerCommon,3);
                 break;
             case 4://维修
-                //查询售后维修集合
                 Repair repairInfo = new Repair();
                 repairInfo.setRepairState(1);
                 repairInfo.setCustomerId(customerInfo.getCustomerId());
-                List<Repair> repairList = repairMapper.listRepair(repairInfo);
-                if (repairList == null || repairList.size() == 0) {
-                    return null;
-                }
-                repairInfo = repairList.get(0);
+                //查询售后维修集合
+                repairInfo = repairMapper.getRepairInfo(repairInfo);
+                orderId = repairInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(4,repairInfo);
+                customerCommon = customerService.selectProdcueAndFitting(customerCommon,4);
                 break;
             case 5://补发
-                //查询售后补发集合
                 Reissue reissueInfo = new Reissue();
                 reissueInfo.setReissueState(1);
                 reissueInfo.setCustomerId(customerInfo.getCustomerId());
+                //查询售后补发集合
                 List<Reissue> reissueList = reissueMapper.listReissue(reissueInfo);
                 if (reissueList == null || reissueList.size() == 0) {
                     return null;
                 }
                 reissueInfo = reissueList.get(0);
+                orderId = reissueInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(5,reissueInfo);
+                customerCommon = customerService.selectProdcueAndFitting(customerCommon,5);
                 break;
             case 6://退货
                 //查询售后退货集合
@@ -175,7 +187,9 @@ public class CustomerServiceImpl implements CustomerService {
                     return null;
                 }
                 backGoodsInfo = backGoodsList.get(0);
+                orderId = backGoodsInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(6,backGoodsInfo);
+                customerCommon = customerService.selectProdcueAndFitting(customerCommon,6);
                 break;
             case 7://无理由退货
                 //查询售后无理由退货集合
@@ -187,9 +201,113 @@ public class CustomerServiceImpl implements CustomerService {
                     return null;
                 }
                 noreasonBackInfo = noreasonBackList.get(0);
+                orderId = noreasonBackInfo.getOrderId();
                 customerCommon = CustomerCommon.getCustomerCommon(7,noreasonBackInfo);
+                customerCommon = customerService.selectProdcueAndFitting(customerCommon,7);
+                break;
+        }
+        SalesOrder salesOrder = new SalesOrder();
+        salesOrder.setSalesId(orderId);
+        //查询订单信息
+        List<SalesOrder> orderList = salesOrderMapper.listSalesOrder(salesOrder);
+        if (orderList != null && orderList.size() > 0) {
+            SalesOrder order = orderList.get(0);
+            SalesOrderItem salesOrderItem = new SalesOrderItem();
+            salesOrderItem.setItemOrderId(order.getSalesId());
+            order.setSalesOrderItemList(salesOrderMapper.listSalesOrderItem(salesOrderItem));
+            map.put("salesOrder",order);
+        } else {
+            map.put("salesOrder",null);
+        }
+        map.put("customerCommon",customerCommon);
+        return map;
+    }
+
+    @Override
+    public CustomerCommon selectProdcueAndFitting(CustomerCommon customerCommon, int isSolve) {
+        if (customerCommon == null || customerCommon.getRelationId() == null) {
+            return customerCommon;
+        }
+        List<SendProdcue> sendProdcues = null;
+        List<SendFitting> sendFittings = null;
+        List<ClosedFitting> closedfittings = null;
+        List<ClosedProdcue> closedProdcues = null;
+        SendProdcue sendProdcue = new SendProdcue();
+        SendFitting sendFitting = new SendFitting();
+        ClosedFitting fitting = new ClosedFitting();
+        ClosedProdcue closedProdcue = new ClosedProdcue();
+        switch (isSolve) {
+            case 3://换新
+                sendProdcue.setRelationId(customerCommon.getRelationId());
+                sendProdcue.setSendProduceType(3);
+                //查询寄出产品集合
+                sendProdcues = sendProdcueMapper.listSendProdcue(sendProdcue);
+                sendFitting.setRelationId(customerCommon.getRelationId());
+                sendFitting.setSendFittingType(3);
+                //查询寄出配件集合
+                sendFittings = sendFittingMapper.listSendFitting(sendFitting);
+                fitting.setRelationId(customerCommon.getRelationId());
+                fitting.setClosedFittingType(3);
+                //查询寄回配件集合
+                closedfittings = closedFittingMapper.listClosedFitting(fitting);
+                closedProdcue.setRelationId(customerCommon.getRelationId());
+                closedProdcue.setClosedProdcueType(3);
+                //查询寄回产品集合
+                closedProdcues = closedProdcueMapper.listclosedProdcue(closedProdcue);
+                break;
+            case 4://维修
+                sendProdcue.setRelationId(customerCommon.getRelationId());
+                sendProdcue.setSendProduceType(4);
+                //查询寄出产品集合
+                sendProdcues = sendProdcueMapper.listSendProdcue(sendProdcue);
+                sendFitting.setRelationId(customerCommon.getRelationId());
+                sendFitting.setSendFittingType(4);
+                //查询寄出配件集合
+                sendFittings = sendFittingMapper.listSendFitting(sendFitting);
+                fitting.setRelationId(customerCommon.getRelationId());
+                fitting.setClosedFittingType(4);
+                //查询寄回配件集合
+                closedfittings = closedFittingMapper.listClosedFitting(fitting);
+                closedProdcue.setRelationId(customerCommon.getRelationId());
+                closedProdcue.setClosedProdcueType(4);
+                //查询寄回产品集合
+                closedProdcues = closedProdcueMapper.listclosedProdcue(closedProdcue);
+                break;
+            case 5://补发
+                sendProdcue.setRelationId(customerCommon.getRelationId());
+                sendProdcue.setSendProduceType(5);
+                //查询寄出产品集合
+                sendProdcues = sendProdcueMapper.listSendProdcue(sendProdcue);
+                sendFitting.setRelationId(customerCommon.getRelationId());
+                sendFitting.setSendFittingType(5);
+                //查询寄出配件集合
+                sendFittings = sendFittingMapper.listSendFitting(sendFitting);
+                break;
+            case 6://退货
+                fitting.setRelationId(customerCommon.getRelationId());
+                fitting.setClosedFittingType(6);
+                //查询寄回配件集合
+                closedfittings = closedFittingMapper.listClosedFitting(fitting);
+                closedProdcue.setRelationId(customerCommon.getRelationId());
+                closedProdcue.setClosedProdcueType(6);
+                //查询寄回产品集合
+                closedProdcues = closedProdcueMapper.listclosedProdcue(closedProdcue);
+                break;
+            case 7://无理由退货
+                fitting.setRelationId(customerCommon.getRelationId());
+                fitting.setClosedFittingType(7);
+                //查询寄回配件集合
+                closedfittings = closedFittingMapper.listClosedFitting(fitting);
+                closedProdcue.setRelationId(customerCommon.getRelationId());
+                closedProdcue.setClosedProdcueType(7);
+                //查询寄回产品集合
+                closedProdcues = closedProdcueMapper.listclosedProdcue(closedProdcue);
                 break;
         }
+        customerCommon.setClosedFittings(closedfittings);
+        customerCommon.setClosedProdcues(closedProdcues);
+        customerCommon.setSendProdcues(sendProdcues);
+        customerCommon.setSendFittings(sendFittings);
         return customerCommon;
     }
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -42,7 +42,7 @@
   <select id="listCustomer" parameterType="CustomerInfo" resultType="CustomerInfo">
     select
       c.customer_id customerId,
-      c.customer_source_type customerSourceType,
+      c.customer_counsel_type customerCounselType,
       a.admin_name adminName,
       c.customer_name customerName,
       c.customer_tel customerTel,
@@ -62,7 +62,14 @@
       c.customer_create_time customerCreateTime,
       v.visit_status visitStatus,
       v.visit_complete_date visitCompleteDate,
-      cd.detect_state detectState
+      v.visit_name visitName,
+      v.visit_date visitDate,
+      v.visit_time_select visitTimeSelect,
+      v.visit_complete_name visitCompleteName,
+      v.visit_complete_tel visitCompleteTel,
+      cd.detect_state detectState,
+      q.question_profile questionProfile,
+      d.describe_handle_desc describeHandleDesc
     from
       tb_rst_customer_info c
     LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
@@ -97,6 +104,9 @@
       <if test="adminId != null and adminId != ''">
         and c.admin_id = #{adminId}
       </if>
+      <if test="customerId != null and customerId != ''">
+        and c.customer_id = #{customerId}
+      </if>
     </where>
   </select>
 

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

@@ -28,6 +28,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by wxm
@@ -220,20 +221,37 @@ public class AdminCustomerController {
      * @return
      * @throws Exception
      */
+    @RequiresPermissions("customer:select:customer")
+    @RequestMapping("/_customer_info")
+    public ModelAndView toCustomerInfo(HttpServletRequest request) throws Exception {
+        ModelAndView mv = new ModelAndView("cm/customer/custome_detail");
+        String customerId = request.getParameter("customerId");
+        mv.addObject("customerId",customerId);
+        return mv;
+    }
+
+    /**
+     * 查询客诉基本信息
+     * @param request
+     * @return
+     * @throws Exception
+     */
     @ResponseBody
     @RequiresPermissions("customer:select:customer")
     @RequestMapping("/get_customer_info")
-    public ModelAndView getCustomerInfo(HttpServletRequest request) throws Exception {
-        ModelAndView mv = new ModelAndView("cm/customer/custome_detail");
+    public ResponseJson getCustomerInfo(HttpServletRequest request) throws Exception {
         String customerId = request.getParameter("customerId");
         if (!StringUtils.isNotEmpty(customerId)) {
-            return mv;
+            return new ResponseJson(500, "该客诉信息不存在!", 500);
         }
         CustomerInfo customerInfo = new CustomerInfo();
         customerInfo.setCustomerId(Integer.parseInt(customerId));
-        CustomerCommon customerCommon = customerService.getCustomerInfo(customerInfo);
-        mv.addObject("customerCommon",customerCommon);
-        return mv;
+        Map<String,Object> map = customerService.getCustomerInfo(customerInfo);
+        ResponseJson rj = new ResponseJson(200, "修改成功!", 200);
+        rj.addResponseKeyValue("customerCommon",map.get("customerCommon"));
+        rj.addResponseKeyValue("customer",map.get("customer"));
+        rj.addResponseKeyValue("salesOrder",map.get("salesOrder"));
+        return rj;
     }
 
     /**

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

@@ -6,17 +6,16 @@
     <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" />
-    <link href="css/H-ui.min.css" rel="stylesheet" type="text/css" />
-    <link href="css/H-ui.admin.css" rel="stylesheet" type="text/css" />
-    <link href="lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
-    <link href="lib/Hui-iconfont/1.0.1/iconfont.css" rel="stylesheet" type="text/css" />
-    <link href="lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css" />
+<#include "/base/add_base.ftl">
+    <link href="${path}/common/lib/jquery.ui/jquery-ui.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css"/>
+    <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css"/>
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
         .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
         #suggest, #suggest2 {width:200px}
         .gray {color:gray}
@@ -27,7 +26,7 @@
         .ac_results li a span {float:right}
         .ac_result_tip {border-bottom:1px dashed #666;padding:3px}
 
-        .select-box{background: url(images/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
         .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
         .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
         .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
@@ -45,7 +44,7 @@
         .time-line-list>li:first-child .arrow{display: none;}
         .table-bg th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
-        .my-search-input{padding-left: 30px;background: url(images/search.png) 6px center no-repeat;background-size: auto 60%; }
+        .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
     </style>
     <title>客诉基本信息</title>
 </head>
@@ -53,7 +52,6 @@
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-article-add">
         <div class="row cl">
-
             <label class="form-label col-3">
                 <div class="tit-2">客诉基本信息</div>
             </label>
@@ -62,146 +60,54 @@
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>跟进客服：</label>
-            <div class="formControls col-4 col-sm-4"> <span class="select-box">
-				<select name="" class="select">
-					<option value="0">薇薇</option>
-					<option value="1">薇薇</option>
-					<option value="11">薇薇</option>
-					<option value="12">薇薇</option>
-					<option value="13">薇薇</option>
-				</select>
-				</span>
+            <div class="formControls col-4 col-sm-4">
+				<label id="adminName"></label>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>来源入口：</label>
             <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="tel-1" name="sex" datatype="*" nullmsg="请选择来源入口！">
-                    <label for="tel-1">400电话</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-2" name="sex">
-                    <label for="tel-2">微信公众号</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-3" name="sex">
-                    <label for="tel-3">其他</label>
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" value="" placeholder="" id="" name="">
-                </div>
+                <label id="customerSourceType"></label>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>咨询类型：</label>
             <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="tel-3" name="tel" datatype="*" nullmsg="请选择来源入口！">
-                    <label for="tel-3">售前咨询</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-4" name="tel">
-                    <label for="tel-4">售后咨询</label>
-                </div>
+                <label id="customerCounselType"></label>
+            </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>产品类别：</label>
+            <div class="formControls col-10 col-sm-10 skin-minimal">
+                <label id="typeName"></label>
             </div>
         </div>
         <div class="row cl" style="position: relative;">
             <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客诉问题：</label>
-            <div class="formControls col-2 col-sm-2"> <span class="select-box">
-				<select name="" class="select">
-					<option value="0">使用操作</option>
-					<option value="1">使用操作</option>
-				</select>
-				</span>
-            </div>
-            <div class="formControls col-2 col-sm-2"> <span class="select-box">
-				<select name="" class="select">
-					<option value="0">使用操作制水出水</option>
-					<option value="1">使用操作制水出水</option>
-				</select>
-				</span>
-            </div>
-            <div class="formControls col-2 col-sm-2">
-                <div class="clearfix">
-                    <input type="text" placeholder="搜索关键词" class="input-text  ac_input" name="search_text" value="" id="search_text" autocomplete="off" style="width:60%"><button type="button" class="btn btn-primary" id="search_button">搜索</button>
-                </div>
-            </div>
-
-            <div class="dalog-ask">
-                <div class="tag">
-                    <em></em>
-                    <strong>相关QA</strong>
-                    <ul>
-                        <li class="ask">1、净水机面板操作不灵敏，是怎么回事？</li>
-                        <li class="answer">答：<span>1净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                        <li class="ask">2、净水机面板操作不灵敏，是怎么回事？</li>
-                        <li class="answer">答：<span>2净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                        <li class="ask">3、净水机面板操作不灵敏，是怎么回事？</li>
-                        <li class="answer">答：<span>3净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                        <li class="ask">4、净水机面板操作不灵敏，是怎么回事？</li>
-                        <li class="answer">答：<span>4净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                    </ul>
-                </div>
-            </div>
-
+            <label id="describeTitle"></label>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题内容：</label>
+            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>回复内容：</label>
             <div class="formControls col-5 col-sm-5">
-                <textarea name="" cols="" rows="2" class="textarea" placeholder="说点什么..." id="answer-textarea"></textarea>
+                <label id="questionProfile"></label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="" placeholder="请输入手机号" id="" name="">
-            </div>
+            <label class="form-label col-1 col-sm-1">用户信息:</label>
             <div class="formControls col-2 col-sm-2">
-                <input type="button" class="btn btn-primary" value="发短信給用户">
+                <label id="customerName"></label>
+                <label id="customerTel"></label>
             </div>
         </div>
         <div class="row cl">
-
             <label class="form-label col-1 col-sm-1">
-                <div class="tit">处理结果</div>
+                <div class="tit">处理结果<label id="customerIsSolve"></label></div>
             </label>
             <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 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">已解决</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">未解决</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">换新</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">维修</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">补发</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">退货</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">无理由退货</label>
-                </div>
-            </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><span class="arrow"></span><div class="number">1</div><div>录入客诉</div></li>
@@ -215,213 +121,62 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>订单信息：</label>
-            <div class="formControls col-1 col-sm-1">
-                <button type="button" class="btn btn-primary">搜索订单</button>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
+            <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>
+                        <th>销售</th>
+                        <th>订单号</th>
+                        <th>姓名</th>
+                        <th>电话</th>
+                        <th>订单金额</th>
+                        <th>购买产品</th>
+                        <th>购买日期</th>
                     </tr>
                     <tr>
-                        <td>爱贝源-微信商城</td><td>1290387806</td><td>何小小</td><td>1882222888</td><td>¥3680</td><td>Watero净水机</td><td>2017-06-06</td>
+                        <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">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收件信息：</label>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="何秀刚" placeholder="填写收件人姓名" id="" name="">
-            </div>
+            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回产品：</label>
             <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="13800138000" placeholder="填写收件人手机号" id="" name="">
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-4 col-sm-4">
-                <div id="province"></div>
-            </div>
-            <div class="formControls col-1 col-sm-1">
-                <button type="button" class="btn btn-primary">修改收货地址</button>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-5 col-sm-5">
-                <textarea name="" cols="" rows="2" class="textarea" placeholder="请填写详细地址">莲花街道深南大道特区报业大厦12b</textarea>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>换新产品：</label>
-            <div class="formControls col-10 col-sm-10">
-                <div class="skin-minimal">
-                    <div class="check-box">
-                        <input type="checkbox" id="checkbox-1" checked>
-                        <label for="checkbox-1">净水机</label>
-                        <select name="" class="select" style="width: 100px;">
-                            <option value="0">WX-12</option>
-                            <option value="1">WX-13</option>
-                        </select>
-
-
-                        <select name="" class="select" style="width: 100px;">
-                            <option value="0">黑色</option>
-                            <option value="1">白色</option>
-                        </select>
-                        <input type="text" class="input-text" style="width: 40px;text-align: center;" value="1" placeholder="" id="" name="">
-                    </div>
-
-
-                    <div class="check-box">
-                        <input type="checkbox" id="checkbox-2" checked>
-                        <label for="checkbox-2">水箱</label>
-                        <input type="text" class="input-text" style="width: 40px;text-align: center;" value="1" placeholder="" id="" name="">
-                    </div>
-                    <div class="check-box">
-                        <input type="checkbox" id="checkbox-3" checked>
-                        <label for="checkbox-2">T1</label>
-                        <input type="text" class="input-text" style="width: 40px;text-align: center;" value="1" placeholder="" id="" name="">
-                    </div>
-                    <div class="check-box">
-                        <input type="checkbox" id="checkbox-4" checked>
-                        <label for="checkbox-2">T2</label>
-                        <input type="text" class="input-text" style="width: 40px;text-align: center;" value="1" placeholder="" id="" name="">
-                    </div>
-                </div>
+                <label id="closeprodcue"></label>
+                <!--TDS收集-->
+                <label id="customerTDS"></label>
             </div>
-        </div>
 
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>TDS收集：</label>
-            <div class="formControls col-2 col-sm-2" style="position: relative;">
-                <input type="hidden" name="arrcity_3word" id="arrcity_3word" value="" />
-                <input style="width: 140px;" placeholder="" class="input-text my-search-input" type="text" name="arrcity" id="arrcity" />
-                <div id="suggest" class="ac_results"></div>
-            </div>
-            <div class="formControls col-2 col-sm-2">
-				<span class="select-box">
-				<select name="" class="select">
-					<option value="0">罗湖区</option>
-					<option value="1">福田区</option>
-				</select>
-				</span>
-            </div>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="" placeholder="进水tds数值" id="" name="">
-            </div>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="" placeholder="出水tds数值" id="" name="">
-            </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-6 col-sm-6">
-                tds收集：广东省-深圳市-福田区   进水：100ppm   出水：100ppm
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
-            <div class="formControls col-5 col-sm-5">
-				<textarea name="" cols="" rows="2" class="textarea" placeholder="说点什么...">邮寄地址：东莞清溪三中金龙工业区徐福记对面优尼雅电子科技，杨春有，13592708169邮寄备注：您好，麻烦您那边把机器邮寄前请将水箱、接水台中的水倒掉并擦干，不要留有水渍，避免运输途中水或奶粉
-溅入机器内部造成不必要的损失；用原包装或泡沫等材质包裹好机身。避免运输途中造成机器     磕碰、损坏。
-请勿寄顺丰、圆通、EMS以及到付件快递，其他快递物流随意，寄回时，麻烦您在产品里面留下故障原因说明，
-提示：寄回后把单号给我们提供下然后提供下您的姓名、地址和电话方便我们修好后给您寄回去。</textarea>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
+            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收货地址：</label>
             <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="" placeholder="请输入手机号" id="" name="">
-            </div>
-            <div class="formControls col-2 col-sm-2">
-                <input type="button" class="btn btn-primary" value="发短信給用户">
+                <label id="relationSendMergeAddress"></label>
             </div>
+
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-7 col-sm-7">
-                <div class="update-parts">更换：<span>红色净水机（wx-1）x 1台</span><span>水箱 x 1件</span><span>t1 x 1件</span><span>t2 x 1件</span></div>
+            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄送产品：</label>
+            <div class="formControls col-10 col-sm-10">
+                <label id="sendprodcue"></label>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>处理描述：</label>
             <div class="formControls col-5 col-sm-5">
-                <textarea name="" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
+                <textarea id="describeHandleDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
             </div>
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>回访信息：</label>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">需要回访</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">不需要回访</label>
-                </div>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>回访人信息：</label>
             <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="" placeholder="填写回访人姓名" id="" name="">
-            </div>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" class="input-text" value="" placeholder="填写回访人手机号" id="" name="">
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>回访日期：</label>
-            <div class="formControls col-2 col-sm-2">
-                <input type="text" placeholder="请选择回访日期" id="datemin" class="input-text Wdate" readonly="readonly">
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>回访时间：</label>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">09:00-12:00</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">12:00-14:00</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="a-7" name="bbb">
-                    <label for="a-7">14:00-18:00</label>
-                </div>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>提醒人：</label>
-            <div class="formControls col-4 col-sm-4"> <span class="select-box">
-				<select name="" class="select">
-					<option value="0">薇薇</option>
-					<option value="1">薇薇</option>
-					<option value="11">薇薇</option>
-					<option value="12">薇薇</option>
-					<option value="13">薇薇</option>
-				</select>
-				</span>
-            </div>
-        </div>
-        <div class="cl"  style="display: table;width: 100%;">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-4 col-sm-4">
-                <span class="c-red">您将为自己指定一个回访任务</span>
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="col-2 col-sm-2 col-offset-3">
-                <button onClick="save_submit();" class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
+                <label id="txtVisit"></label>
             </div>
         </div>
     </form>
@@ -433,8 +188,11 @@
 <script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
 <script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
 <script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
-<#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.parse.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
 <script type="text/javascript">
     $(function(){
         $('.skin-minimal input').iCheck({
@@ -450,12 +208,125 @@
         });
         $("#arrcity").suggest(citys,{hot_list:commoncitys,dataContainer:'#arrcity_3word',onSelect:function(result){
             console.log($(this)[0].value);
-//		$("#city2").click()
+        //		$("#city2").click()
         },
             attachObject:'#suggest'
         });
-//$("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
+        //$("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
+        getCustomerInfo();
     });
+
+    /**
+     * 查询客诉基本信息
+     */
+    function getCustomerInfo() {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":${customerId!''}},
+            url: "${path}/admin/customer/get_customer_info",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    console.log(data.returnMsg);
+                    var customer = data.returnMsg.customer;
+                    var customerCommon = data.returnMsg.customerCommon;
+                    var salesOrder = data.returnMsg.salesOrder;
+                    $('#adminName').html(customer.adminName);
+                    var customerSource = '';
+                    switch (customer.customerSourceType) {
+                        case 1:customerSource = '400电话';break;
+                        case 2:customerSource = '微信公众号';break;
+                        case 3:customerSource = customer.customerSource;break;
+                    }
+                    $('#customerSourceType').html(customerSource);
+                    var customerCounsel = '';
+                    switch (customer.customerCounselType) {
+                        case 1:customerCounsel = '售前咨询';break;
+                        case 2:customerCounsel = '售后咨询';break;
+                        case 3:customerCounsel = '其他';break;
+                    }
+                    $('#customerCounselType').html(customerCounsel);
+                    $('#typeName').html(customer.typeName);
+                    $('#describeTitle').html(customer.describeTitle);
+                    $('#questionProfile').html(customer.questionProfile);
+                    $('#customerName').html(customer.customerName);
+                    $('#customerTel').html(customer.customerTel);
+                    var txtcustomerIsSolve = '';
+                    switch (customer.customerIsSolve) {
+                        case 1:txtcustomerIsSolve = '已解决';break;
+                        case 2:txtcustomerIsSolve = '未解决';break;
+                        case 3:txtcustomerIsSolve = '换新';break;
+                        case 4:txtcustomerIsSolve = '维修';break;
+                        case 5:txtcustomerIsSolve = '补发';break;
+                        case 6:txtcustomerIsSolve = '退货';break;
+                        case 7:txtcustomerIsSolve = '无理由退货';break;
+                    }
+                    $('#customerIsSolve').html(txtcustomerIsSolve);
+                    $('#companyName').html(customer.companyName+"-"+customer.storeName);
+                    $('#salesOrderId').html(salesOrder.salesOrderId);
+                    $('#salesAddressName').html(salesOrder.salesAddressName);
+                    $('#salesAddressTel').html(salesOrder.salesAddressTel);
+                    $('#salesPayMoney').html('¥'+salesOrder.salesPayMoney/100);
+                    var salesItem = '';
+                    $.each(salesOrder.salesOrderItemList,function(index,item){
+                        salesItem = this.itemProductName + '*' + this.itemNum
+                    })
+                    $('#salesItem').html(salesItem);
+                    $('#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
+                        })
+                    }
+                    $('#sendprodcue').html(sendprodcue);
+                    $('#closeprodcue').html(closeprodcue);
+                    $('#customerTDS').html(customerCommon.relationSendMergeAddress+",进水"+
+                            customer.customerInTDS+"ppm"+",出水"+customer.customerOutTDS+"ppm");
+
+                    if (customer.customerIsVisit == '2') {
+                        var visitTime = '';
+                        switch (customer.visitTimeSelect) {
+                            case 1:visitTime = '9:00-12:00';break;
+                            case 2:visitTime = '12:00-14:00';break;
+                            case 3:visitTime = '14:00-18:00';break;
+                        }
+                        $('#txtVisit').html("("+customer.visitName+")"+"在"+customer.visitDate+
+                                " "+visitTime+"对"+customer.visitCompleteName+" "+
+                                customer.visitCompleteTel+" 完成回访");
+                    }
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
     $(document).on('click', '#search_button', function() {
         $(".dalog-ask").show();
     });

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

@@ -951,7 +951,7 @@
                                         <i class="Hui-iconfont">已解决</i>
                                     </a>&nbsp;
                                 </#if>
-                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_update_customer(${customer.customerId!''})">
+                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${customer.customerId!''})">
                                     <i class="Hui-iconfont">详情</i>
                                 </a>&nbsp;
                                 <#if customer.customerIsVisit == "2">
@@ -1016,7 +1016,7 @@
      * @param employee
      */
     function admin_details_customer(customerId) {
-        window.location.href= "${path}/admin/customer/to_details_customer?customerId="+customerId;
+        window.location.href= "${path}/admin/customer/_customer_info?customerId="+customerId;
     }
 
     function showVisitFinish(customerId) {
@@ -1069,7 +1069,6 @@
      */
     function addVisitInfo() {
         checkValue();
-        alert(flag);
         if (flag) {
             $.ajax({
                 cache: true,