修改bug文档问题

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

@@ -72,7 +72,8 @@ public class CustomerInfo  implements Serializable {
     private Integer sendStatus;         //寄送状态
 
     /*设置客诉列表查询条件*/
-    private String sendLogisticsNo;     //物流单号
+    private String sendLogisticsNo;     //寄出物流单号
+    private String backLogisticsNo;     //寄回物流单号
 
     /*关联客诉产品类型*/
     private Integer typeCompany;    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
@@ -583,4 +584,12 @@ public class CustomerInfo  implements Serializable {
     public void setSendLogisticsNo(String sendLogisticsNo) {
         this.sendLogisticsNo = sendLogisticsNo;
     }
+
+    public String getBackLogisticsNo() {
+        return backLogisticsNo;
+    }
+
+    public void setBackLogisticsNo(String backLogisticsNo) {
+        this.backLogisticsNo = backLogisticsNo;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -1056,6 +1056,8 @@ public class CustomerServiceImpl implements CustomerService {
                                 customer.setBackStatus(renewed.getRenewedBackStatus());
                                 customer.setSendStatus(renewed.getRenewedSendStatus());
                                 customer.setSalesTime(renewed.getSalesPayTime());
+                                customer.setSendLogisticsNo(renewed.getRenewedSendLogisticsNo());
+                                customer.setBackLogisticsNo(renewed.getRenewedBackLogisticsNo());
                                 break;
                             }
                         }
@@ -1066,6 +1068,8 @@ public class CustomerServiceImpl implements CustomerService {
                                 customer.setBackStatus(repair.getRepairBackStatus());
                                 customer.setSendStatus(repair.getRepairSendStatus());
                                 customer.setSalesTime(repair.getSalesPayTime());
+                                customer.setSendLogisticsNo(repair.getRepairSendLogisticsNo());
+                                customer.setBackLogisticsNo(repair.getRepairBackLogisticsNo());
                                 break;
                             }
                         }
@@ -1075,6 +1079,7 @@ public class CustomerServiceImpl implements CustomerService {
                             if (reissue.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setSendStatus(reissue.getReissueSendStatus());
                                 customer.setSalesTime(reissue.getSalesPayTime());
+                                customer.setBackLogisticsNo(reissue.getReissueSendLogisticsNo());
                                 break;
                             }
                         }
@@ -1084,6 +1089,7 @@ public class CustomerServiceImpl implements CustomerService {
                             if (backGoods.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setBackStatus(backGoods.getBackGoodsBackStatus());
                                 customer.setSalesTime(backGoods.getSalesPayTime());
+                                customer.setSendLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
                                 break;
                             }
                         }
@@ -1093,6 +1099,7 @@ public class CustomerServiceImpl implements CustomerService {
                             if (noreasonBack.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setBackStatus(noreasonBack.getNoreasonBackBackStatus());
                                 customer.setSalesTime(noreasonBack.getSalesPayTime());
+                                customer.setSendLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
                                 break;
                             }
                         }

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

@@ -1366,8 +1366,8 @@ public class AdminCustomerController {
         if (!StringUtils.isNotEmpty(repair.getRepairId().toString())) {
             return new ResponseJson(500, "该换新信息不能修改!", 500);
         }
-        String closedProducts = request.getParameter("closed_products");
-        String closedFittings = request.getParameter("closed_fittings");
+       /* String closedProducts = request.getParameter("closed_products");
+        String closedFittings = request.getParameter("closed_fittings");*/
         String provinceNumber = request.getParameter("repairProvinceNumber");
         String cityNumber = request.getParameter("repairCityNumber");
         String areaNumber = request.getParameter("repairAreaNumber");
@@ -1381,12 +1381,15 @@ public class AdminCustomerController {
         if (StringUtils.isNotEmpty(areaNumber)) {
             repair.setAreaNumber(Integer.parseInt(areaNumber));
         }
+        if (StringUtils.isNotEmpty(mergeAddress)) {
+            repair.setRepairSendMergeAddress(mergeAddress);
+        }
 //        if (StringUtils.isNotEmpty(repair.getRepairBackPostage().toString())) {
 //            repair.setRepairBackPostage(repair.getRepairBackPostage().intValue() * 100);
 //        }
-        if (!StringUtils.isNotEmpty(repair.getRepairBackEfastOrderId())) {
+        /*if (!StringUtils.isNotEmpty(repair.getRepairBackEfastOrderId())) {
             return new ResponseJson(500, "请输入efast订单号!", 500);
-        }
+        }*/
         if (StringUtils.isNotEmpty(mergeAddress)) {
             repair.setRepairSendMergeAddress(mergeAddress);
         }
@@ -1400,16 +1403,18 @@ public class AdminCustomerController {
             return new ResponseJson(500, "该efast订单号无效，请重新输入!", 500);
         }*/
 
-        if(repair.getRepairBackStatus() != 1){
-            ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-            cs.setSignclosedCustomerId(repair.getCustomerId());
-            cs.setSignclosedLogistics(repair.getRepairBackLogisticsCompany());
-            cs.setSignclosedLogisticsNumber(repair.getRepairBackLogisticsNo());
-            complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+        if(repair.getRepairBackStatus() != null){
+            if(repair.getRepairBackStatus() != 1){
+                ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
+                cs.setSignclosedCustomerId(repair.getCustomerId());
+                cs.setSignclosedLogistics(repair.getRepairBackLogisticsCompany());
+                cs.setSignclosedLogisticsNumber(repair.getRepairBackLogisticsNo());
+                complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
+            }
         }
 
         //修改维修信息
-        int num = repairService.updateRepairInfo(repair, closedProducts, closedFittings);
+        int num = repairService.updateRepairInfo(repair, null, null);
 
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);

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

@@ -120,10 +120,11 @@
             <#--<th width="80">客诉类型</th>-->
             <th width="80">问题类型</th>
             <th width="100">问题简述</th>
-            <th width="80">销售</th>
+            <th width="60">销售</th>
             <th width="80">购买日期</th>
             <th width="60">区域</th>
             <th width="60">TDS</th>
+            <th width="80">物流单号</th>
             <th width="80">处理结果</th>
             <th width="80">需要回访</th>
             <th width="80">客诉时间</th>
@@ -166,6 +167,14 @@
                             <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
                             <td>${customer.customerArea!''}</td>
                             <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>
+                            <td>
+                                <#if (customer.sendLogisticsNo??) || (customer.backLogisticsNo??)>
+                                    寄回：${customer.backLogisticsNo!''}<br>
+                                    寄出：${customer.sendLogisticsNo!''}
+                                <#else>
+                                    无
+                                </#if>
+                            </td>
                             <td id="txt_customerIsSolve">
                                 <#if customer.customerIsSolve == 1>
                                     已解决
@@ -187,7 +196,7 @@
                                             已寄送
                                         <#elseif customer.sendStatus == 3>
                                             已收货
-                                        </#if>,
+                                        </#if><#--,
                                         <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                             <#list customer.complaintDetectList as complaintDetect>
                                                 <#if (complaintDetect_index = 0)>
@@ -202,7 +211,7 @@
                                                     </#if>
                                                 </#if>
                                             </#list>
-                                        </#if>
+                                        </#if>-->
                                         </font>
                                     </a>
                                     )
@@ -222,7 +231,7 @@
                                             已寄送
                                         <#elseif customer.sendStatus == 3>
                                             已收货
-                                        </#if>,
+                                        </#if><#--,
                                             <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                                 <#list customer.complaintDetectList as complaintDetect>
                                                     <#if (complaintDetect_index = 0)>
@@ -237,7 +246,7 @@
                                                         </#if>
                                                     </#if>
                                                 </#list>
-                                            </#if></font>
+                                            </#if>--></font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 5>

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

@@ -12,59 +12,82 @@
     <link href="${path}/common/lib/icheck/icheck.css" rel="stylesheet" type="text/css" />
     <link href="${path}/common/lib/Hui-iconfont/1.0.8/iconfont.css" rel="stylesheet" type="text/css" />
     <style>
-        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(images/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
         .select-box{background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size: auto 100%;}
         .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
         .table-bg th{background-color: #e2f6ff;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 20px;background-color: #32a3d8;color: #fff;}
+
+
+
+        .clearfix:after{content:"\20";display:block;height:0;clear:both;visibility:hidden}.clearfix{zoom:1}
+        .tabBar {border-bottom: 2px solid #222}
+        .tabBar span {background-color: #e8e8e8;cursor: pointer;display: inline-block;float: left;font-weight: bold;height: 30px;line-height: 30px;padding: 0 15px}
+        .tabBar span.current{background-color: #222;color: #fff}
+        .tabCon {display: none}
     </style>
     <title></title>
 </head>
 <body>
 <article class="cl pd-20">
     <form action="" method="post" class="form form-horizontal" id="form-update-repair" name="form-update-repair">
-        <div class="row cl">
+        <div class="row cl" style="margin-left: -60px;margin-bottom: 20px;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>当前进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="hidden" id="repairId" name="repairId" />
+                <input type="hidden" id="repairId" name="repairId" seleType="primary"/>
                 <span id="repairSchedule" class="c-red"></span>
             </div>
         </div>
-
-        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
-
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>产品寄回</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="tel-3" name="repairBackStatus" value="1">
-                    <label for="tel-3">未寄回</label>
+        <div id="tab_demo" class="HuiTab">
+            <div class="tabBar clearfix"><span>寄回信息</span><span>邮费信息</span><span>寄送信息</span><span>工厂检查信息</span><span>工厂返修进度</span></div>
+            <div class="tabCon">
+            <#--<div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>寄回产品</strong>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-4" name="repairBackStatus" value="2">
-                    <label for="tel-4">已寄回</label>
+                <div class="formControls col-10 col-sm-10">
+                    <div class="update-parts" id="repairProduct" style="float: left;width: 514px;"></div>
+                    <input type="hidden" id="closed_products" name="closed_products" />
+                    <input type="hidden" id="closed_fittings" name="closed_fittings" />
+                    &lt;#&ndash;<div style="float: left;">
+                        <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+                    </div>&ndash;&gt;
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-5" name="repairBackStatus" value="3">
-                    <label for="tel-5">已收货</label>
+            </div>-->
+
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>产品寄回</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                        <div class="radio-box">
+                            <input type="radio" id="tel-3" name="repairBackStatus" value="1" seleType="send">
+                            <label for="tel-3">未寄回</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-4" name="repairBackStatus" value="2" seleType="send">
+                            <label for="tel-4">已寄回</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-5" name="repairBackStatus" value="3" seleType="send">
+                            <label for="tel-5">已收货</label>
+                        </div>
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="row cl" id="backLogisticsInfo" style="display: none">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄回信息</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div style="width: 120px;display: inline-block;margin-right: 10px;">
+
+                <div class="row cl" id="backLogisticsInfo" style="display: none">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>寄回信息</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <div style="width: 120px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
-				<select name="repairBackLogisticsCompany" id="repairBackLogisticsCompany" class="select">
-					<option value="">物流公司</option>
-                    <option value="sto">申通快递</option>
+				<select name="repairBackLogisticsCompany" id="repairBackLogisticsCompany" class="select" seleType="send">
+                    <option value="">物流公司</option>
+					<option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -81,143 +104,156 @@
                     <option value="02">上门送货</option>
 				</select>
 			</span>
+                        </div>
+                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="repairBackLogisticsNo" name="repairBackLogisticsNo" seleType="send">
+                    <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage">
+                    <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">-->
+                    </div>
                 </div>
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="repairBackLogisticsNo" name="repairBackLogisticsNo">
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage">
-                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay">
-            </div>
-        </div>
-        <div class="row cl" id="backTransferInfo" style="display: none">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>邮费处理</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" name="repairIsTransfer" value="0">
-                    <label for="tel-6">不需要转账</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" name="repairIsTransfer" value="1">
-                    <label for="tel-7">已转账</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" name="repairIsTransfer" value="2">
-                    <label for="tel-8">待转账</label>
-                </div>
-            </div>
-        </div>
-        <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄件信息</strong>
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="repairBackName" name="repairBackName">
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" value="" placeholder="寄件人电话" id="repairBackTel" name="repairBackTel">
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄回产品</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div class="update-parts" id="repairProduct" style="float: left;width: 514px;"></div>
-                <input type="hidden" id="closed_products" name="closed_products" />
-                <input type="hidden" id="closed_fittings" name="closed_fittings" />
-                <div style="float: left;">
-                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+
+                <div class="row cl" style="position: relative;display: none;" id="backUserInfo">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>寄件信息</strong>
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="repairBackName" name="repairBackName" seleType="send">
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" value="" placeholder="寄件人电话" id="repairBackTel" name="repairBackTel" seleType="send">
+                    </div>
                 </div>
-            </div>
-        </div>
-        <div class="cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-            </div>
-            <div class="formControls col-10 col-sm-10" id="produceSelect" style="padding-top: 10px;display: none;">
-                <div>
-                    <input type="text" oninput="showUpdateSendProduct();" onpropertychange="showUpdateSendProduct();" class="input-text" style="width: 100%" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2">
+                    </div>
+                    <div class="formControls col-8 col-sm-8 text-c">
+                        <button onClick="update_repair_info(1);" class="btn btn-primary" type="button">确认修改</button>
+                    </div>
                 </div>
-                <table class="table table-border table-bg table-bordered">
-                    <thead>
-                    <tr class="text-c">
-                        <th style="text-align: center;" width="60">产品名称</th>
-                        <th style="text-align: center;" width="60">产品颜色</th>
-                        <th style="text-align: center;" width="60">产品配件</th>
-                    </tr>
-                    </thead>
-                    <tbody id="addProduct">
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>是否寄出</strong>
             </div>
-            <div class="formControls col-10 col-sm-10 skin-minimal">
-                <div class="radio-box">
-                    <input type="radio" id="tel-19" name="repairSendStatus" value="1">
-                    <label for="tel-19">未寄出</label>
+            <div class="tabCon">
+                <div class="row cl" id="backTransferInfo" <#--style="display: none"-->>
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>邮费处理</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                        <div class="radio-box">
+                            <input type="radio" id="tel-6" name="repairIsTransfer" value="0" seleType="postage">
+                            <label for="tel-6">不需要转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-7" name="repairIsTransfer" value="1" seleType="postage">
+                            <label for="tel-7">已转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-8" name="repairIsTransfer" value="2" seleType="postage">
+                            <label for="tel-8">待转账</label>
+                        </div>
+                    </div>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-20" name="repairSendStatus" value="2">
-                    <label for="tel-20">已寄出</label>
+                <div class="row cl" id="postageInformation">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>邮费信息</strong>
+                    </div>
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="repairBackPostage" name="repairBackPostage" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="repairAlipay" name="repairAlipay" seleType="postage">
+                    </div>
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-21" name="repairSendStatus" value="3">
-                    <label for="tel-21">已收货</label>
-                </div>
-                Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId">
-            </div>
-        </div>
-        <div class="row cl" id="sendUserInfo" style="display: none;">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>用户信息</strong>
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" placeholder="填写收件人姓名" id="repairSendName" name="repairSendName">
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" placeholder="填写收件人手机号" id="repairSendTel" name="repairSendTel">
-            </div>
-        </div>
-        <div class="row cl" id="sendAddressInfo" style="display: none">
-            <div class="formControls col-2 col-sm-2 text-r">
 
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2">
+                    </div>
+                    <div class="formControls col-8 col-sm-8 text-c">
+                        <button onClick="update_repair_info(2);" class="btn btn-primary" type="button">确认修改</button>
+                    </div>
+                </div>
             </div>
-            <div class="formControls col-10 col-sm-10">
-                <div style="width: 188px;display: inline-block;margin-right: 20px;">
+            <div class="tabCon">
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>是否寄出</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10 skin-minimal">
+                        <div class="radio-box">
+                            <input type="radio" id="tel-10" name="repairSendStatus" value="1" seleType="sendInformation">
+                            <label for="tel-10">未寄出</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-11" name="repairSendStatus" value="2" seleType="sendInformation">
+                            <label for="tel-11">已寄出</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-12" name="repairSendStatus" value="3" seleType="sendInformation">
+                            <label for="tel-12">已收货</label>
+                        </div>
+                        Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId" seleType="sendInformation">
+                    </div>
+
+                <#--<div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>寄出产品</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <div class="update-parts" id="sendProduct"></div>
+                    </div>
+                </div>
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2">
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        （如需修改，在Efast系统作废订单，重新生成订单，并与此处修改Efast重新生成的订单号！）
+                    </div>
+                </div>-->
+
+                    <div class="row cl" id="sendUserInfo" style="display: none;">
+                        <div class="formControls col-2 col-sm-2 text-r">
+                            <strong>用户信息</strong>
+                        </div>
+                        <div class="formControls col-5 col-sm-5">
+                            <input type="text" class="input-text" placeholder="填写收件人姓名" id="repairSendName" name="repairSendName" seleType="sendInformation">
+                        </div>
+                        <div class="formControls col-5 col-sm-5">
+                            <input type="text" class="input-text" placeholder="填写收件人手机号" id="repairSendTel" name="repairSendTel" seleType="sendInformation">
+                        </div>
+                    </div>
+                    <div class="row cl" id="sendAddressInfo" style="display: none">
+                        <div class="formControls col-2 col-sm-2 text-r">
+
+                        </div>
+                        <div class="formControls col-10 col-sm-10">
+                            <div style="width: 188px;display: inline-block;margin-right: 20px;">
                     <span class="select-box" style="padding-right: 0px;">
-                        <select name="repairProvinceNumber" id="repairProvinceNumber" class="select"></select>
+                        <select name="repairProvinceNumber" id="repairProvinceNumber" class="select" seleType="sendInformation"></select>
                     </span>
-                </div>
-                <div style="width: 188px;display: inline-block;margin-right: 20px;">
+                            </div>
+                            <div style="width: 188px;display: inline-block;margin-right: 20px;">
                     <span class="select-box" style="padding-right: 0px;">
-                        <select name="repairCityNumber" id="repairCityNumber" class="select"></select>
+                        <select name="repairCityNumber" id="repairCityNumber" class="select" seleType="sendInformation"></select>
                     </span>
-                </div>
-                <div style="width: 189px;display: inline-block;">
+                            </div>
+                            <div style="width: 189px;display: inline-block;">
                     <span class="select-box" style="padding-right: 0px;">
-                        <select name="repairAreaNumber" id="repairAreaNumber" class="select"></select>
-                        <input type="hidden" name="merge_address" id="merge_address">
+                        <select name="repairAreaNumber" id="repairAreaNumber" class="select" seleType="sendInformation"></select>
+                        <input type="hidden" id="merge_address" name="merge_address" seleType="sendInformation">
                     </span>
-                </div>
-            </div>
-        </div>
-        <div class="row cl" id="sendaddressDescInfo" style="display: none">
-            <label class="form-label col-2 col-sm-2"></label>
-            <div class="formControls col-10 col-sm-10">
-                <input type="text" class="input-text" placeholder="请填写详细地址" id="repairSendAddress" name="repairSendAddress">
-            </div>
-        </div>
-        <div class="row cl" id="sendLogisticsInfo" style="display: none">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄出信息</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div style="width: 300px;display: inline-block;margin-right: 10px;">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row cl" id="sendaddressDescInfo" style="display: none">
+                        <label class="form-label col-2 col-sm-2"></label>
+                        <div class="formControls col-10 col-sm-10">
+                            <input type="text" class="input-text" placeholder="请填写详细地址" id="repairSendAddress" name="repairSendAddress" seleType="sendInformation">
+                        </div>
+                    </div>
+                    <div class="row cl"  id="sendLogisticsInfo" style="display: none">
+                        <div class="formControls col-2 col-sm-2 text-r">
+                            <strong>寄出信息</strong>
+                        </div>
+                        <div class="formControls col-10 col-sm-10">
+                            <div style="width: 300px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
-				<select name="repairSendLogisticsCompany" id="repairSendLogisticsCompany" class="select">
+				<select name="repairSendLogisticsCompany" id="repairSendLogisticsCompany" class="select" seleType="sendInformation">
 					<option value="">物流公司</option>
                     <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
@@ -236,77 +272,73 @@
                     <option value="02">上门送货</option>
 				</select>
 			</span>
+                            </div>
+                            <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="repairSendLogisticsNo" name="repairSendLogisticsNo" seleType="sendInformation">
+                        </div>
+                    </div>
+                    <div class="row cl" id="sendDescInfo" style="display: none">
+                        <div class="formControls col-2 col-sm-2 text-r">
+                            <strong>寄出备注</strong>
+                        </div>
+                        <div class="formControls col-10 col-sm-10">
+                            <input type="text" class="input-text" placeholder="寄出备注" id="repairDesc" name="repairDesc" seleType="sendInformation">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2">
+                    </div>
+                    <div class="formControls col-8 col-sm-8 text-c">
+                        <button onClick="update_repair_info(3);" class="btn btn-primary" type="button">确认修改</button>
+                    </div>
                 </div>
-                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="repairSendLogisticsNo" name="repairSendLogisticsNo">
-            </div>
-        </div>
-        <div class="row cl" id="sendDescInfo" style="display: none">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄出备注</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <input type="text" class="input-text" placeholder="寄出备注" id="repairDesc" name="repairDesc">
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄出产品</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div class="update-parts" id="sendProduct"></div>
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                （如需修改，在Efast系统作废订单，重新生成订单，并与此处修改Efast重新生成的订单号！）
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>QC进度</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <table class="table table-border table-bg table-bordered">
-                    <tbody class="text-c" id="detect_table"><tr>
-                        <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
-                    </tr>
-                    </tbody></table>
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>返修进度</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <table class="table table-border table-bg table-bordered">
-                    <tbody class="text-c" id="maintenance_table"><tr>
-                        <th>是否可返修</th><th>返修内容</th><th>返修日期</th>
-                    </tr>
-                    </tbody></table>
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                寄送产品将自动推送Efast，系统自动获取物流信息，并更新。如果在Efast作废订单等操作后，无法获取物流信息，请手动填写物流信息。
             </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2">
+            <div class="tabCon">
+                <div class="row cl" style="margin-left: -70px;">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>QC进度</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <table class="table table-border table-bg table-bordered">
+                            <tbody class="text-c" id="detect_table"><tr>
+                                <th>工厂检测现象</th><th>故障分类</th><th>故障原因</th><th>判定结果</th><th>故障指向</th><th>原因分析</th><th>生产维修</th>
+                            </tr>
+                            </tbody></table>
+                    </div>
+                </div>
             </div>
-            <div class="formControls col-8 col-sm-8 text-c">
-                <button onClick="update_repair_info();" class="btn btn-primary" type="button">确认修改</button>
+            <div class="tabCon">
+                <div class="row cl" style="margin-left: -70px;">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>返修进度</strong>
+                    </div>
+                    <div class="formControls col-10 col-sm-10">
+                        <table class="table table-border table-bg table-bordered">
+                            <tbody class="text-c" id="maintenance_table"><tr>
+                                <th>是否可返修</th><th>返修内容</th><th>返修日期</th>
+                            </tr>
+                            </tbody></table>
+                    </div>
+                </div>
             </div>
         </div>
+        <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
     </form>
     </div>
 </article>
 <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">
+    $(function(){
+        $.Huitab("#tab_demo .tabBar span","#tab_demo .tabCon","current","click","0")});
+    // #tab_demo 父级id
+    // #tab_demo .tabBar span 控制条
+    // #tab_demo .tabCon 内容区
+    // click 事件 点击切换，可以换成mousemove 移动鼠标切换
+    // 1	默认第2个tab为当前状态（从0开始）
+
+
 
     var mobile= /^1(3|4|5|7|8)\d{9}$/; //手机号码
     var uname = /^[\u4e00-\u9fa5a-zA-Z]{1,12}$/; //中文英文
@@ -330,13 +362,18 @@
         $("input[name='repairSendStatus']").change(function (){
             initSendInfo($(this).val());
         })
+
+        /* 监听邮费状态按钮 */
+        $("input[name='repairIsTransfer']").change(function (){
+            initPostageInfo($(this).val());
+        })
     });
 
     /*初始化寄回信息*/
     function initBackInfo(statusCode){
         if(statusCode == 1){
             $("#backLogisticsInfo").hide();
-            $("#backTransferInfo").hide();
+            /*$("#backTransferInfo").hide();*/
             $("#backUserInfo").hide();
         }else{
             $("#backLogisticsInfo").show();
@@ -345,6 +382,15 @@
         }
     }
 
+    /*显示隐藏邮费信息*/
+    function initPostageInfo(statusCode){
+        if(statusCode == 1){
+            $("#postageInformation").show();
+        }else{
+            $("#postageInformation").hide();
+        }
+    }
+
     /*初始化寄出信息*/
     function initSendInfo(statusCode){
         if(statusCode == 1){
@@ -362,6 +408,7 @@
         }
     }
 
+
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
@@ -515,7 +562,7 @@
         return productList;
     }
 
-    /*获取维修信息*/
+    /*获取产品信息*/
     function get_repair_info() {
         $.ajax({
             cache: true,
@@ -532,15 +579,16 @@
                     getDistrict('repairAreaNumber',repair.cityNumber);
                     var repairSchedule = '';
                     switch (repair.repairBackStatus) {
-                        case 1:repairSchedule += '待寄回,';break;
+                        case 1:repairSchedule += '未寄回,';break;
                         case 2:repairSchedule += '已寄回,';break;
                         case 3:repairSchedule += '已收货,';break;
                     }
                     switch (repair.repairSendStatus) {
-                        case 1:repairSchedule += '未寄出,';break;
-                        case 2:repairSchedule += '已寄出,';break;
-                        case 3:repairSchedule += '已收货,';break;
+                        case 1:repairSchedule += '未寄出';break;
+                        case 2:repairSchedule += '已寄出';break;
+                        case 3:repairSchedule += '已收货';break;
                     }
+
                     var repairProduct = '';
                     if (repair.closedProdcues != null && repair.closedProdcues.length > 0) {
                         $.each(repair.closedProdcues,function(index,element){
@@ -549,11 +597,10 @@
                     }
                     if (repair.closedFittings != null && repair.closedFittings.length > 0) {
                         $.each(repair.closedFittings,function(index,element){
-                            repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*'  + this.closedFittingNumber + '件</span>';
+                            repairProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
                     $('#repairProduct').html(repairProduct);
-
                     var sendProduct = '';
                     if (repair.sendProdcues != null && repair.sendProdcues.length > 0) {
                         $.each(repair.sendProdcues,function(index,element){
@@ -562,7 +609,7 @@
                     }
                     if (repair.sendFittings != null && repair.sendFittings.length > 0) {
                         $.each(repair.sendFittings,function(index,element){
-                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendFittingsName + '*' + this.sendFittingNumber  + '件</span>';
+                            sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendFittingsName + '*' + this.sendFittingNumber + '件</span>';
                         })
                     }
                     $('#sendProduct').html(sendProduct);
@@ -582,7 +629,10 @@
                     initBackInfo(repair.repairBackStatus);
                     /*初始化寄出信息*/
                     initSendInfo(repair.repairSendStatus);
+                    //初始化邮费信息
+                    initPostageInfo(repair.repairIsTransfer);
 
+                    $('#repairSchedule').html(repairSchedule);
                     $("#repairBackLogisticsCompany option[value='" + repair.repairBackLogisticsCompany + "']").attr("selected","true");
                     $("#repairSendLogisticsCompany option[value='" + repair.repairSendLogisticsCompany + "']").attr("selected","true");
 
@@ -611,14 +661,14 @@
                     var maintenance_table = $('#maintenance_table');
                     if (repair.complaintDetectList != null) {
                         $.each(repair.complaintDetectList,function (i,item) {
-                            if (i == 0) {
+                            /*if (i == 0) {
                                 switch (this.detectState) {
                                     case 1:repairSchedule += '待仓库转入';break;
                                     case 2:repairSchedule += '正在检查';break;
                                     case 3:repairSchedule += '检查通过';break;
                                     case 4:repairSchedule += '检查未通过';break;
                                 }
-                            }
+                            }*/
                             var detectRevolutionProducedMsg = "";
                             switch (this.detectRevolutionProduced){
                                 case 1:
@@ -653,22 +703,54 @@
         })
     }
 
-    /*修改维修信息*/
-    function update_repair_info() {
-        var repair_flag = checkRepair();
-        var repairProvinceNumber = $("#repairProvinceNumber").find("option:selected").text();
-        var repairCityNumber = $("#repairCityNumber").find("option:selected").text();
-        var repairAreaNumber = $("#repairAreaNumber").find("option:selected").text();
-        $('#merge_address').val(repairProvinceNumber+'-'+repairCityNumber+'-'+repairAreaNumber);
-
+    function getseleType(type){
+        var obj = new Object();
+        var oldName = "";
+        $("[seleType="+ type +"]").each(function(){
+            var name = $(this).attr("name");
+            if(oldName != name){
+                oldName = name
+                if($(this).attr("type") == "radio"){
+                    obj[name] = $("[name="+ name +"]:checked").val();
+                }else{
+                    obj[name] = $("[name="+ name +"]").val();
+                }
+            }
+        });
+        $("[seleType='primary']").each(function(){
+            var name = $(this).attr("name");
+            if(oldName != name){
+                oldName = name;
+                obj[name] = $("[name="+ name +"]").val();
+            }
+        });
+        return obj;
+    }
+    /*修改换新信息*/
+    function update_repair_info(type) {
+        var repair_flag = checkrepair(type);
+        //省市县
+        var provinceNumber = $("#repairProvinceNumber").find("option:selected").text();
+        var cityNumber = $("#repairCityNumber").find("option:selected").text();
+        var areaNumber = $("#repairAreaNumber").find("option:selected").text();
+        $('#merge_address').val(provinceNumber+'-'+cityNumber+'-'+areaNumber);
+
+        //寄回邮费
         var repairBackPostage = $("#repairBackPostage").val();
         $("#repairBackPostage").val(parseInt(repairBackPostage*100));
-
+        var obj = null;
+        if(type == 1){
+            obj = getseleType("send");
+        }else if(type == 2){
+            obj = getseleType("postage");
+        }else if(type ==3){
+            obj = getseleType("sendInformation");
+        }
         if (repair_flag) {
             $.ajax({
                 cache: true,
                 type: "POST",
-                data: $('#form-update-repair').serialize(),
+                data: obj,
                 url: "${path}/admin/customer/update_repair_info",
                 async: false,
                 success: function(data){
@@ -680,7 +762,6 @@
                     } else {
                         window.parent.custome_result(data.resultMsg,5);
                     }
-                    $('#update-repair-info').hide();
                 },
                 error: function(XmlHttpRequest, textStatus, errorThrown){
                     window.parent.admin_result("修改失败!",5);
@@ -691,122 +772,125 @@
         }
     }
 
-    /*校验维修填写信息*/
-    function checkRepair() {
+    /*校验换新填写信息*/
+    function checkrepair(type) {
         var repair_flag = true;
-        var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
-        var repairBackLogisticsNo = $('#repairBackLogisticsNo').val().trim();//物流单号
-        var repairBackPostage = $('#repairBackPostage').val().trim();//寄回邮费
+        var repairBackLogisticsNo = $('#repairBackLogisticsNo').val().trim();//寄回物流单号
         var repairBackLogisticsCompany = $("#repairBackLogisticsCompany option:selected").val();//寄回物流公司
-        var repairBackName = $('#repairBackName').val();
-        var repairBackTel = $('#repairBackTel').val();
-        //var repairBackMachineNo = $('#repairBackMachineNo').val();
-        if (repairBackStatus == 1) {
+        var repairBackName = $('#repairBackName').val();//寄件人姓名
+        var repairBackTel = $('#repairBackTel').val();//寄件人电话
+        if(type == 1){
+            var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
+            if (repairBackStatus == 1) {
 //            if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
-//                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
+//                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
-//            if (repairBackPostage != null && repairBackPostage != '') {
-//                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
+//            if (repairBackPostage != null && repairBackPostage != '' && repairBackPostage != 0) {
+//                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
 //            if (repairBackLogisticsCompany != null && repairBackLogisticsCompany != '') {
-//                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
+//                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
 //            if (repairBackName != null && repairBackName != '') {
-//                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
+//                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
 //            if (repairBackTel != null && repairBackTel != '') {
-//                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
+//                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
-            /*if (repairBackMachineNo != null && repairBackMachineNo != '') {
-                alert("产品未寄回，不能填写机器编号!");
-                repair_flag = false;
-                return repair_flag;
-            }*/
-        } else if (repairBackStatus == 2 || repairBackStatus == 3) {
-            if (repairBackLogisticsNo == null || repairBackLogisticsNo == '') {
-                layer.msg("物流信息不能为空!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (!money.test(repairBackPostage)) {
-                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 (!uname.test(repairBackName)) {
-                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
+            } else if (repairBackStatus == 2 || repairBackStatus == 3) {
+                if (repairBackLogisticsNo == null || repairBackLogisticsNo == '') {
+                    layer.msg("物流单号不能为空!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                if (repairBackLogisticsCompany == null || repairBackLogisticsCompany == '') {
+                    layer.msg("请选择物流公司!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                if (!uname.test(repairBackName)) {
+                    layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                if (!mobile.test(repairBackTel)) {
+                    layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
             }
-            if (!mobile.test(repairBackTel)) {
-                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
+        }else if(type == 2){
+            var repairIsTransfer = $('input[name="repairIsTransfer"]:checked').val();
+            var repairBackPostage = $('#repairBackPostage').val().trim();//寄回邮费
+            var repairAlipay = $('#repairAlipay').val().trim();//支付宝账户
+
+            if(repairIsTransfer == 1){
+                if (!money.test(repairBackPostage)) {
+                    layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                if (!money.test(repairAlipay)) {
+                    layer.msg("支付宝账户格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
             }
-            /*if (repairBackMachineNo == null || repairBackMachineNo == '') {
-                alert("机器编号不能为空!");
-                repair_flag = false;
-                return repair_flag;
-            }*/
-        }
-        var repairSendName = $('#repairSendName').val();
-        if (!uname.test(repairSendName)) {
-            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
-            repair_flag = false;
-            return repair_flag;
-        }
-        var repairSendTel = $('#repairSendTel').val();
-        if (!mobile.test(repairSendTel)) {
-            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
-            repair_flag = false;
-            return repair_flag;
-        }
-        var repairSendAddress = $('#repairSendAddress').val();
-        if (repairSendAddress == null || repairSendAddress == '') {
-            layer.msg("寄出地址不能为空!",{icon: 5,time:500});
-            repair_flag = false;
-            return repair_flag;
-        }
-        var repairSendStatus = $('input[name="repairSendStatus"]:checked').val();//寄回状态
-        var repairSendLogisticsCompany = $('#repairSendLogisticsCompany').val();//寄出物流公司
-        var repairSendLogisticsNo = $('#repairSendLogisticsNo').val();//寄出物流单号
-        if (repairSendLogisticsCompany == 1) {
+        }else if(type == 3){
+            var repairSendStatus = $('input[name="repairSendStatus"]:checked').val();//寄回状态
+            var repairSendLogisticsCompany = $('#repairSendLogisticsCompany').val();//寄出物流公司
+            var repairSendLogisticsNo = $('#repairSendLogisticsNo').val();//寄出物流单号
+
+            if (repairSendStatus == 1) {
 //            if (repairSendLogisticsCompany != null && repairSendLogisticsCompany != '') {
-//                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
+//                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
 //            if (repairSendLogisticsNo != null && repairSendLogisticsNo != '') {
-//                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
+//                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
 //                repair_flag = false;
 //                return repair_flag;
 //            }
-        } else if (repairSendLogisticsCompany == 2 || repairSendLogisticsCompany == 3) {
-            if (repairSendLogisticsCompany == null || repairSendLogisticsCompany == '') {
-                layer.msg("请选择寄回物流公司!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (repairSendLogisticsNo == null || repairSendLogisticsNo == '') {
-                layer.msg("请填写物流单号!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
+            } else if (repairSendStatus == 2 || repairSendStatus == 3) {
+                if (repairSendLogisticsCompany == null || repairSendLogisticsCompany == '') {
+                    layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                if (repairSendLogisticsNo == null || repairSendLogisticsNo == '') {
+                    layer.msg("请填写物流单号!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                var repairSendTel = $('#repairSendTel').val();//收件人电话
+                if (!mobile.test(repairSendTel)) {
+                    layer.msg("收件人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                var repairSendName = $('#repairSendName').val();//收件人姓名
+                if (repairSendName == null || repairSendName == '') {
+                    layer.msg("收件人姓名格式不正确，请重新输入!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
+                var repairSendAddress = $('#repairSendAddress').val();
+                if (repairSendAddress == null || repairSendAddress == '') {
+                    layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
+                    repair_flag = false;
+                    return repair_flag;
+                }
             }
         }
         return repair_flag;
@@ -866,7 +950,7 @@
         var proId = $("#repairProvinceNumber").val();
         $('#repairCityNumber option').remove();
         getCity('repairCityNumber',proId);
-        var cityId = $("#cityNumber").val();
+        var cityId = $("#repairCityNumber").val();
         $('#repairAreaNumber option').remove();
         getDistrict('repairAreaNumber',cityId);
     });