修改bug文档bug

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

@@ -112,6 +112,8 @@
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
+        OR
+        c.customer_wechat_name like CONCAT('%',#{customerName},'%')
       </if>
       <if test="customerIsSolve != null">
         AND c.customer_is_solve = #{customerIsSolve}

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

@@ -131,7 +131,7 @@
                     </div>-->
                 </div>
             </div>
-            <div class="row cl" id="salesChannelsSelect" style="display: none">
+            <div class="row cl" id="salesChannelsSelect">
                 <input type="hidden" id="companyId" name="companyId" value="" >
                 <input type="hidden" id="storeId" name="storeId" value="" >
                 <label class="form-label col-1 col-sm-1">销售渠道：</label>

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

@@ -143,12 +143,7 @@
                                     </#if>
                                 </#if>
                             </td>
-
-                            <#if (customer.customerTel)?? && customer.customerTel?length gt 7>
-                                <td>${customer.customerTel?substring(0,3)}***${customer.customerTel?substring(customer.customerTel?length-4,customer.customerTel?length)}</td>
-                            <#else>
-                                <td>${customer.customerTel!''}</td>
-                            </#if>
+                            <td>${customer.customerTel!''}</td>
                             <td>
                                 <#if customer.customerSourceType == 1>
                                     400电话

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -483,7 +483,7 @@ function initProcessResult(type){
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
 
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 4: //维修
                 result = isSolve.maintain;
@@ -504,7 +504,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();//维修产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 5://补发
                 result = isSolve.reissue;
@@ -546,7 +546,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 7://无理由退货
                 result = isSolve.noReasonBack;
@@ -567,7 +567,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             default:
                 break;