修改客户信息

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

@@ -14,7 +14,7 @@
     <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{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #0000FF;}
         .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(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
 
@@ -86,7 +86,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" >
                     <select name="adminId" id="adminId" class="select">
                     </select>
@@ -150,9 +150,8 @@
                     </div>
                 </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>
                 <input type="hidden" id="typeCompany" name="typeCompany" value="">
                 <div class="formControls col-10 col-sm-10 skin-minimal produce_type_html" id="produceTypeHtml">
                     <#--<div class="radio-box">
@@ -165,6 +164,13 @@
                     </div>-->
                 </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">
                 <input type="hidden" id="companyId" name="companyId" value="" >
                 <input type="hidden" id="storeId" name="storeId" value="" >
@@ -183,7 +189,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-2 col-sm-2 skin-minimal">
                     <input type="text" class="input-text trim_input" placeholder="微信昵称" id="customerWechatName" name="customerWechatName" value="">
                 </div>
@@ -218,6 +224,13 @@
                     </table>
                 </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">
@@ -327,7 +340,7 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">
-                    <div class="tit">处理结果</div>
+                    <div class="tit-2">处理结果</div>
                 </label>
                 <div class="formControls col-10 col-sm-10">
                 </div>
@@ -490,48 +503,6 @@
 
                 </div>
             </div>
-
-            <div class="row cl" id="TDScollect" style="display: none;">
-                <label class="form-label col-1 col-sm-1">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: 190px;" placeholder="" class="input-text my-search-input" placeholder="请输入城市名称搜索" type="text" name="arrcity" id="arrcity" />
-                    <div id="suggest" class="ac_results"></div>-->
-                    <span class="select-box">
-                        <select name="initProvinceCode" class="select" id="initProvince">
-                            <option value="">请选择省份</option>
-                        </select>
-				    </span>
-                </div>
-                <div class="formControls col-2 col-sm-2">
-                    <span class="select-box">
-                        <select name="initCityCode" class="select" id="initCity">
-                            <option value="">请选择城市</option>
-                        </select>
-                    </span>
-                </div>
-                <div class="formControls col-2 col-sm-2" style="position: relative;">
-                    <span class="select-box">
-                        <select name="initDistrictCode" class="select" id="initCountry">
-                            <option value="">请选择区/县</option>
-                        </select>
-				    </span>
-                 </div>
-                <input type="hidden" name="customerArea" id="customerArea">
-                <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>
-                <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)">
-                </div>
-            </div>
-            <div class="row cl" id="TDScollectShow" style="display: none;">
-                <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 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">
@@ -542,8 +513,15 @@
                     <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="">
                   </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="sendAddressInfo">
-                <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
+                <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-9 col-sm-9" style="height: 240px" id="sendAddressSmsHtml">
                    <#-- <script id="sendAddressSms" type="text/plain" style="width:983px;height:200px;"></script>
                     </script>-->
@@ -562,8 +540,66 @@
                     <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"></label>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                  <span class="select-box">
+                  <select name="initProvinceCode" class="select" id="initProvince">
+                      <option value="">请选择省份</option>
+                  </select>
+                   </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                <span class="select-box">
+                 <select name="initCityCode" class="select" id="initCity">
+                   <option value="">请选择城市</option>
+                 </select>
+                 </span>
+             </div>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                  <span class="select-box">
+                   <select name="initDistrictCode" class="select" id="initCountry">
+                       <option value="">请选择区/县</option>
+                   </select>
+                  </span>
+                </div>
+                   <input type="hidden" name="customerArea" id="customerArea">
+           </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>
+                  <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)">
+                 </div>
+
+           </div>
+             <div class="row cl" id="TDScollectShow" style="display: none;">
+                  <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 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: 80px;"></textarea>
                  </div>

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

@@ -34,7 +34,7 @@
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>客诉编号：</label>
             <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
-                <input class="my-input" type="text"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
+                <input class="my-input" type="text" style="width: 78.5%;"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
             </div>
         </div>
         <div class="input-box">
@@ -56,7 +56,7 @@
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>检测日期：</label>
             <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
-                <input class="my-input" type="text"  name="itemDate" id="itemDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+                <input class="my-input" type="text" style="width: 78.5%;" name="itemDate" id="itemDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
             </div>
         </div>
 
@@ -76,7 +76,7 @@
         <div class="input-box" >
             <label class="col-3 col-sm-3 huanhang"  style="text-align: right;margin: 10px 0px;"></label>
             <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
-                <input class="my-input" list="contentlist" type="text" onchange="inputSelect()" name="content" id="content"  placeholder="输入关键字查询，如果没有请直接在问题简述填写"/>
+                <input class="my-input" list="contentlist" type="text" style="width: 78.5%;" onchange="inputSelect()" name="content" id="content"  placeholder="输入关键字查询，如果没有请直接在问题简述填写"/>
                 <datalist id="contentlist">
                     <#if (detectionBasisList?size > 0)>
                         <#list detectionBasisList as detectionBasis>

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

@@ -30,48 +30,38 @@
             </div>
 
         </div>
-        <div id="customerDiv" style="display: none">
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>客诉时间：</strong>
-            </div>
-            <div class="formControls col-8 col-sm-8" id="customerCreateTime">
 
-            </div>
+        <div id="noCustomerDiv" style="display: none; text-align:center;">
+            <h3><strong style="color: #93da67">?没有搜索到客诉哦</strong></h3>
         </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>客诉标题：</strong>
-            </div>
-            <div class="formControls col-8 col-sm-8" id="txtDescribeTitle">
-
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>客诉回复：</strong>
-            </div>
-            <div class="formControls col-8 col-sm-8" id="txtDescribeContent">
-
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>客诉备注：</strong>
-            </div>
-            <div class="formControls col-8 col-sm-8" id="txtCustomerDesc">
-
-            </div>
-        </div>
-
-        <div class="row cl">
+        <div id="customerDiv" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
-                <strong>客诉描述：</strong>
+                <strong></strong>
             </div>
-            <div class="formControls col-8 col-sm-8" id="txtDescribeHandleDesc">
-
-            </div>
-        </div>
+            <table class="table table-border table-bg table-bordered" style="margin-top: 10px;width: 500px;">
+                <thead>
+                <tr>
+                    <th width="5" style="text-align: center">客诉标题</th>
+                    <td width="50" style="font-weight: normal;"><span id="txtDescribeTitle"></span></td>
+                </tr>
+                <tr>
+                    <th width="5" style="text-align: center">客诉回复</th>
+                    <td width="50" style="font-weight: normal;"><span id="txtDescribeContent"></span></td>
+                </tr>
+                <tr>
+                    <th width="5" style="text-align: center">客诉人姓名</th>
+                    <td width="50" style="font-weight: normal;"><span id="customerName"></span></td>
+                </tr>
+                <tr>
+                    <th width="5" style="text-align: center">客诉人手机号</th>
+                    <td width="50" style="font-weight: normal;"><span id="customerTel"></span></td>
+                </tr>
+                <tr>
+                    <th width="5" style="text-align: center">客诉时间</th>
+                    <td width="50" style="font-weight: normal;"><span id="customerCreateTime"></span></td>
+                </tr>
+                </thead>
+            </table>
         </div>
         <#--<div class="row cl">
             <div class="formControls col-2 col-sm-2">
@@ -101,12 +91,19 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     var describe = data.returnMsg.describe;
-                    $('#customerCreateTime').html(formatDate(describe.customerCreateTime,"yyyy-MM-dd"));
+                    var customer = data.returnMsg.customerInfo;
+                    $('#customerCreateTime').html(formatDate(describe.customerCreateTime,"yyyy年MM月dd日"));
                     $('#txtDescribeTitle').html(describe.describeTitle);
                     $('#txtDescribeContent').html(describe.describeContent);
-                    $('#txtDescribeHandleDesc').html(describe.describeHandleDesc);
-                    $('#txtCustomerDesc').html(describe.customerDesc);
+                    $('#customerName').html(customer.customerName);
+                    $('#customerTel').html(customer.customerTel);
+                    $("#noCustomerDiv").hide();
                     $("#customerDiv").show();
+                    $("#associatedId").show();
+                }else {
+                    $("#customerDiv").hide();
+                    $("#associatedId").hide();
+                    $("#noCustomerDiv").show();
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -57,13 +57,13 @@
             <select id="productColorId" name="productColorId" class="my-select" style="width: 120px;">
 
             </select>
-            <input class="my-input" style="width: 70px;" type="text" name="customerId" value="${customerId!}" placeholder="客诉编号"/>
-            <input class="my-input" style="width: 70px;" type="text" name="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
-            <input class="my-input" style="width: 70px;" type="text" name="detectItemPhenomenon" value="${detectItemPhenomenon!}" placeholder="工厂检测现象"/>
-            <input class="my-input" style="width: 70px;" type="text" name="detectItemFailureCause" value="${detectItemFailureCause!}" placeholder="故障原因"/>
-            <input class="my-input" style="width: 70px;" type="text" name="detectItemPoint" value="${detectItemPoint!}" placeholder="故障指向"/>
-            <input class="my-input" style="width: 70px;" type="text" name="detectItemNalysis" value="${detectItemNalysis!}" placeholder="原因分析"/>
-            <input class="my-input" style="width: 70px;" type="text" name="detectItemClassification" value="${detectItemClassification!}" placeholder="故障分类"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="customerId" value="${customerId!}" placeholder="客诉编号"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectItemPhenomenon" value="${detectItemPhenomenon!}" placeholder="工厂检测现象"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectItemFailureCause" value="${detectItemFailureCause!}" placeholder="故障原因"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectItemPoint" value="${detectItemPoint!}" placeholder="故障指向"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectItemNalysis" value="${detectItemNalysis!}" placeholder="原因分析"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectItemClassification" value="${detectItemClassification!}" placeholder="故障分类"/>
 
             <#--<select class="my-select" name="detectState" style="height: 30px;width: 150px">
                 <option value ="">选择状态</option>

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

@@ -78,6 +78,7 @@
         </#if>
             <button type="button" class="my-btn-submit" onclick="update();">确认关联</button>
         </div>
+
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>

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

@@ -72,7 +72,7 @@
                 <th width="130">退货地区</th>
                 <th width="90">售后原因</th>
                 <th width="150">客服备注</th>
-                <th width="150">返厂日期</th>
+                <th width="150">签收日期</th>
                 <th width="100">备注</th>
                 <th width="50">操作</th>
             </tr>
@@ -130,9 +130,9 @@
                             <#if (signclosed.signclosedProductInfoList?size > 0)>
                                 <#list signclosed.signclosedProductInfoList as info>
                                     <#if info.signclosedProductType == 1 >
-                                        <span class="label label-success radius txt" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                        <span class="label label-success radius" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                                     <#else >
-                                        <span class="label label-success radius txt" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                        <span class="label label-success radius" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
                                     </#if>
                                 </#list>
                             <#else >
@@ -151,7 +151,7 @@
                         </#if>
                     </#if></td>
                     <td class="text-c" width="100">${signclosed.signclosedAddrProvinces!}-${signclosed.signclosedAddrCity!}-${signclosed.signclosedAddrArea!}</td>
-                    <td class="text-c" width="100"><span class="label txt2" title="${signclosed.customerIdDescribe!}" >${signclosed.customerIdDescribe!}</span><br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>
+                    <td class="text-c" width="100">${signclosed.customerIdDescribe!}</td>
                     <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>