修改了客诉页面

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

@@ -108,6 +108,7 @@
         and c.customer_id = #{customerId}
       </if>
     </where>
+    ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
   </select>
 
   <insert id="insert" parameterType="CustomerInfo"  useGeneratedKeys="true"  keyProperty="customerId">

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

@@ -759,7 +759,13 @@ public class AdminCustomerController {
     public ModelAndView toVisitInfo(HttpServletRequest request) throws Exception {
         ModelAndView mv = new ModelAndView("cm/customer/visit_detail");
         String customerId = request.getParameter("customerId");
+        // 1：未回访，2：已回访
+        String num = request.getParameter("num");
+        if (!StringUtils.isNotEmpty(num)) {
+            num = "2";
+        }
         mv.addObject("customerId", customerId);
+        mv.addObject("num", num);
         return mv;
     }
 

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

@@ -79,7 +79,7 @@
             </div>
         </div>
         <div class="row cl">
-            <div class="formControls col-12 col-sm-12">
+            <div class="formControls col-12 col-sm-12" style="padding-left: 60px;">
                 您将为<span id="visit-admin" class="c-red">自己</span>指定一个回访任务
                 <br />
                 提示原则：<br />
@@ -100,12 +100,12 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var loginAdminId = ${loginAdminId!''};

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

@@ -82,7 +82,9 @@
         </div>
         <div class="row cl" style="position: relative;">
             <label class="form-label col-1 col-sm-1">客诉问题：</label>
-            <label id="describeTitle"></label>
+            <div class="formControls col-4 col-sm-4">
+                <label id="describeTitle"></label>
+            </div>
         </div>
         <div class="row cl">
             <label class="form-label col-1 col-sm-1">回复内容：</label>
@@ -275,7 +277,7 @@
                         case 7:txtcustomerIsSolve = '无理由退货';break;
                     }
                     $('#customerIsSolve').html(txtcustomerIsSolve);
-                    $('#companyName').html(customer.companyName+"-"+customer.storeName);
+                    $('#companyName').html(convertUndefinedToEmpty(customer.companyName)+"-"+convertUndefinedToEmpty(customer.storeName));
                     $('#salesOrderId').html(salesOrder.salesOrderId);
                     $('#salesAddressName').html(salesOrder.salesAddressName);
                     $('#salesAddressTel').html(salesOrder.salesAddressTel);
@@ -322,7 +324,7 @@
                         $('#divCloseProdcue').hide();
                     }
                     $('#customerTDS').html("TDS收集:"+customerCommon.relationSendMergeAddress+",进水"+
-                            customer.customerInTDS+"ppm"+",出水"+customer.customerOutTDS+"ppm");
+                            (customer.customerInTDS==undefined?0:customer.customerInTDS)+"ppm"+",出水"+(customer.customerOutTDS==undefined?0:customer.customerOutTDS)+"ppm");
 
                     if (customer.customerIsVisit == '2') {
                         var visitTime = '';

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

@@ -59,6 +59,7 @@
             </select>
             <select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;>
                 <option value ="">是否需要回访</option>
+                <option value="">是否回访</option>
                 <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
                 <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
             </select>
@@ -236,10 +237,13 @@
                                     不需要回访
                                 <#elseif customer.customerIsVisit == "2">
                                     <#if customer.visitStatus == 1>
-                                        待回访<font style="color:red;">(${(customer.visitDate?string("yyyy-MM-dd"))!''}完成)</font>
+                                        待回访<br/>
+                                        <a style="text-decoration:none" href="javascript:void(0);" title="回访内容" onclick="getVisitInfo(${customer.customerId!''},1)">
+                                            <font style="color:red;">(${(customer.visitDate?string("yyyy-MM-dd"))!''}完成)</font>
+                                        </a>&nbsp;
                                     <#elseif customer.visitStatus == 2>
                                         已回访<br/>
-                                        <a style="text-decoration:none" href="javascript:void(0);" title="回访内容" onclick="getVisitInfo(${customer.customerId!''})">
+                                        <a style="text-decoration:none" href="javascript:void(0);" title="回访内容" onclick="getVisitInfo(${customer.customerId!''},2)">
                                             <font color=#06c>回访内容</font>
                                         </a>&nbsp;
                                     </#if>
@@ -271,7 +275,7 @@
                         </tr>
                     </#list>
             <#else>
-                <tr><td colspan="10" class="td-manage text-c" >暂时没有客诉信息，请添加！</td></tr>
+                <tr><td colspan="16" class="td-manage text-c" >暂时没有客诉信息，请添加！</td></tr>
             </#if>
         </tbody>
     </table>
@@ -327,8 +331,8 @@
     /**
      * 进入查询回访信息页面
      */
-    function getVisitInfo(customerId) {
-        layer_show("回访内容","${path}/admin/customer/_visit_info?customerId="+customerId,"800","500");
+    function getVisitInfo(customerId,num) {
+        layer_show("回访内容","${path}/admin/customer/_visit_info?customerId="+customerId+"&num="+num,"800","500");
     }
 
     /**

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

@@ -45,10 +45,10 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var customerId = ${customerId!''};

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

@@ -168,10 +168,11 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
-<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
-<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码

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

@@ -165,12 +165,12 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码

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

@@ -154,12 +154,12 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码

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

@@ -311,12 +311,13 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
+
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
@@ -627,27 +628,27 @@
         //var renewedBackMachineNo = $('#renewedBackMachineNo').val();
         if (renewedBackStatus == 1) {
             if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
-                alert("产品未寄回，不能有物流信息!");
+                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackPostage != null && renewedBackPostage != '') {
-                alert("产品未寄回，不能有邮费!");
+                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackLogisticsCompany != null && renewedBackLogisticsCompany != '') {
-                alert("产品未寄回，不能选择物流公司!");
+                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackName != null && renewedBackName != '') {
-                alert("产品未寄回，不能填写寄回人信息!");
+                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackTel != null && renewedBackTel != '') {
-                alert("产品未寄回，不能填写寄回人电话号码!");
+                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
@@ -658,27 +659,27 @@
             }*/
         } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
             if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
-                alert("物流信息不能为空!");
+                layer.msg("物流信息不能为空!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!money.test(renewedBackPostage)) {
-                alert("邮费格式不正确，请重新输入!");
+                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackLogisticsCompany == null || renewedBackLogisticsCompany == '') {
-                alert("请选择物流公司!");
+                layer.msg("请选择物流公司!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!uname.test(renewedBackName)) {
-                alert("寄回人信息格式不正确，请重新输入!");
+                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!mobile.test(renewedBackTel)) {
-                alert("寄回人电话号码格式不正确，请重新输入!");
+                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
@@ -690,19 +691,19 @@
         }
         var renewedSendName = $('#renewedSendName').val();
         if (!uname.test(renewedSendName)) {
-            alert("寄回人信息格式不正确，请重新输入!");
+            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
             renewed_flag = false;
             return renewed_flag;
         }
         var renewedSendTel = $('#renewedSendTel').val();
         if (!mobile.test(renewedSendTel)) {
-            alert("寄回人电话号码格式不正确，请重新输入!");
+            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
             renewed_flag = false;
             return renewed_flag;
         }
         var renewedSendAddress = $('#renewedSendAddress').val();
         if (renewedSendAddress == null || renewedSendAddress == '') {
-            alert("寄出地址不能为空!");
+            layer.msg("寄出地址不能为空!",{icon: 5,time:500});
             renewed_flag = false;
             return renewed_flag;
         }
@@ -711,23 +712,23 @@
         var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
         if (renewedSendLogisticsCompany == 1) {
             if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
-                alert("产品未寄送，不能选择物流公司!");
+                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedSendLogisticsNo != null && renewedSendLogisticsNo != '') {
-                alert("产品未寄送，不能填写物流单号!");
+                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
         } else if (renewedSendLogisticsCompany == 2 || renewedSendLogisticsCompany == 3) {
             if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
-                alert("请选择寄回物流公司!");
+                layer.msg("请选择寄回物流公司!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedSendLogisticsNo == null || renewedSendLogisticsNo == '') {
-                alert("请填写物流单号!");
+                layer.msg("请填写物流单号!",{icon: 5,time:500});
                 renewed_flag = false;
                 return renewed_flag;
             }

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

@@ -312,12 +312,12 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
@@ -629,27 +629,27 @@
         //var repairBackMachineNo = $('#repairBackMachineNo').val();
         if (repairBackStatus == 1) {
             if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
-                alert("产品未寄回，不能有物流信息!");
+                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairBackPostage != null && repairBackPostage != '') {
-                alert("产品未寄回，不能有邮费!");
+                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairBackLogisticsCompany != null && repairBackLogisticsCompany != '') {
-                alert("产品未寄回，不能选择物流公司!");
+                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairBackName != null && repairBackName != '') {
-                alert("产品未寄回，不能填写寄回人信息!");
+                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairBackTel != null && repairBackTel != '') {
-                alert("产品未寄回，不能填写寄回人电话号码!");
+                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
@@ -660,27 +660,28 @@
             }*/
         } else if (repairBackStatus == 2 || repairBackStatus == 3) {
             if (repairBackLogisticsNo == null || repairBackLogisticsNo == '') {
-                alert("物流信息不能为空!");
+                layer.msg("物流信息不能为空!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (!money.test(repairBackPostage)) {
-                alert("邮费格式不正确，请重新输入!");
+                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairBackLogisticsCompany == null || repairBackLogisticsCompany == '') {
-                alert("请选择物流公司!");
+                alert("");
+                layer.msg("请选择物流公司!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (!uname.test(repairBackName)) {
-                alert("寄回人信息格式不正确，请重新输入!");
+                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (!mobile.test(repairBackTel)) {
-                alert("寄回人电话号码格式不正确，请重新输入!");
+                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
@@ -692,19 +693,19 @@
         }
         var repairSendName = $('#repairSendName').val();
         if (!uname.test(repairSendName)) {
-            alert("寄回人信息格式不正确，请重新输入!");
+            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
             repair_flag = false;
             return repair_flag;
         }
         var repairSendTel = $('#repairSendTel').val();
         if (!mobile.test(repairSendTel)) {
-            alert("寄回人电话号码格式不正确，请重新输入!");
+            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
             repair_flag = false;
             return repair_flag;
         }
         var repairSendAddress = $('#repairSendAddress').val();
         if (repairSendAddress == null || repairSendAddress == '') {
-            alert("寄出地址不能为空!");
+            layer.msg("寄出地址不能为空!",{icon: 5,time:500});
             repair_flag = false;
             return repair_flag;
         }
@@ -713,23 +714,23 @@
         var repairSendLogisticsNo = $('#repairSendLogisticsNo').val();//寄出物流单号
         if (repairSendLogisticsCompany == 1) {
             if (repairSendLogisticsCompany != null && repairSendLogisticsCompany != '') {
-                alert("产品未寄送，不能选择物流公司!");
+                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairSendLogisticsNo != null && repairSendLogisticsNo != '') {
-                alert("产品未寄送，不能填写物流单号!");
+                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
         } else if (repairSendLogisticsCompany == 2 || repairSendLogisticsCompany == 3) {
             if (repairSendLogisticsCompany == null || repairSendLogisticsCompany == '') {
-                alert("请选择寄回物流公司!");
+                layer.msg("请选择寄回物流公司!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }
             if (repairSendLogisticsNo == null || repairSendLogisticsNo == '') {
-                alert("请填写物流单号!");
+                layer.msg("请填写物流单号!",{icon: 5,time:500});
                 repair_flag = false;
                 return repair_flag;
             }

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

@@ -60,13 +60,14 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
 <script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var customerId = ${customerId!''};
+    var num = ${num!''};
 
     $(function(){
         $.ajax({
@@ -78,15 +79,27 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     var visit = data.returnMsg.visit;
-                    if (visit.adminId == visit.designatedAdminId) {
-                        $('#adminName').html(visit.adminName+"(自己指定)");
+                    if (visit.designatedAdminId != null && visit.designatedAdminId != 'undefined') {
+                        if (visit.adminId == visit.designatedAdminId) {
+                            $('#adminName').html(visit.adminName+"(自己指定)");
+                        } else {
+                            $('#adminName').html(visit.adminName+"("+visit.designatedAdminName+"指定)");
+                        }
                     } else {
-                        $('#adminName').html(visit.adminName+"("+visit.designatedAdminName+"指定)");
+                        $('#adminName').html(visit.adminName);
+                    }
+
+                    if (num == 1) {
+                        $('#txtVisitCompleteDate').html(visit.visitDate);
+                        $('#txtVisitCompleteName').html(visit.visitName);
+                        $('#txtVisitCompleteTel').html(visit.visitTel);
+                        $('#txtVisitCompleteRemark').html(visit.visitCompleteRemark);
+                    } else {
+                        $('#txtVisitCompleteDate').html(visit.visitCompleteDate);
+                        $('#txtVisitCompleteName').html(visit.visitCompleteName);
+                        $('#txtVisitCompleteTel').html(visit.visitCompleteTel);
+                        $('#txtVisitCompleteRemark').html(visit.visitCompleteRemark);
                     }
-                    $('#txtVisitCompleteDate').html(visit.visitCompleteDate);
-                    $('#txtVisitCompleteName').html(visit.visitCompleteName);
-                    $('#txtVisitCompleteTel').html(visit.visitCompleteTel);
-                    $('#txtVisitCompleteRemark').html(visit.visitCompleteRemark);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -25,7 +25,7 @@
                 <strong>回访日期</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="hidden" name="finish_customerId" value="${customerId!''}" />
+                <input type="hidden" id="finish_customerId" name="finish_customerId" value="${customerId!''}" />
                 <input type="text" name="visitCompleteDate" id="visitCompleteDate" class="input-text" placeholder="" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="" readonly="readonly" />
             </div>
         </div>
@@ -79,12 +79,12 @@
     </form>
     </div>
 </article>
-<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
+<#--<script type="text/javascript" src="${path}/common/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
 <script type="text/javascript" src="${path}/common/static/h-ui/js/H-ui.js"></script>
-<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.js"></script>-->
 <script type="text/javascript">
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
@@ -101,8 +101,30 @@
             radioClass: 'iradio-blue',
             increaseArea: '20%'
         });
+        getVisitInfo();
     });
 
+    function getVisitInfo() {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":${customerId!''}},
+            url: "${path}/admin/customer/get_visit_info",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var visit = data.returnMsg.visit;
+                    $('#visitCompleteDate').val(visit.visitDate);
+                    $('#visitCompleteName').val(visit.visitName);
+                    $('#visitCompleteTel').val(visit.visitTel);
+                    $('#visitCompleteRemark').val(visit.visitCompleteRemark);
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
+
     /**
      * 添加回访完成信息
      */