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

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

@@ -33,6 +33,8 @@ public class ComplaintDetectItem implements Serializable {
     private Integer productTypeId;//产品类型id
     private String productTypeName;//产品类型名称
     private String questionTitle;//问题标题
+    private String colorName;//产品颜色名称
+    private String productName;//产品名称
 
     public Integer getDetectItemId() {
         return detectItemId;
@@ -225,4 +227,20 @@ public class ComplaintDetectItem implements Serializable {
     public void setProductColorId(Integer productColorId) {
         this.productColorId = productColorId;
     }
+
+    public String getColorName() {
+        return colorName;
+    }
+
+    public void setColorName(String colorName) {
+        this.colorName = colorName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
 }

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

@@ -68,12 +68,14 @@
     cd.detect_item_create_time detectItemCreateTime,
     cd.detect_item_update_time detectItemUpdateTime,
     qd.describe_title questionTitle,
-    pi.product_name productTypeName,
-    pt.type_name productTypeName
+    pi.product_name productName,
+    pt.type_name productTypeName,
+    ci.color_name colorName
     from tb_rst_complaint_detect_item cd
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
+    LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
     <where>
       <if test="productTypeId != null" >
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}

watero-rst-web/pom.xml

@@ -126,6 +126,10 @@
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
+                    <compilerArguments>
+                        <verbose />
+                        <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>
+                    </compilerArguments>
                 </configuration>
             </plugin>
         </plugins>

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.order.EOrderRequestData;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.sun.org.apache.xml.internal.security.utils.Base64;
 
+
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;

watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java

@@ -1,70 +0,0 @@
-package com.iamberry.rst.utils;
-import com.alibaba.dubbo.common.json.JSON;
-
-import com.auth0.jwt.internal.org.apache.commons.codec.binary.Base64;
-import com.auth0.jwt.internal.org.apache.commons.codec.binary.StringUtils;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-//import org.apache.kafka.clients.consumer.ConsumerRecord;
-//import org.apache.kafka.clients.consumer.ConsumerRecord;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.security.Key;
-import java.util.Map;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
-import java.security.Key;
-
-
-public class test {
-    private static final String AES = "AES";
-
-    public static String decrypt(String encryptedData, String secretKey) throws Exception {
-        Key key = new SecretKeySpec(secretKey.getBytes(), AES);
-        Cipher c = Cipher.getInstance(AES);
-        c.init(2, key);
-        byte[] decodedValue = Base64.decodeBase64(encryptedData);
-        byte[] decValue = c.doFinal(decodedValue);
-        String decryptedValue = StringUtils.newStringUtf8(decValue);
-        return decryptedValue;
-    }
-
-
-    /*public static void main(String[] args) throws Exception {
-        ConsumerRecord<String, String> record = new ConsumerRecord<String, String>("4", 1, 1, "data", "{\"data\":\"7uiBfrOFcdy/EDWxcT6SlQgcMKSMSMuoqvsehLBoghAHxfaWrU9wkHCARR3wuaMwHOKWzrv5DHEfJNt9/QrlfTk6VcHGwiPGycwiPvDkoTe4eJOW8Qqwm/1H4nNX+1Ed/CTueaJe3E/BNsFxe7rF+n32z8r2qDMY9IAHCARuYJRgWKSV9GygcuObQZ+gpq6uCTCNBf4XIxuHSB/BGVZpATEykU1vILnX89GzoJlV+10=\"}");
-        String appKey = "5kkyurvvtt58bbuxueee";//填APP KEY
-        String secretKey = "rhj6na6u3y6uhy6qrbb3944mg5uqqpbb";//APP SECRET
-        String data = decrypt(JSONObject.fromObject(record.value()).getString("data"),
-                secretKey.substring(8, 24));//解析后的真正数据
-
-        JSONObject jasonObject = JSONObject.fromObject(data);
-
-        System.out.println(jasonObject);
-
-        if(jasonObject.has("dps")){
-            JSONArray dps = jasonObject.getJSONArray("dps");
-            boolean flog = false;
-            for(int i = 0; i < dps.size(); i++){
-                Map maps = (Map) JSON.parse(dps.getString(i));
-                    for (Object obj : maps.keySet()){
-                    if(obj.equals("DEVECE_CONTROL_MILK")){
-                        String milkPowder = maps.get(obj).toString();
-                        flog = true;//如果数据中包含当前字段，表示当前推送的数据为奶粉记录
-                    }
-                    if(obj.equals("t")){
-                        Long milkTime = (Long)maps.get((obj));
-                    }
-                }
-            }
-            if(flog){
-                // 根据机器ID 获取对应的用户id
-                String devId = jasonObject.getString("devId");
-
-                flog = false;
-            }
-        }
-    }*/
-}

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

@@ -203,7 +203,7 @@
             <input type="hidden" value="" id="customerLastId" name="customerLastId">
             <input type="hidden" value="" id="customerInitialId" name="customerInitialId">
             <div class="row cl">
-                <div class="formControls col-9 col-sm-9 text-c" style="display:none;" id="onCustomerTable">
+                <div class="formControls col-9 col-sm-9 text-c" style="display:none;margin-left: 50px;" id="onCustomerTable">
                     <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c">
@@ -307,7 +307,6 @@
                 <div class="formControls col-9 col-sm-9">
                     <input type="hidden" name="questionId" id="questionId" value="">
                     <script id="describeContentText" type="text/plain" style="width:100%;height:250px;"></script>
-                    </script>
                     <input type="hidden" name="describeContent" id="describeContent" value="">
                 </div>
             </div>
@@ -318,7 +317,6 @@
                 <div class="formControls col-9 col-sm-9">
                     <span>问题描述详情，内部使用，不会对外公布。</span>
                     <script id="describeHandleDescText" type="text/plain" style="width:100%;height:250px;"></script>
-                    </script>
                     <input type="hidden" id="describeHandleDesc" name="describeHandleDesc">
                 </div>
             </div>
@@ -513,7 +511,7 @@
                     <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="">
                   </div>
             </div>
-            <div class="row cl">
+            <div class="row cl"  id="sendInformationTitle">
                  <label class="form-label col-1 col-sm-1">
                      <div class="tit-2">寄回信息</div>
                  </label>
@@ -575,22 +573,21 @@
            </div>
           <div class="row cl" >
              <label class="form-label col-1 col-sm-1"></label>
-             <div class="formControls col-1 col-sm-1">
-                 <input type="text" class="input-text" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
+             <div class="formControls col-2 col-sm-2">
+                 <input type="text" class="input-text" style="width: 156px;" value="" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                  </div>
                   <div class="formControls col-1 col-sm-1">
-                    <input type="text" class="input-text" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
+                    <input type="text" class="input-text" style="width: 156px;" value="" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                  </div>
 
            </div>
              <div class="row cl" id="TDScollectShow" style="display: none;">
-                  <label class="form-label col-1 col-sm-1"></label>
+                  <!--<label class="form-label col-1 col-sm-1"></label>
                   <div class="formControls col-6 col-sm-6">
                     <span id="DTS-address"></span>
                       &nbsp;&nbsp;&nbsp;&nbsp;<span id="DTS-in"></span>&nbsp;&nbsp;  <span id="DTS-out"></span>
-                  </div>
+                  </div>-->
               </div>
-
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">
                     <div class="tit-2">备注信息</div>
@@ -605,7 +602,7 @@
                  </div>
               </div>
             <div class="row cl" id="updateProduct" style="display: none;">
-                <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-9 col-sm-9" >
 
                     <table class="table table-border table-bg table-bordered">
@@ -679,82 +676,82 @@
             </div>
 
             <div class="row cl" style="display: none;">
-                <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="customer-visit-1" name="customerIsVisit" value="2" >
-                        <label for="customer-visit-1">需要回访</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="customer-visit-2" name="customerIsVisit"  value="1" checked>
-                        <label for="customer-visit-2">不需要回访</label>
-                    </div>
-                </div>
-            </div>
-
-            <div id="needToVisit" style="display: none;">
-                <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 trim_input" value="" placeholder="填写回访人姓名" id="" name="visitName"  datatype="*1-16" errormsg="回访人姓名格式不正确！" >
-                    </div>
-                    <div class="formControls col-2 col-sm-2">
-                        <input type="text" class="input-text associated-phone" value="" placeholder="填写回访人手机号" id="" name="visitTel"  ignore="ignore" errormsg="回访人手机号码格式不正确！">
-                    </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"  name="visitDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  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="visit-time-1" name="visitTimeSelect" value="1" checked>
-                            <label for="visit-time-1">09:00-12:00</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="visit-time-2" name="visitTimeSelect" value="2">
-                            <label for="visit-time-2">12:00-14:00</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="visit-time-3" name="visitTimeSelect" value="3">
-                            <label for="visit-time-3">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 class="select" id="visitAdminId" name="visitAdminId">
-
-                    </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" id="visitAdminIdMsg">您将为自己指定一个回访任务</span>
-                    </div>
-                </div>
-            </div>
-            <div class="row cl">
-                <div class="col-2 col-sm-2 col-offset-3">
-                    <button class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
-                </div>
-            </div>
-        </form>
-    </div>
-</article>
+                            <#-- <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="customer-visit-1" name="customerIsVisit" value="2" >
+                                     <label for="customer-visit-1">需要回访</label>
+                                 </div>
+                                 <div class="radio-box">
+                                     <input type="radio" id="customer-visit-2" name="customerIsVisit"  value="1" checked>
+                                     <label for="customer-visit-2">不需要回访</label>
+                                 </div>
+                             </div>-->
+                         </div>
+
+                         <div id="needToVisit" style="display: none;">
+                             <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 trim_input" value="" placeholder="填写回访人姓名" id="" name="visitName"  datatype="*1-16" errormsg="回访人姓名格式不正确！" >
+                                 </div>
+                                 <div class="formControls col-2 col-sm-2">
+                                     <input type="text" class="input-text associated-phone" value="" placeholder="填写回访人手机号" id="" name="visitTel"  ignore="ignore" errormsg="回访人手机号码格式不正确！">
+                                 </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"  name="visitDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  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="visit-time-1" name="visitTimeSelect" value="1" checked>
+                                         <label for="visit-time-1">09:00-12:00</label>
+                                     </div>
+                                     <div class="radio-box">
+                                         <input type="radio" id="visit-time-2" name="visitTimeSelect" value="2">
+                                         <label for="visit-time-2">12:00-14:00</label>
+                                     </div>
+                                     <div class="radio-box">
+                                         <input type="radio" id="visit-time-3" name="visitTimeSelect" value="3">
+                                         <label for="visit-time-3">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 class="select" id="visitAdminId" name="visitAdminId">
+
+                                 </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" id="visitAdminIdMsg">您将为自己指定一个回访任务</span>
+                                 </div>
+                             </div>
+                         </div>
+                         <div class="row cl">
+                             <div class="col-2 col-sm-2 col-offset-3">
+                                 <button class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
+                             </div>
+                         </div>
+                     </form>
+                 </div>
+             </article>
 
-<script type="text/javascript">
-    var url_path = "${path}";
-</script>
+             <script type="text/javascript">
+                 var url_path = "${path}";
+             </script>
 
-<#--时间控件-->
+             <#--时间控件-->
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 
 <script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>

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

@@ -65,17 +65,17 @@
             <thead>
             <tr>
                 <th width="10">跟进客服：</th>
-                <th width="10" style="font-weight: normal;"><span id="adminName"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="adminName"></span></td>
+                <td width="10"></td>
                 <th width="10">来源入口：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerSourceType"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="customerSourceType"></span></td>
             </tr>
             <tr>
                 <th width="10">咨询类型：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerCounselType"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="customerCounselType"></span></td>
+                <td width="10"></td>
                 <th width="10">产品类别：</th>
-                <th width="10" style="font-weight: normal;"><span id="typeName"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="typeName"></span></td>
             </tr>
             </thead>
         </table>
@@ -91,24 +91,24 @@
             <thead>
             <tr>
                 <th width="10">销售公司：</th>
-                <th width="10" style="font-weight: normal;"><span id="companyName"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="companyName"></span></td>
+                <td width="10"></td>
                 <th width="10">店铺：</th>
-                <th width="10" style="font-weight: normal;"><span id="storeName"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="storeName"></span></td>
             </tr>
             <tr>
                 <th width="10">微信昵称：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerWechatName"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="customerWechatName"></span></td>
+                <td width="10"></td>
                 <th width="10">用户姓名：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerName"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="customerName"></span></td>
             </tr>
             <tr>
                 <th width="10">用户电话：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerTel"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="customerTel"></span></td>
+                <td width="10"></td>
                 <th width="10"></th>
-                <th width="10" style="font-weight: normal;"><span></span></th>
+                <td width="10" style="font-weight: normal;"><span></span></td>
             </tr>
             </thead>
         </table>
@@ -123,17 +123,17 @@
             <thead>
             <tr>
                 <th width="10">客诉问题：</th>
-                <th width="10" style="font-weight: normal;"><span id="describeTitle"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="describeTitle"></span></td>
+                <td width="10"></td>
                 <th width="10">问题描述：</th>
-                <th width="10" style="font-weight: normal;"><span id="questionProfile"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="questionProfile"></span></td>
             </tr>
             <tr>
                 <th width="10">问题回复：</th>
-                <th width="10" style="font-weight: normal;"><span id="describeContent"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="describeContent"></span></td>
+                <td width="10"></td>
                 <th width="10">备注信息：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerDesc"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="customerDesc"></span></td>
             </tr>
             </thead>
         </table>
@@ -202,24 +202,24 @@
             <thead>
             <tr>
                 <th width="10">寄回产品：</th>
-                <th width="10" style="font-weight: normal;"><span id="closeprodcue"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="closeprodcue"></span></td>
+                <td width="10"></td>
                 <th width="10">寄送产品：</th>
-                <th width="10" style="font-weight: normal;"><span id="sendprodcue"></span></th>
+                <td width="10" style="font-weight: normal;"><span id="sendprodcue"></span></td>
             </tr>
             <tr>
                 <th width="10">TDS收集：</th>
-                <th width="10" style="font-weight: normal;"><span id="customerTDS"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="customerTDS"></span></td>
+                <td width="10"></td>
                 <th width="10">收货地址：</th>
-                <th width="10" style="font-weight: normal;"><div id="sendMergeAddressDiv"><span id="relationSendMergeAddress"></span></div></th>
+                <td width="10" style="font-weight: normal;"><div id="sendMergeAddressDiv"><span id="relationSendMergeAddress"></span></div></td>
             </tr>
             <tr>
                 <th width="10">客服备注：</th>
-                <th width="10" style="font-weight: normal;"><span id="describeHandleDesc"></span></th>
-                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span id="describeHandleDesc"></span></td>
+                <td width="10"></td>
                 <th width="10"></th>
-                <th width="10" style="font-weight: normal;"></th>
+                <td width="10" style="font-weight: normal;"></td>
             </tr>
             </thead>
         </table>

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

@@ -14,7 +14,7 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.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-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px; -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;}
         .table-bg thead th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
@@ -43,12 +43,12 @@
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
-            <input type="text" style="width:120px;height:36px;margin-right: 0px;margin-bottom: 10px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
-            <input type="text" style="width:120px;height:36px;margin-right: 0px;margin-bottom: 10px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/><br>
+            <input type="text" class="my-input trim_input" style="width:120px;margin-right: 0px; margin-bottom: 10px;" name="startTime" id="startTime"  placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
+            <input type="text" class="my-input trim_input" style="width:120px;margin-right: 0px; margin-bottom: 10px;" name="endTime" id="endTime"  placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/><br>
 
             <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
 
-            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="margin-left: 50px;height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value="">处理结果</option>
                 <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
                 <option value="2" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 2 >selected="selected"</#if></#if>>未解决</option>
@@ -59,14 +59,14 @@
                 <option value="7" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 7 >selected="selected"</#if></#if>>无理由退货</option>
             </select>
 
-            <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+            <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">来源</option>
                 <option value="1" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 1 >selected="selected"</#if></#if>>400电话</option>
                 <option value="2" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 2 >selected="selected"</#if></#if>>微信公众号</option>
                 <option value="3" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 3 >selected="selected"</#if></#if>>其他</option>
             </select>
 
-            <select class="my-select" name="typeId" id="typeId" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+            <select class="my-select" name="typeId" id="typeId" style="height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value ="">产品类型</option>
                 <#if typeList?? &&  (typeList?size > 0) >
                     <#list typeList as type>
@@ -82,7 +82,7 @@
                 <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
             </select>-->
 
-            <select class="my-select" name="adminId" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+            <select class="my-select" name="adminId" style="height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value ="">全部跟进客服</option>
                 <#if adminList?? &&  (adminList?size > 0) >
                     <#list adminList as admin>
@@ -100,7 +100,7 @@
                 </#if>
             </select>-->
 
-            <select class="my-select" name="complaintId" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+            <select class="my-select" name="complaintId" style="height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value ="">全部问题大类</option>
                 <#if complaintTypeList?? &&  (complaintTypeList?size > 0) >
                     <#list complaintTypeList as complaint>
@@ -109,7 +109,7 @@
                 </#if>
             </select>
 
-            <select class="my-select" name="smallClassId" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+            <select class="my-select" name="smallClassId" style="height: 36px;width: 132px;padding: 12px 10px 6px 15px;">
                 <option value ="">全部问题小类</option>
                 <#if complaintSmallClassInfoList?? &&  (complaintSmallClassInfoList?size > 0) >
                     <#list complaintSmallClassInfoList as smallClass>
@@ -117,7 +117,7 @@
                     </#list>
                 </#if>
             </select>
-            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px; id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+            <button type="submit" class="btn" style="background: #32a3d8;color: #fff;height: 35px;margin-top: -8px;"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>
 
@@ -380,11 +380,11 @@
                                 ${(customer.customerCreateTime?string("HH:mm:ss"))!''}
                             </td>
                             <td>
-                                <#if customer.customerIsSolve == 3 || customer.customerIsSolve == 4 || customer.customerIsSolve == 6>
+                                <#--<#if customer.customerIsSolve == 3 || customer.customerIsSolve == 4 || customer.customerIsSolve == 6>
                                     <a style="text-decoration:none" href="javascript:void(0);" title="申请邮费" onclick="ApplyForPostage(${customer.customerId!''})">
                                         <font color=#06c>申请邮费</font>
                                     </a><br/>
-                                </#if>
+                                </#if>-->
 
                                 <#--<#if customer.customerIsSolve == 2>
                                     <a style="text-decoration:none" href="javascript:void(0);" title="已解决" onclick="updateCustomerIsSolve(${customer.customerId!''})">

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

@@ -82,7 +82,7 @@
                 </div>
             </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-4 col-sm-4"> <span class="select-box" style=" width: 625px;">
                     <select name="adminId" id="adminId" class="select">
                         <#list adminList as admin>
@@ -154,7 +154,7 @@
             </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>
                 <input type="hidden" id="typeCompany" name="typeCompany" value="">
                 <div class="formControls col-10 col-sm-10 skin-minimal" id="produceTypeHtml">
                     <#list typeList as type>
@@ -165,6 +165,15 @@
                     </#list>
                 </div>
             </div>
+
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">用户信息</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
+
             <div class="row cl" id="salesChannelsSelect" style="">
                 <input type="hidden" id="companyId" name="companyId" value="<#if customerInfo??>${customerInfo.companyId!''}</#if>">
                 <input type="hidden" id="storeId" name="storeId" value="<#if customerInfo??>${customerInfo.storeId!''}</#if>">
@@ -184,7 +193,7 @@
             </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-2 col-sm-2 skin-minimal">
                     <input type="text" class="input-text trim_input" placeholder="微信昵称" id="customerWechatName" name="customerWechatName" value="${customerInfo.customerWechatName!''}">
                 </div>
@@ -195,7 +204,13 @@
                     <input type="text" class="input-text" placeholder="用户电话" id="customerTel" name="customerTel" value="${customerInfo.customerTel!''}">
                 </div>
             </div>
-
+            <div class="row cl">
+                <label class="form-label col-3">
+                    <div class="tit-2">客诉问题</div>
+                </label>
+                <div class="formControls col-9">
+                </div>
+            </div>
             <div class="row cl" id="twiceSellEnd">
                 <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">
@@ -353,7 +368,7 @@
                     </div>
                 </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-10 col-sm-10">
                     <ul class="time-line-list" id="processResultStatus">
@@ -537,86 +552,54 @@
                                     <td style="text-align: center;" colspan="4">选择订单后展示</td>
                                 </tr>
                             </#if>
-
-                      <#--  <#list productList as product>
-                            <tr>
-                                <td width="80">
-                                    <input type="hidden" value="${product.productId}"><span>${product.productName}</span>
-                                </td>
-                                <td style="padding: 0px;text-align: center;">
-                                    <table style="height: 100%;">
-                                        <tbody>
-                                            <#list product.colorList as color>
-                                                <tr>
-                                                    <td width="55" style="border-left: none;text-align: center;border-top: 1px solid #ddd;">
-                                                        ${color.colorName}
-                                                    </td>
-                                                    <td width="45" style="border-top: 1px solid #ddd; padding: 0px;width: 25px;">
-                                                        <input type="hidden" class="input-produce-id" value="${product.productId}">
-                                                        <input type="hidden" class="input-color-id" value="${color.colorId}">
-                                                        <#assign number = ""/>
-                                                            <#if (customerCommon.sendProdcues?size>0)>
-                                                                <#list customerCommon.sendProdcues as sendProdcues>
-                                                                    <#if sendProdcues.colorId == color.colorId >
-                                                                        <#assign number = sendProdcues.sendProdcueNumber/>
-                                                                    </#if>
-                                                                </#list>
-                                                            <#else >
-                                                                <#list customerCommon.closedProdcues as closedProdcues>
-                                                                    <#if closedProdcues.colorId == color.colorId >
-                                                                        <#assign number = closedProdcues.closedProdcueNumber/>
-                                                                    </#if>
-                                                                </#list>
-                                                            </#if>
-                                                        <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="产品数量" id="color-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
-                                                    </td>
-                                                </tr>
-                                            </#list>
-                                        </tbody>
-                                    </table>
-                                </td>
-                                <td style="padding: 0px;text-align: center;">
-                                    <table style="height: 100%;">
-                                        <tbody>
-                                            <#list product.fittingsList as fittingsInfo>
-                                                <tr>
-                                                    <td width="55" style="border-left: none;text-align: center; border-top: 1px solid #ddd;">${fittingsInfo.fittingsName}</td>
-                                                    <td width="45" style="border-top: 1px solid #ddd;padding: 0px;width: 25px;">
-                                                        <input type="hidden" class="input-produce-id" value="${fittingsInfo.productId}">
-                                                        <input type="hidden" class="input-fittings-id" value="${fittingsInfo.fittingsId}">
-                                                        <#assign number = ""/>
-
-                                                        <#if (customerCommon.sendFittings?size>0)>
-                                                            <#list customerCommon.sendFittings as sendFittings>
-                                                                <#if sendFittings.fittingsId == fittingsInfo.fittingsId >
-                                                                    <#assign number = sendFittings.sendFittingNumber/>
-                                                                </#if>
-                                                            </#list>
-                                                        <#else>
-                                                            <#list customerCommon.closedFittings as closedFittings>
-                                                                <#if closedFittings.fittingsId == fittingsInfo.fittingsId >
-                                                                    <#assign number = closedFittings.closedFittingNumber/>
-                                                                </#if>
-                                                            </#list>
-                                                        </#if>
-
-                                                        <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="配件数量" id="fittings-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
-                                                    </td>
-                                                </tr>
-                                            </#list>
-                                        </tbody>
-                                    </table>
-                                </td>
-                            </tr>
-                        </#list>-->
-
                         </tbody>
                     </table>
                 </div>
             </div>
-
+                    <div class="row cl" id="customerCostsDiv" style="display: none;">
+                            <label class="form-label col-1 col-sm-1">工厂报价：</label>
+                    <div class="col-2 col-sm-2">
+                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${customerCommon.relationFactoryCosts!''}">
+                            </div>
+                            <label class="form-label col-1 col-sm-1">给客户报价：</label>
+                    <div class="col-2 col-sm-2">
+                            <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${customerCommon.relationCustomerCosts!''}">
+                            </div>
+                            </div>
+                    <div class="row cl" id="sendInformationTitle">
+                          <label class="form-label col-1 col-sm-1">
+                          <div class="tit-2">寄回信息</div>
+                        </label>
+                       <div class="formControls col-10 col-sm-10">
+                      </div>
+                     </div>
+                        <div class="row cl" id="sendAddressInfo">
+                           <label class="form-label col-1 col-sm-1"></label>
+                        <div class="formControls col-9 col-sm-9" style="height: 250px" id="sendAddressSmsHtml">
+                            <#-- <script id="sendAddressSms" type="text/plain" style="width:983px;height:200px;"></script>
+                                </script>-->
+                         </div>
+                          </div>
+                          <div class="row cl" id="sendAddressByPhone" style="display: none;">
+                       <label class="form-label col-1 col-sm-1"></label>
+                       <div class="formControls col-2 col-sm-2">
+                      <input type="text" class="input-text associated-phone" value="" placeholder="请输入手机号" id="m-phone" name="">
+                        </div>
+                       <div class="formControls col-2 col-sm-2" style="width: 10%">
+                      <input type="button" class="btn btn-primary" value="发短信给用户" onclick="sendPhone('m','m-msg');">
+                     </div>
+                    <div class="formControls col-2 col-sm-2 msg-phone">
+                   <div id="m-msg" style="color: #e00"></div>
+                </div>
+             </div>
+             <div class="row cl">
+                 <label class="form-label col-1 col-sm-1">
+                 <div class="tit-2">TDS收集</div></label>
+                 <div class="formControls col-10 col-sm-10">
+                 </div>
+            </div>
             <div class="row cl" id="TDScollect" style="display: none;">
-                <label class="form-label col-1 col-sm-1">TDS收集：</label>
+                <label class="form-label col-1 col-sm-1"></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: 190px;" placeholder="" class="input-text my-search-input" placeholder="请输入城市名称搜索" type="text" name="arrcity" id="arrcity" value="" />
@@ -649,54 +632,35 @@
 				</span>
                 </div>-->
                 <input type="hidden" name="customerArea" id="customerArea" value="${customerInfo.customerArea!''}">
-                <div class="formControls col-1 col-sm-1">
-                    <input type="text" class="input-text" value="${customerInfo.customerInTDS!'0'}" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
+                </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" style="width: 156px;" value="${customerInfo.customerInTDS!'0'}" placeholder="进水TDS数值，最大999" id="customerInTDS" name="customerInTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
                 <div class="formControls col-1 col-sm-1">
-                    <input type="text" class="input-text" value="${customerInfo.customerOutTDS!'0'}" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
+                    <input type="text" class="input-text" style="width: 156px;" value="${customerInfo.customerOutTDS!'0'}" placeholder="出水TDS数值，最大999" id="customerOutTDS" name="customerOutTDS" onkeyup="TDSLinkage($(this),999)" onpaste="TDSLinkage($(this),999)">
                 </div>
             </div>
             <div class="row cl" id="TDScollectShow" /*style="display: none;"*/>
-                <label class="form-label col-1 col-sm-1"></label>
+               <!-- <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-6 col-sm-6">
                     <span id="DTS-address"><#if customerInfo.customerArea??>地址：${customerInfo.customerArea}</#if></span>
                     &nbsp;&nbsp;&nbsp;&nbsp;<span id="DTS-in"><#if customerInfo.customerInTDS??>进水：${customerInfo.customerInTDS} PPM</#if></span>&nbsp;&nbsp;  <span id="DTS-out"><#if customerInfo.customerOutTDS??>出水：${customerInfo.customerOutTDS} PPM</#if></span>
-                </div>
-            </div>
-            <div class="row cl" id="customerCostsDiv" style="display: none;">
-                            <label class="form-label col-1 col-sm-1">工厂报价：</label>
-                    <div class="col-2 col-sm-2">
-                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${customerCommon.relationFactoryCosts!''}">
-                            </div>
-                            <label class="form-label col-1 col-sm-1">给客户报价：</label>
-                    <div class="col-2 col-sm-2">
-                  <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${customerCommon.relationCustomerCosts!''}">
-               </div>
+                </div>-->
             </div>
 
-            <div class="row cl" id="sendAddressInfo">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
-                <div class="formControls col-9 col-sm-9" style="height: 250px" id="sendAddressSmsHtml">
-                <#-- <script id="sendAddressSms" type="text/plain" style="width:983px;height:200px;"></script>
-                    </script>-->
-                </div>
-            </div>
-            <div class="row cl" id="sendAddressByPhone" style="display: none;">
-                <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text associated-phone" value="" placeholder="请输入手机号" id="m-phone" name="">
-                </div>
-                <div class="formControls col-2 col-sm-2" style="width: 10%">
-                    <input type="button" class="btn btn-primary" value="发短信给用户" onclick="sendPhone('m','m-msg');">
-                </div>
-                <div class="formControls col-2 col-sm-2 msg-phone">
-                    <div id="m-msg" style="color: #e00"></div>
-                </div>
-            </div>
+
+            <div class="row cl">
+                 <label class="form-label col-1 col-sm-1">
+                 <div class="tit-2">备注信息</div></label>
+                  <div class="formControls col-10 col-sm-10">
+                  </div>
+             </div>
              <div class="row cl" id="customerDescDiv">
-                 <label class="form-label col-1 col-sm-1">备注信息：</label>
+                 <label class="form-label col-1 col-sm-1"></label>
                     <div class="col-9 col-sm-9">
-                  <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 100%;height: 100px;">${customerInfo.customerDesc!''}</textarea>
+                  <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 100%;height: 80px;">${customerInfo.customerDesc!''}</textarea>
                     </div>
               </div>
             <div class="row cl" id="updateProduct" style="display: none;">
@@ -712,139 +676,13 @@
                             </tr>
                         </thead>
                         <tbody id="back-product">
-                        <#-- <#list productList as product>
-                <tr>
-                    <td width="80">
-                        <input type="hidden" value="${product.productId}"><span>${product.productName}</span>
-                    </td>
-                    <td style="padding: 0px;text-align: center;">
-                        <table style="height: 100%;">
-                            <tbody>
-
-                             <#list product.colorList as color>
-                                    <tr>
-                                    <td width="55" style="border-left: none;text-align: center;border-top: 1px solid #ddd;">
-                                            ${color.colorName}
-                                            </td>
-                                            <td width="45" style="border-top: 1px solid #ddd; padding: 0px;width: 25px;">
-                                            <input type="hidden" class="input-produce-id" value="${product.productId}">
-                                            <input type="hidden" class="input-color-id" value="${color.colorId}">
-                                                <#assign number = ""/>
-                                                <#list customerCommon.closedProdcues as closedProdcues>
-                                                    <#if closedProdcues.colorId == color.colorId >
-                                                        <#assign number = closedProdcues.closedProdcueNumber/>
-                                                    </#if>
-                                                </#list>
-                                            <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="产品数量" id="color-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
-                                    </td>
-                                    </tr>
-                                </#list>
 
-                            </tbody>
-                            </table>
-                            </td>
-                                <td style="padding: 0px;text-align: center;">
-                                        <table style="height: 100%;">
-                                            <tbody>
-                                <#list product.fittingsList as fittingsInfo>
-                                                <tr>
-                                                <td width="55" style="border-left: none;text-align: center; border-top: 1px solid #ddd;">${fittingsInfo.fittingsName}</td>
-                                                        <td width="45" style="border-top: 1px solid #ddd;padding: 0px;width: 25px;">
-                                                        <input type="hidden" class="input-produce-id" value="${fittingsInfo.productId}">
-                                                        <input type="hidden" class="input-fittings-id" value="${fittingsInfo.fittingsId}">
-                                                            <#assign number2 = ""/>
-                                                            <#list customerCommon.closedFittings as closedFittings>
-                                                                <#if closedFittings.fittingsId == fittingsInfo.fittingsId >
-                                                                    <#assign number2 = closedFittings.closedFittingNumber/>
-                                                                </#if>
-                                                            </#list>
-                                                        <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="${number2}" placeholder="配件数量" id="fittings-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
-                                                </td>
-                                                </tr>
-                                                </#list>
-                                            </tbody>
-                                        </table>
-                                </td>
-                            </tr>
-                            </#list>-->
 
                         </tbody>
                     </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-10 col-sm-10 skin-minimal">
-                    <div class="radio-box">
-                        <input type="radio" id="customer-visit-1" name="customerIsVisit" value="2" <#if customerInfo.customerIsVisit == '2' >checked</#if> >
-                        <label for="customer-visit-1">需要回访</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="customer-visit-2" name="customerIsVisit"  value="1" <#if customerInfo.customerIsVisit == '1' >checked</#if> >
-                        <label for="customer-visit-2">不需要回访</label>
-                    </div>
-                </div>
-            </div>
-            <div id="needToVisit" style="<#if customerInfo.customerIsVisit == '1' >display: none;</#if>">
-                <#if visit??>
-                    <#assign visitName = visit.visitName/>
-                    <#assign customerTel = visit.visitTel/>
-                    <#assign visitDate = visit.visitDate/>
-                    <#assign visitTimeSelect = visit.visitTimeSelect/>
-                    <#assign designatedAdminId = visit.designatedAdminId/>
-                </#if>
-                <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="${visitName!''}" placeholder="填写回访人姓名" id="" name="visitName"   errormsg="回访人姓名格式不正确！" >
-                    </div>
-                    <div class="formControls col-2 col-sm-2">
-                        <input type="text" class="input-text associated-phone" value="${customerTel!''}" placeholder="填写回访人手机号" id="" name="visitTel"  errormsg="回访人手机号码格式不正确！">
-                    </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"  name="visitDate" value="${(visitDate?string("yyyy-MM-dd"))!''}" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',minDate:'%y-%M-%d'})"  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="visit-time-1" name="visitTimeSelect" value="1" <#if visitTimeSelect?? && visitTimeSelect== 1 >checked</#if> >
-                            <label for="visit-time-1">09:00-12:00</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="visit-time-2" name="visitTimeSelect" value="2" <#if visitTimeSelect?? && visitTimeSelect == 2 >checked</#if> >
-                            <label for="visit-time-2">12:00-14:00</label>
-                        </div>
-                        <div class="radio-box">
-                            <input type="radio" id="visit-time-3" name="visitTimeSelect" value="3" <#if visitTimeSelect?? && visitTimeSelect == 3 >checked</#if>  >
-                            <label for="visit-time-3">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 class="select" id="visitAdminId" name="visitAdminId">
-                        <#list adminList as admin>
-                            <option value ="${admin.adminId!}" <#if designatedAdminId??><#if designatedAdminId == admin.adminId >selected="selected"</#if></#if>>${admin.adminName!}</option>
-                        </#list>
-                    </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" id="visitAdminIdMsg">您将为自己指定一个回访任务</span>
-                    </div>
-                </div>
-            </div>
             <div class="row cl">
                 <div class="col-2 col-sm-2 col-offset-3">
                     <button class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/customer_detail.ftl

@@ -14,27 +14,27 @@
     <!--<link href="lib/webuploader/0.1.5/webuploader.css" rel="stylesheet" type="text/css" />-->
     <title></title>
     <style>
-        .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
+        .my-btn-submit{padding: 10px 20px;width: 120px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
     </style>
 </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">
+            <div class="formControls col-2 col-sm-2 text-r" style="margin-top: 10px;">
                 <strong>客诉编号：</strong>
             </div>
             <div class="formControls col-8 col-sm-8">
-                <input type="text" style="" class="input-text" placeholder="客诉编号" id="signclosedCustomerId" name="signclosedCustomerId">
-                <button type="button" class="my-btn-submit" onclick="select();">查询</button>
+                <input type="text" style="width: 400px;" class="input-text" placeholder="客诉编号" id="signclosedCustomerId" name="signclosedCustomerId">
+                <button type="button" style="margin-top: 4px;" class="my-btn-submit" onclick="select();">查询</button>
             </div>
 
         </div>
 
-        <div id="noCustomerDiv" style="display: none; text-align:center;">
+        <div id="noCustomerDiv" style="display: none;margin-left: -110px;">
             <h3><strong style="color: #93da67">?没有搜索到客诉哦</strong></h3>
         </div>
-        <div id="customerDiv" style="display: none">
+        <div id="customerDiv" style="display: none;margin-left: -110px;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong></strong>
             </div>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -109,7 +109,7 @@
                 <#list page.dataList as detect>
                 <tr>
                     <#--<td class="text-c" width="100">${detect.customerId!}</td>-->
-                    <td class="text-c" width="100">${detect.productTypeName!}</td>
+                    <td class="text-c" width="100">${detect.productName!'暂无产品'}(${detect.colorName!'暂无颜色'})</td>
                     <td class="text-c" width="100">
                         <#if detect.detectItemState == 1>
                             已检测
@@ -148,14 +148,15 @@
                            onclick="add_remark('修改备注','${path}/admin/detect/to_add_remark?detectItemId=${detect.detectItemId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe6df;</i>
                         </a>-->
+                        <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
+                           onclick="update_info('${path}/admin/detect/to_update_complete?detectItemId=${detect.detectItemId!''}');">
+                           <i class="Hui-iconfont">&#xe60c;</i>
+                        </a>
                         <a style="text-decoration:none" href="javascript:;" title="删除"
                            onclick="detele(${detect.detectItemId!''});">
                             <i class="Hui-iconfont">&#xe609;</i>
                         </a>
-                            <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
-                               onclick="update_info('${path}/admin/detect/to_update_complete?detectItemId=${detect.detectItemId!''}');">
-                                <i class="Hui-iconfont">&#xe60c;</i>
-                            </a>
+
                         <#--<#if detect.signclosedId??>
                             <#if detect.detectState == 1>
                                 <a style="text-decoration:none" href="javascript:;" title="查看仓储进度"

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/associated_customer.ftl

@@ -33,12 +33,12 @@
         <div class="input-box"  >
             <span class="input-dic spanhidth" style="margin-top: 12px;">客诉编号：</span>
             <input type="text" style="width: 400px;" class="input-text" placeholder="客诉编号" id="signclosedCustomerId" name="signclosedCustomerId">
-            <button type="button" class="my-btn-submit" style="margin-top: 4px;" onclick="select();">查询</button>
+            <button type="button" class="my-btn-submit" style="margin-top: 4px;width: 120px;" onclick="select();">查询</button>
         </div>
         <div id="noCustomerDiv" style="display: none; text-align:center;">
             <h3><strong style="color: #93da67">?没有搜索到客诉哦</strong></h3>
         </div>
-        <div id="customerDiv" style="display: none;text-align: -moz-center;text-align: -webkit-center;">
+        <div id="customerDiv" style="display: none;">
             <#--<div class="row cl">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>客诉时间：</strong>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/customer_signclosed_list.ftl

@@ -53,7 +53,7 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
-                <th width="100">客诉编号</th>
+                <#--<th width="100">客诉编号</th>-->
                 <th width="160">物流</th>
                 <th width="120">寄件人姓名</th>
                 <th width="120">寄件人电话</th>
@@ -71,7 +71,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as signclosed>
                 <tr>
-                    <td class="text-c" width="100">${signclosed.signclosedCustomerId!}</td>
+                    <#--<td class="text-c" width="100">${signclosed.signclosedCustomerId!}</td>-->
 
                     <td class="text-c" width="160">
                         <#if signclosed.signclosedLogistics??>
@@ -115,7 +115,7 @@
                     ${signclosed.signclosedLogisticsNumber!}</td>
                     <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
                     <td class="text-c" width="180">${signclosed.signclosedSendTel!}</td>
-                    <td class="text-c" width="100">
+                    <td style="text-align: left;" width="100">
                         <div>
                         <#if signclosed.signclosedProductInfoList??>
                             <#if (signclosed.signclosedProductInfoList?size > 0)>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -124,7 +124,7 @@
                     ${signclosed.signclosedLogisticsNumber!}</td>
                     <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
                     <td class="text-c" width="180">${signclosed.signclosedSendTel!}</td>
-                    <td class="text-c" width="100">
+                    <td style="text-align: left;" width="100">
                         <div>
                         <#if signclosed.signclosedProductInfoList??>
                             <#if (signclosed.signclosedProductInfoList?size > 0)>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -181,9 +181,9 @@
                 $("#qrcodeImg").attr('src',machineQrcode);*/
                 /* if (machineProduceType == 1) {//净水机模板*/
                 $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                        '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
+                        '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
+                        '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                        '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                         '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                         '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                         '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +
@@ -355,9 +355,9 @@
 
             /*if(machineProduceType == 1){//净水机模板*/
             $("#printlist").append('<div style="width: 242px;height: 120px;position: relative;">' +
-                    '<span style="position: absolute;left: 10px;font-size: 14px;">'+produceName+'</span>' +
-                    '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;">型号：'+producePattern+'-'+produceModel+'</span>' +
-                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;">S／N</span>' +
+                    '<span style="position: absolute;left: 10px;font-size: 14px;">桌面净水机</span>' +
+                    '<span style="position: absolute;top: 25px;left: 10px;font-size: 12px;visibility:hidden;">型号：'+producePattern+'-'+produceModel+'</span>' +
+                    '<span style="position: absolute;top: 40px;left: 10px;font-size: 12px;visibility:hidden;">S／N</span>' +
                     '<div style="position: absolute;left: 5px;top: 64px;height: 30px;" id="bcTarget2" class="barcodeImg">'+barcodes+'</div>' +
                     '<span style="position: absolute;top: 85px;left: 10px;font-size: 12px;width: 116px;text-align: center;" id="barcodeId">'+machineBarcode+'</span>' +
                     '<img style="position: absolute;right: 5px;top:18px;width: 76px;height: 76px;" id="qrcodeImg" src="'+machineQrcode+'" /> ' +

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

@@ -495,11 +495,13 @@ function initProcessResult(type,allCustomerInfoType){
                 //$("#recipientAddressText").show();
                 $("#renewedProduct").show();
                 //$("#TDScollect").show();
-                $("#TDScollectShow").show();
+                //$("#TDScollectShow").show();
                 $("#sendAddressInfo").show();
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide(); //换新产品
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -523,11 +525,13 @@ function initProcessResult(type,allCustomerInfoType){
                 //$("#recipientAddressText").show();
                 $("#renewedProduct").show();
                 //$("#TDScollect").show();
-                $("#TDScollectShow").show();
+                //$("#TDScollectShow").show();
                 $("#sendAddressInfo").show();
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide();//维修产品
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -552,11 +556,13 @@ function initProcessResult(type,allCustomerInfoType){
                 // $("#recipientAddressText").show();
                 $("#renewedProduct").hide();
                 //$("#TDScollect").show();
-                $("#TDScollectShow").show();
+                //$("#TDScollectShow").show();
                 $("#sendAddressInfo").hide();
                 $("#sendAddressByPhone").hide();
                 $("#updateProduct").hide();
                 $("#postageAccount").hide();    //邮费转账账户 -- 隐藏
+                $("#sendInformationTitle").hide();    //寄回信息标题隐藏
+                $("#sendAddressSmsHtml").hide();    //寄回信息标题隐藏
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -581,11 +587,13 @@ function initProcessResult(type,allCustomerInfoType){
                 //$("#recipientAddressText").show();
                 $("#renewedProduct").show();
                 //$("#TDScollect").show();
-                $("#TDScollectShow").show();
+                //$("#TDScollectShow").show();
                 $("#sendAddressInfo").show();
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -610,11 +618,13 @@ function initProcessResult(type,allCustomerInfoType){
                 //$("#recipientAddressText").show();
                 $("#renewedProduct").show();
                 //$("#TDScollect").show();
-                $("#TDScollectShow").show();
+                //$("#TDScollectShow").show();
                 $("#sendAddressInfo").show();
                 $("#sendAddressByPhone").show();
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
+                $("#sendInformationTitle").show();
+                $("#sendAddressSmsHtml").show();
                 visitByType(2); //需要回访
                 //$("#salesChannelsSelect").show();  //展示销售公司
                 if(customerInfoType == 1){
@@ -663,7 +673,7 @@ function otherHied(customerInfoType){
     $("#recipientAddressText").hide();
     $("#renewedProduct").hide();
     //$("#TDScollect").show();
-    $("#TDScollectShow").show();
+    //$("#TDScollectShow").show();
     $("#sendAddressInfo").hide();
     $("#sendAddressByPhone").hide();
     $("#updateProduct").hide();