Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

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

@@ -511,4 +511,12 @@ public class CustomerInfo  implements Serializable {
     public void setVisitDesignatedAdminId(Integer visitDesignatedAdminId) {
         this.visitDesignatedAdminId = visitDesignatedAdminId;
     }
+
+    public String getVisitDesignatedAdminName() {
+        return visitDesignatedAdminName;
+    }
+
+    public void setVisitDesignatedAdminName(String visitDesignatedAdminName) {
+        this.visitDesignatedAdminName = visitDesignatedAdminName;
+    }
 }

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

@@ -10,12 +10,12 @@ public class QuestionDescribe implements Serializable {
     private static final long serialVersionUID = -3855353499616091790L;
     //   问题描述id
     private Integer describeId;
-    //   描述  
+    //   描述 --> 问题回复
     private String describeContent;
     //   客诉主键  ,
     private Integer customerId;
 
-    //处理描述：用于新建客诉的时候的处理描述
+    //处理描述：用于新建客诉的时候的处理描述----> 客服备注 --> 问题描述
     private String describeHandleDesc;
 
     private String describeTitle;   //客诉标题

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

@@ -68,8 +68,10 @@
       v.visit_time_select,
       v.visit_complete_name,
       v.visit_complete_tel,
+      sa.admin_name AS  visitDesignatedAdminName,
       q.question_profile,
-      d.describe_handle_desc
+      d.describe_handle_desc,
+      d.describe_content
     from
       tb_rst_customer_info c
     LEFT JOIN tb_rst_question_describe d ON c.customer_id = d.customer_id
@@ -79,8 +81,9 @@
     LEFT JOIN tb_rst_complaint_type ct ON s.complaint_id = ct.complaint_id
     LEFT JOIN tb_rst_sales_company sc ON c.company_id = sc.company_id
     LEFT JOIN tb_rst_store_info si ON c.store_id = si.store_id
+    LEFT JOIN tb_rst_sys_admin a ON c.admin_id = a.admin_id
     LEFT JOIN tb_rst_visit v ON v.customer_id = c.customer_id
-    LEFT JOIN tb_rst_sys_admin a ON v.designated_admin_id = a.admin_id
+    LEFT JOIN tb_rst_sys_admin sa ON v.designated_admin_id = sa.admin_id
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
@@ -149,6 +152,7 @@
     <result column="visit_complete_tel" property="visitCompleteTel"/>
     <result column="question_profile" property="questionProfile"/>
     <result column="describe_handle_desc" property="describeHandleDesc"/>
+    <result column="describe_content" property="describeContent"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 

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

@@ -677,7 +677,8 @@
         toolbars: [tool],
         autoHeightEnabled: true,
         autoFloatEnabled: true,
-        elementPathEnabled : false  /*去掉元素路径*/
+        elementPathEnabled : false,  /*去掉元素路径*/
+        zIndex : 5
     });
     /*邮寄地址*/
     var sendAddressSms = UE.getEditor('sendAddressSms', {

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

@@ -87,13 +87,19 @@
             </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-5 col-sm-5">
                 <label id="questionProfile"></label>
             </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-5 col-sm-5">
+                <label id="describeContent"></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" style="margin-top: 2px;">
                 <label id="customerName"></label>
                 <label id="customerTel"></label>
@@ -125,7 +131,7 @@
                 </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>
@@ -180,7 +186,7 @@
             </div>
         </div>
 
-        <div class="row cl">
+        <div class="row cl" style="display: none">
             <label class="form-label col-1 col-sm-1">客服备注：</label>
             <div class="formControls col-7 col-sm-7" id="describeHandleDesc" style="border: 1px solid #ddd;">
             </div>
@@ -291,6 +297,7 @@
                     $('#typeName').html(customer.typeName);
                     $('#describeTitle').html(customer.describeTitle);
                     $('#questionProfile').html(customer.describeHandleDesc);
+                    $('#describeContent').html(customer.describeContent);
                     $('#customerName').html(customer.customerName);
                     $('#customerTel').html(customer.customerTel);
                     var txtcustomerIsSolve = '';
@@ -371,18 +378,18 @@
                             case 3:visitTime = '14:00-18:00';break;
                         }
                         var visitText = "";
-                        if(customer.visitStatus == 1){
-                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                        if(customer.visitStatus == 1 || customer.visitStatus == 2){
+                            visitText  += '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDesignatedAdminName)+'</span>)&nbsp;&nbsp;'+
                                     '需要在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
                                     '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitName)+'&nbsp;&nbsp;'+
-                                    convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访';
+                                    convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访<br>';
 
-                    }
+                        }
                         if(customer.visitStatus == 2){
-                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.adminName)+'</span>)&nbsp;&nbsp;'+
-                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
-                                    '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                            visitText += '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDesignatedAdminName)+'</span>)&nbsp;&nbsp;'+
+                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitCompleteDate)+
+                                    '&nbsp;&nbsp;</span>对&nbsp;&nbsp;<span class="txt-red">'+
                                     convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
                                     convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
                         }