客诉列表修改

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -216,4 +216,17 @@ public interface CustomerService {
      * @return
      */
     ProcMethod getProcMethod(Integer procMethodId);
+
+    /**
+     * 根据id修改处理信息
+     * @return
+     */
+    Integer updateCmRelation(CmRelation cmRelation);
+
+    /**
+     * 查询客诉处理信息
+     * @param cmRelation
+     * @return
+     */
+    CmRelation getCmRelationInfo(CmRelation cmRelation);
 }

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

@@ -1040,6 +1040,16 @@ public class CustomerServiceImpl implements CustomerService {
         return customerInfoMapper.getProcMethod(procMethodId);
     }
 
+    @Override
+    public Integer updateCmRelation(CmRelation cmRelation) {
+        return customerInfoMapper.updateCmRelation(cmRelation);
+    }
+
+    @Override
+    public CmRelation getCmRelationInfo(CmRelation cmRelation) {
+        return customerInfoMapper.getCmRelationInfo(cmRelation);
+    }
+
     /**
          * 向Efast推送订单--添加订单
          * @return

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

@@ -102,4 +102,18 @@ public interface CustomerInfoMapper {
      * @return
      */
     ProcMethod getProcMethod(Integer procMethodId);
+
+    /**
+     * 根据id修改处理信息
+     * @return
+     */
+    Integer updateCmRelation(CmRelation cmRelation);
+
+    /**
+     * 查询客诉处理信息
+     * @param cmRelation
+     * @return
+     */
+    CmRelation getCmRelationInfo(CmRelation cmRelation);
+
 }

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

@@ -918,4 +918,117 @@ LEFT JOIN tb_rst_sys_admin sa ON c.admin_id = sa.admin_id
   <select id="getProcMethod" parameterType="Integer" resultType="ProcMethod">
     SELECT * from tb_rst_cm_proc_method WHERE proc_method_id = #{procMethodId}
   </select>
+
+  <!-- 修改售后处理信息 -->
+  <update id="updateCmRelation" parameterType="CmRelation" >
+    UPDATE tb_rst_cm_relation
+      <set>
+        <if test="signclosedId != null and signclosedId != ''">
+          signclosed_id = #{"signclosedId"},
+        </if>
+        <if test="relationBackStatus != null and relationBackStatus != ''" >
+          relation_back_status = #{relationBackStatus},
+        </if>
+        <if test="relationBackName != null and relationBackName != ''" >
+          relation_back_name = #{relationBackName},
+        </if>
+        <if test="relationBackTel != null and relationBackTel != ''" >
+          relation_back_tel = #{relationBackTel},
+        </if>
+        <if test="relationBackLogisticsCompany != null and relationBackLogisticsCompany != ''" >
+          relation_back_logistics_company = #{relationBackTel},
+        </if>
+        <if test="relationBackLogisticsNo != null and relationBackLogisticsNo != ''" >
+          relation_back_logistics_no = #{relationBackLogisticsNo},
+        </if>
+        <if test="relationBackPostage != null and relationBackPostage != ''" >
+          relation_back_postage = #{relationBackPostage},
+        </if>
+        <if test="relationBackMachineNo != null and relationBackMachineNo != ''" >
+          relation_back_machine_no = #{relationBackMachineNo},
+        </if>
+        <if test="relationSendStatus != null and relationSendStatus != ''" >
+          relation_send_status = #{relationSendStatus},
+        </if>
+        <if test="relationBackEfastOrderId != null and relationBackEfastOrderId != ''" >
+          relation_back_efast_order_id = #{relationBackEfastOrderId},
+        </if>
+        <if test="relationSendName != null and relationSendName != ''" >
+          relation_send_name = #{relationSendName},
+        </if>
+        <if test="relationSendTel != null and relationSendTel != ''" >
+          relation_send_tel = #{relationSendTel},
+        </if>
+        <if test="provinceNumber != null and provinceNumber != ''" >
+          province_number = #{provinceNumber},
+        </if>
+        <if test="cityNumber != null and cityNumber != ''" >
+          city_number = #{cityNumber},
+        </if>
+        <if test="areaNumber != null and areaNumber != ''" >
+          area_number = #{areaNumber},
+        </if>
+        <if test="relationSendMergeAddress != null and relationSendMergeAddress != ''" >
+          relation_send_merge_address = #{relationSendMergeAddress},
+        </if>
+        <if test="relationSendAddress != null and relationSendAddress != ''" >
+          relation_send_address = #{relationSendAddress},
+        </if>
+        <if test="relationSendLogisticsCompany != null and relationSendLogisticsCompany != ''" >
+          relation_send_logistics_company = #{relationSendLogisticsCompany},
+        </if>
+        <if test="relationSendLogisticsNo != null and relationSendLogisticsNo != ''" >
+          relation_send_logistics_no = #{relationSendLogisticsNo},
+        </if>
+        <if test="relationDesc != null and relationDesc != ''" >
+          relation_desc = #{relationDesc},
+        </if>
+        <if test="relationState != null and relationState != ''" >
+          relation_state = #{relationState},
+        </if>
+        <if test="relationAlipay != null and relationAlipay != ''" >
+          relation_alipay = #{relationAlipay},
+        </if>
+        <if test="relationAlipayName != null and relationAlipayName != ''" >
+          relation_alipay_name = #{relationAlipayName},
+        </if>
+        <if test="relationIsTransfer != null and relationIsTransfer != ''" >
+          relation_is_transfer = #{relationIsTransfer},
+        </if>
+        <if test="relationCreateTime != null and relationCreateTime != ''" >
+          relation_create_time = #{relationCreateTime},
+        </if>
+        <if test="relationUpdateTime != null and relationUpdateTime != ''" >
+          relation_update_time = #{relationUpdateTime},
+        </if>
+        <if test="relationFactoryCosts != null and relationFactoryCosts != ''" >
+          relation_factory_costs = #{relationFactoryCosts},
+        </if>
+        <if test="relationCustomerCosts != null and relationCustomerCosts != ''" >
+          relation_customer_costs = #{relationCustomerCosts},
+        </if>
+        <if test="relationBackReceiptDate != null and relationBackReceiptDate != ''" >
+          relation_back_receipt_date = #{relationBackReceiptDate}
+        </if>
+      </set>
+      <where>
+        relation_id = #{relationId}
+      </where>
+  </update>
+
+  <select id="getCmRelationInfo" parameterType="CmRelation" resultType="CmRelation">
+    SELECT
+      *
+     FROM
+     tb_rst_cm_relation
+    <where>
+      <if test="relationId != null and relationId != ''">
+        relation_id = #{relationId},
+      </if>
+      <if test="customerId != null and customerId != ''">
+        customer_id = #{customerId}
+      </if>
+    </where>
+
+  </select>
 </mapper>

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

@@ -1247,65 +1247,56 @@ public class AdminCustomerController {
      */
     @ResponseBody
     @RequiresPermissions("customer:get:renewed")
-    @RequestMapping("/get_renewed_info")
+    @RequestMapping("/get_cmRelation_info")
     public ResponseJson getRenewedInfo(HttpServletRequest request) throws Exception {
         String customerId = request.getParameter("customerId");
         if (!StringUtils.isNotEmpty(customerId)) {
             return new ResponseJson(500, "该客诉信息不存在!", 500);
         }
-        Renewed renewed = new Renewed();
-        renewed.setCustomerId(Integer.parseInt(customerId));
-        renewed.setRenewedState(1);
+        CmRelation cmRelation = new CmRelation();
+        cmRelation.setCustomerId(Integer.parseInt(customerId));
         //获取换新详情和检测信息
-        renewed = customerService.getRenewedInfo(renewed);
-        if (renewed == null) {
-            return new ResponseJson(500, "该客诉没有换新信息!", 500);
+        cmRelation = customerService.getCmRelationInfo(cmRelation);
+        if (cmRelation == null) {
+            return new ResponseJson(500, "该客诉没有售后信息!", 500);
         } else {
             ResponseJson rj = new ResponseJson(200, "查询成功", 200);
-            rj.addResponseKeyValue("renewed", renewed);
+            rj.addResponseKeyValue("cmRelation", cmRelation);
             return rj;
         }
     }
 
     /**
-     * 修改换新信息
+     * 修改处理信息
      *
      * @param request
-     * @param renewed
+     * @param cmRelation
      * @return
      * @throws Exception
      */
     @ResponseBody
     @RequiresPermissions("customer:update:renewed")
-    @RequestMapping("/update_renewed_info")
-    public ResponseJson updateRenewedInfo(HttpServletRequest request, Renewed renewed) throws Exception {
-        /*String closedProducts = request.getParameter("closed_products");
-        String closedFittings = request.getParameter("closed_fittings");*/
+    @RequestMapping("/update_cmRelation_info")
+    public ResponseJson updateRenewedInfo(HttpServletRequest request, CmRelation cmRelation) throws Exception {
         String mergeAddress = request.getParameter("merge_address");
-        if (!StringUtils.isNotEmpty(renewed.getRenewedId().toString())) {
-            return new ResponseJson(500, "该换新信息不能修改!", 500);
+        if (!StringUtils.isNotEmpty(cmRelation.getRelationId().toString())) {
+            return new ResponseJson(500, "该售后信息不能修改!", 500);
         }
-//        if (StringUtils.isNotEmpty(renewed.getRenewedBackPostage().toString())) {
-//            renewed.setRenewedBackPostage(renewed.getRenewedBackPostage().intValue() * 100);
-//        }
-        /*if (!StringUtils.isNotEmpty(renewed.getRenewedBackEfastOrderId())) {
-            return new ResponseJson(500, "请输入efast订单号!", 500);
-        }*/
         if (StringUtils.isNotEmpty(mergeAddress)) {
-            renewed.setRenewedSendMergeAddress(mergeAddress);
+            cmRelation.setRelationSendMergeAddress(mergeAddress);
         }
-        if (renewed.getRenewedBackStatus() != null) {
-            if (renewed.getRenewedBackStatus() != 1) {
+        if (cmRelation.getRelationBackStatus() != null) {
+            if (cmRelation.getRelationBackStatus() != 1) {
                 ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
-                cs.setSignclosedCustomerId(renewed.getCustomerId());
-                cs.setSignclosedLogistics(renewed.getRenewedBackLogisticsCompany());
-                cs.setSignclosedLogisticsNumber(renewed.getRenewedBackLogisticsNo());
+                cs.setSignclosedCustomerId(cmRelation.getCustomerId());
+                cs.setSignclosedLogistics(cmRelation.getRelationBackLogisticsCompany());
+                cs.setSignclosedLogisticsNumber(cmRelation.getRelationBackLogisticsNo());
                 complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
             }
         }
 
         //修改换新信息
-        int num = renewedService.updateRenewedInfo(renewed, null, null);
+        int num = customerService.updateCmRelation(cmRelation);
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);
         } else {

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

@@ -35,46 +35,32 @@
                 <strong>当前进度</strong>
             </div>
             <div class="formControls col-10 col-sm-10">
-                <input type="hidden" id="renewedId" name="renewedId" seleType="primary"/>
-                <span id="renewedSchedule" class="c-red"></span>
+                <input type="hidden" id="relationId" name="relationId" seleType="primary"/>
+                <span id="relationSchedule" class="c-red"></span>
             </div>
         </div>
         <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="formControls col-10 col-sm-10">
-                    <div class="update-parts" id="renewedProduct" 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>-->
-
             <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 skin-minimal">
                     <div class="radio-box">
-                        <input type="radio" id="tel-3" name="renewedBackStatus" value="1" seleType="send">
+                        <input type="radio" id="tel-3" name="relationBackStatus" value="1" seleType="send">
                         <label for="tel-3">未寄回</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-4" name="renewedBackStatus" value="2" seleType="send">
+                        <input type="radio" id="tel-4" name="relationBackStatus" value="2" seleType="send">
                         <label for="tel-4">已寄回</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-5" name="renewedBackStatus" value="4" seleType="send">
+                        <input type="radio" id="tel-5" name="relationBackStatus" value="4" seleType="send">
                         <label for="tel-5">签收待确认</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-6" name="renewedBackStatus" value="3" seleType="send">
+                        <input type="radio" id="tel-6" name="relationBackStatus" value="3" seleType="send">
                         <label for="tel-6">已收货</label>
                     </div>
                 </div>
@@ -87,7 +73,7 @@
                 <div class="formControls col-4 col-sm-4">
                     <div style="width: 100%;display: inline-block;margin-right: 10px;">
                         <span class="select-box">
-                                <select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select" seleType="send">
+                                <select name="relationBackLogisticsCompany" id="relationBackLogisticsCompany" class="select" seleType="send">
                                     <option value="">物流公司</option>
                                     <option value="sto">申通快递</option>
                                     <option value="yto">圆通快递</option>
@@ -112,7 +98,7 @@
                 </div>
 
                 <div class="formControls col-4 col-sm-4">
-                    <input style="margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo" seleType="send">
+                    <input style="margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="relationBackLogisticsNo" name="relationBackLogisticsNo" seleType="send">
                     <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage">
                     <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay">-->
                 </div>
@@ -123,10 +109,10 @@
                     <strong>寄件信息</strong>
                 </div>
                 <div class="formControls col-4 col-sm-4">
-                    <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="renewedBackName" name="renewedBackName" seleType="send">
+                    <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="relationBackName" name="relationBackName" seleType="send">
                 </div>
                 <div class="formControls col-4 col-sm-4">
-                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" seleType="send">
+                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="relationBackTel" name="relationBackTel" seleType="send">
                 </div>
             </div>
                 <div class="row cl" style="position: relative;/*display: none;*/">
@@ -134,14 +120,14 @@
                         <strong>仓库签收时间</strong>
                     </div>
                     <div class="formControls col-4 col-sm-4">
-                        <input type="text" placeholder="请选择仓库签收时间" id="renewedBackReceiptDate"  name="renewedBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
+                        <input type="text" placeholder="请选择仓库签收时间" id="relationBackReceiptDate"  name="relationBackReceiptDate" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
                     </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_renewed_info(1);" class="btn btn-primary" type="button">确认修改</button>
+                        <button onClick="update_relation_info(1);" class="btn btn-primary" type="button">确认修改</button>
                     </div>
                 </div>
         </div>
@@ -152,7 +138,7 @@
                 </div>
                 <div class="formControls col-8 col-sm-8 skin-minimal">
                     <div class="radio-box">
-                        <input type="radio" id="tel-6" name="renewedIsTransfer" value="0" seleType="postage">
+                        <input type="radio" id="tel-6" name="relationIsTransfer" value="0" seleType="postage">
                         <label for="tel-6">不需要转账</label>
                     </div>
                     <#--<div class="radio-box">-->
@@ -160,15 +146,15 @@
                         <#--<label for="tel-10">需要转账</label>-->
                     <#--</div>-->
                     <div class="radio-box">
-                        <input type="radio" id="tel-7" name="renewedIsTransfer" value="1" seleType="postage">
+                        <input type="radio" id="tel-7" name="relationIsTransfer" value="1" seleType="postage">
                         <label for="tel-7">已转账</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-8" name="renewedIsTransfer" value="2" seleType="postage">
+                        <input type="radio" id="tel-8" name="relationIsTransfer" value="2" seleType="postage">
                         <label for="tel-8">已申请待转账</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-9" name="renewedIsTransfer" value="3" seleType="postage">
+                        <input type="radio" id="tel-9" name="relationIsTransfer" value="3" seleType="postage">
                         <label for="tel-9">未申请</label>
                     </div>
                 </div>
@@ -179,15 +165,15 @@
                 </div>
                 <div class="formControls col-9 col-sm-9 text-r">
                     <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
-                        <input  type="text" class="input-text" value="" placeholder="寄回邮费" id="renewedBackPostage" name="renewedBackPostage" seleType="postage">
+                        <input  type="text" class="input-text" value="" placeholder="寄回邮费" id="relationBackPostage" name="relationBackPostage" seleType="postage">
                     </div>
 
                     <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
-                        <input  type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay" seleType="postage">
+                        <input  type="text" class="input-text" value="" placeholder="用户支付宝账户" id="relationAlipay" name="relationAlipay" seleType="postage">
                     </div>
 
                     <div class="formControls col-4 col-sm-4 text-r" style="padding-left: 0px;">
-                        <input  type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="renewedAlipayName" name="renewedAlipayName" seleType="postage">
+                        <input  type="text" class="input-text" value="" placeholder="用户支付宝姓名" id="relationAlipayName" name="relationAlipayName" seleType="postage">
                     </div>
                 </div>
             </div>
@@ -196,7 +182,7 @@
                 <div class="formControls col-2 col-sm-2">
                 </div>
                 <div class="formControls col-8 col-sm-8 text-c">
-                    <button onClick="update_renewed_info(2);" class="btn btn-primary" type="button">确认修改</button>
+                    <button onClick="update_relation_info(2);" class="btn btn-primary" type="button">确认修改</button>
                 </div>
             </div>
         </div>
@@ -207,15 +193,15 @@
                 </div>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
-                        <input type="radio" id="tel-10" name="renewedSendStatus" value="1" seleType="sendInformation">
+                        <input type="radio" id="tel-10" name="relationSendStatus" value="1" seleType="sendInformation">
                         <label for="tel-10">未寄出</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-11" name="renewedSendStatus" value="2" seleType="sendInformation">
+                        <input type="radio" id="tel-11" name="relationSendStatus" value="2" seleType="sendInformation">
                         <label for="tel-11">已寄出</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-12" name="renewedSendStatus" value="3" seleType="sendInformation">
+                        <input type="radio" id="tel-12" name="relationSendStatus" value="3" seleType="sendInformation">
                         <label for="tel-12">已收货</label>
                     </div>
                 </div>
@@ -225,7 +211,7 @@
                     <strong>Efast订单号</strong>
                 </div>
                 <div class="formControls col-5 col-sm-5">
-                    <input type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId" seleType="sendInformation">
+                    <input type="text" class="input-text" value="" placeholder="Efast订单号" id="relationBackEfastOrderId" name="relationBackEfastOrderId" seleType="sendInformation">
                 </div>
             </div>
                 <#--<div class="row cl">
@@ -249,10 +235,10 @@
                         <strong>用户信息</strong>
                     </div>
                     <div class="formControls col-5 col-sm-5">
-                        <input type="text" class="input-text" placeholder="填写收件人姓名" id="renewedSendName" name="renewedSendName" seleType="sendInformation">
+                        <input type="text" class="input-text" placeholder="填写收件人姓名" id="relationSendName" name="relationSendName" seleType="sendInformation">
                     </div>
                     <div class="formControls col-5 col-sm-5">
-                        <input type="text" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel" seleType="sendInformation">
+                        <input type="text" class="input-text" placeholder="填写收件人手机号" id="relationSendTel" name="relationSendTel" seleType="sendInformation">
                     </div>
                 </div>
                 <div class="row cl" id="sendAddressInfo">
@@ -281,7 +267,7 @@
                 <div class="row cl" id="sendaddressDescInfo">
                     <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="renewedSendAddress" name="renewedSendAddress" seleType="sendInformation">
+                        <input type="text" class="input-text" placeholder="请填写详细地址" id="relationSendAddress" name="relationSendAddress" seleType="sendInformation">
                     </div>
                 </div>
                 <div class="row cl"  id="sendLogisticsInfo">
@@ -291,7 +277,7 @@
                     <div class="formControls col-10 col-sm-10">
                         <div style="width: 300px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
-				<select name="renewedSendLogisticsCompany" id="renewedSendLogisticsCompany" class="select" seleType="sendInformation">
+				<select name="relationSendLogisticsCompany" id="relationSendLogisticsCompany" class="select" seleType="sendInformation">
 					<option value="">物流公司</option>
                     <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
@@ -312,7 +298,7 @@
 				</select>
 			</span>
                         </div>
-                        <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo" seleType="sendInformation">
+                        <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="relationSendLogisticsNo" name="relationSendLogisticsNo" seleType="sendInformation">
                     </div>
                 </div>
                 <div class="row cl" id="sendDescInfo">
@@ -320,14 +306,14 @@
                         <strong>寄出备注</strong>
                     </div>
                     <div class="formControls col-10 col-sm-10">
-                        <input type="text" class="input-text" placeholder="寄出备注" id="renewedDesc" name="renewedDesc" seleType="sendInformation">
+                        <input type="text" class="input-text" placeholder="寄出备注" id="relationDesc" name="relationDesc" seleType="sendInformation">
                     </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_renewed_info(3);" class="btn btn-primary" type="button">确认修改</button>
+                        <button onClick="update_relation_info(3);" class="btn btn-primary" type="button">确认修改</button>
                     </div>
                 </div>
             </div>
@@ -389,7 +375,7 @@
             radioClass: 'iradio-blue',
             increaseArea: '20%'
         });
-        get_renewed_info();
+        get_cmRelation_info();
         showUpdateSendProduct();
         get_product_type();
         /*/!* 监听寄回状态按钮 *!/
@@ -602,65 +588,65 @@
     }
 
     /*获取换新信息*/
-    function get_renewed_info() {
+    function get_cmRelation_info() {
         $.ajax({
             cache: true,
             type: "POST",
             data: {"customerId":${customerId}},
-            url: "${path}/admin/customer/get_renewed_info",
+            url: "${path}/admin/customer/get_cmRelation_info",
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    var renewed = data.returnMsg.renewed;
-                    console.log(renewed);
+                    var relation = data.returnMsg.cmRelation;
+                    console.log(relation);
                     getProvince('provinceNumber');
-                    getCity('cityNumber',renewed.provinceNumber);
-                    getDistrict('areaNumber',renewed.cityNumber);
-                    var renewedSchedule = '';
-                    switch (renewed.renewedBackStatus) {
-                        case 1:renewedSchedule += '未寄回,';break;
-                        case 2:renewedSchedule += '已寄回,';break;
-                        case 3:renewedSchedule += '已收货,';break;
+                    getCity('cityNumber',relation.provinceNumber);
+                    getDistrict('areaNumber',relation.cityNumber);
+                    var relationSchedule = '';
+                    switch (relation.relationBackStatus) {
+                        case 1:relationSchedule += '未寄回,';break;
+                        case 2:relationSchedule += '已寄回,';break;
+                        case 3:relationSchedule += '已收货,';break;
                     }
-                    switch (renewed.renewedSendStatus) {
-                        case 1:renewedSchedule += '未寄出';break;
-                        case 2:renewedSchedule += '已寄出';break;
-                        case 3:renewedSchedule += '已收货';break;
+                    switch (relation.relationSendStatus) {
+                        case 1:relationSchedule += '未寄出';break;
+                        case 2:relationSchedule += '已寄出';break;
+                        case 3:relationSchedule += '已收货';break;
                     }
 
-                    var renewedProduct = '';
-                    if (renewed.closedProdcues != null && renewed.closedProdcues.length > 0) {
-                        $.each(renewed.closedProdcues,function(index,element){
-                            renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
+                    var relationProduct = '';
+                    if (relation.closedProdcues != null && relation.closedProdcues.length > 0) {
+                        $.each(relation.closedProdcues,function(index,element){
+                            relationProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedProductName + '*' + this.closedProdcueNumber + '台</span>';
                         })
                     }
-                    if (renewed.closedFittings != null && renewed.closedFittings.length > 0) {
-                        $.each(renewed.closedFittings,function(index,element){
-                            renewedProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*' + this.closedFittingNumber + '件</span>';
+                    if (relation.closedFittings != null && relation.closedFittings.length > 0) {
+                        $.each(relation.closedFittings,function(index,element){
+                            relationProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.closedFittingsName + '*' + this.closedFittingNumber + '件</span>';
                         })
                     }
-                    $('#renewedProduct').html(renewedProduct);
+                    $('#relationProduct').html(relationProduct);
                     var sendProduct = '';
-                    if (renewed.sendProdcues != null && renewed.sendProdcues.length > 0) {
-                        $.each(renewed.sendProdcues,function(index,element){
+                    if (relation.sendProdcues != null && relation.sendProdcues.length > 0) {
+                        $.each(relation.sendProdcues,function(index,element){
                             sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendProduceName + '*' + this.sendProdcueNumber + '台</span>';
                         })
                     }
-                    if (renewed.sendFittings != null && renewed.sendFittings.length > 0) {
-                        $.each(renewed.sendFittings,function(index,element){
+                    if (relation.sendFittings != null && relation.sendFittings.length > 0) {
+                        $.each(relation.sendFittings,function(index,element){
                             sendProduct += '<span style="margin-bottom: 10px;display: inline-block;float: left;">'+ this.sendFittingsName + '*' + this.sendFittingNumber + '件</span>';
                         })
                     }
                     $('#sendProduct').html(sendProduct);
 
-                    $('#renewedId').val(renewed.renewedId);
-                    $('input[name="renewedBackStatus"]').each(function(){
-                        if (this.value == renewed.renewedBackStatus) {
+                    $('#relationId').val(relation.relationId);
+                    $('input[name="relationBackStatus"]').each(function(){
+                        if (this.value == relation.relationBackStatus) {
                             $(this).iCheck('check');
                         }
                     });
-                    $('input[name="renewedSendStatus"]').each(function(){
-                        if (this.value == renewed.renewedSendStatus) {
+                    $('input[name="relationSendStatus"]').each(function(){
+                        if (this.value == relation.relationSendStatus) {
                             $(this).iCheck('check');
                         }
                     });
@@ -671,45 +657,38 @@
                     //初始化邮费信息
                     initPostageInfo(renewed.renewedIsTransfer);*/
 
-                    $('#renewedSchedule').html(renewedSchedule);
-                    $("#renewedBackLogisticsCompany option[value='" + renewed.renewedBackLogisticsCompany + "']").attr("selected","true");
-                    $("#renewedSendLogisticsCompany option[value='" + renewed.renewedSendLogisticsCompany + "']").attr("selected","true");
-
-                    $("#provinceNumber option[value='" + renewed.provinceNumber + "']").attr("selected","true");
-                    $("#cityNumber option[value='" + renewed.cityNumber + "']").attr("selected","true");
-                    $("#areaNumber option[value='" + renewed.areaNumber + "']").attr("selected","true");
-                    $('#renewedBackLogisticsNo').val(renewed.renewedBackLogisticsNo);
-                    $('#renewedBackPostage').val(renewed.renewedBackPostage/100);
-                    $('#renewedAlipay').val(renewed.renewedAlipay);
-                    $('#renewedAlipayName').val(renewed.renewedAlipayName);
-                    $('input[name="renewedIsTransfer"]').each(function(){
-                        if (this.value == renewed.renewedIsTransfer) {
+                    $('#relationSchedule').html(relationSchedule);
+                    $("#relationBackLogisticsCompany option[value='" + relation.relationBackLogisticsCompany + "']").attr("selected","true");
+                    $("#relationSendLogisticsCompany option[value='" + relation.relationSendLogisticsCompany + "']").attr("selected","true");
+
+                    $("#provinceNumber option[value='" + relation.provinceNumber + "']").attr("selected","true");
+                    $("#cityNumber option[value='" + relation.cityNumber + "']").attr("selected","true");
+                    $("#areaNumber option[value='" + relation.areaNumber + "']").attr("selected","true");
+                    $('#relationBackLogisticsNo').val(relation.relationBackLogisticsNo);
+                    $('#relationBackPostage').val(relation.relationBackPostage/100);
+                    $('#relationAlipay').val(relation.relationAlipay);
+                    $('#relationAlipayName').val(relation.relationAlipayName);
+                    $('input[name="relationIsTransfer"]').each(function(){
+                        if (this.value == relation.relationIsTransfer) {
                             $(this).iCheck('check');
                         }
                     });
-                    $('#renewedBackName').val(renewed.renewedBackName);
-                    $('#renewedBackTel').val(renewed.renewedBackTel);
+                    $('#relationBackName').val(relation.relationBackName);
+                    $('#relationBackTel').val(relation.relationBackTel);
                     //$('#renewedBackMachineNo').val(renewed.renewedBackMachineNo);
-                    $('#renewedBackEfastOrderId').val(renewed.renewedBackEfastOrderId);
-                    $('#renewedSendName').val(renewed.renewedSendName);
-                    $('#renewedSendTel').val(renewed.renewedSendTel);
-                    $('#renewedSendAddress').val(renewed.renewedSendAddress);
-                    $('#renewedSendLogisticsNo').val(renewed.renewedSendLogisticsNo);
-                    $('#renewedDesc').val(renewed.renewedDesc);
-                    $('#renewedBackReceiptDate').val(formatDate(renewed.renewedBackReceiptDate));
+                    $('#relationBackEfastOrderId').val(relation.relationBackEfastOrderId);
+                    $('#relationSendName').val(relation.relationSendName);
+                    $('#relationSendTel').val(relation.relationSendTel);
+                    $('#relationSendAddress').val(relation.relationSendAddress);
+                    $('#relationSendLogisticsNo').val(relation.relationSendLogisticsNo);
+                    $('#relationDesc').val(relation.relationDesc);
+                    $('#relationBackReceiptDate').val(formatDate(relation.relationBackReceiptDate));
 
                     var detect_table = $('#detect_table');
                     var maintenance_table = $('#maintenance_table');
-                    if (renewed.complaintDetectList != null) {
-                        $.each(renewed.complaintDetectList,function (i,item) {
-                            /*if (i == 0) {
-                                switch (this.detectState) {
-                                    case 1:renewedSchedule += '待仓库转入';break;
-                                    case 2:renewedSchedule += '正在检查';break;
-                                    case 3:renewedSchedule += '检查通过';break;
-                                    case 4:renewedSchedule += '检查未通过';break;
-                                }
-                            }*/
+                    if (relation.complaintDetectList != null) {
+                        $.each(relation.complaintDetectList,function (i,item) {
+
                             var detectRevolutionProducedMsg = "";
                             switch (this.detectRevolutionProduced){
                                 case 1:
@@ -736,7 +715,7 @@
                             maintenance_table.append(maintenance_tr);
                         })
                     }
-                    $('#renewedSchedule').html(renewedSchedule);
+                    $('#relationSchedule').html(relationSchedule);
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){
@@ -768,8 +747,8 @@
         return obj;
     }
     /*修改换新信息*/
-    function update_renewed_info(type) {
-        var renewed_flag = checkRenewed(type);
+    function update_relation_info(type) {
+        var relation_flag = checkRenewed(type);
         //省市县
         var provinceNumber = $("#provinceNumber").find("option:selected").text();
         var cityNumber = $("#cityNumber").find("option:selected").text();
@@ -777,8 +756,8 @@
         $('#merge_address').val(provinceNumber+'-'+cityNumber+'-'+areaNumber);
 
         //寄回邮费
-        var renewedBackPostage = $("#renewedBackPostage").val();
-        $("#renewedBackPostage").val(parseInt(renewedBackPostage*100));
+        var relationBackPostage = $("#relationBackPostage").val();
+        $("#relationBackPostage").val(parseInt(relationBackPostage*100));
         var obj = null;
         if(type == 1){
             obj = getseleType("send");
@@ -787,12 +766,12 @@
         }else if(type ==3){
             obj = getseleType("sendInformation");
         }
-        if (renewed_flag) {
+        if (relation_flag) {
             $.ajax({
                 cache: true,
                 type: "POST",
                 data: obj,
-                url: "${path}/admin/customer/update_renewed_info",
+                url: "${path}/admin/customer/update_cmRelation_info",
                 async: false,
                 success: function(data){
                     if (data.returnCode == 200) {
@@ -815,14 +794,14 @@
 
     /*校验换新填写信息*/
     function checkRenewed(type) {
-        var renewed_flag = true;
-        var renewedBackLogisticsNo = $('#renewedBackLogisticsNo').val().trim();//寄回物流单号
-        var renewedBackLogisticsCompany = $("#renewedBackLogisticsCompany option:selected").val();//寄回物流公司
-        var renewedBackName = $('#renewedBackName').val();//寄件人姓名
-        var renewedBackTel = $('#renewedBackTel').val();//寄件人电话
+        var relation_flag = true;
+        var relationBackLogisticsNo = $('#relationBackLogisticsNo').val().trim();//寄回物流单号
+        var relationBackLogisticsCompany = $("#relationBackLogisticsCompany option:selected").val();//寄回物流公司
+        var relationBackName = $('#relationBackName').val();//寄件人姓名
+        var relationBackTel = $('#relationBackTel').val();//寄件人电话
         if(type == 1){
-            var renewedBackStatus = $('input[name="renewedBackStatus"]:checked').val();//寄回状态
-            if (renewedBackStatus == 1) {
+            var relationBackStatus = $('input[name="relationBackStatus"]:checked').val();//寄回状态
+            if (relationBackStatus == 1) {
 //            if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
 //                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
 //                renewed_flag = false;
@@ -848,47 +827,47 @@
 //                renewed_flag = false;
 //                return renewed_flag;
 //            }
-            } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
-                if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
+            } else if (relationBackStatus == 2 || relationBackStatus == 3) {
+                if (relationBackLogisticsNo == null || relationBackLogisticsNo == '') {
                     layer.msg("物流单号不能为空!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
-                if (renewedBackLogisticsCompany == null || renewedBackLogisticsCompany == '') {
+                if (relationBackLogisticsCompany == null || relationBackLogisticsCompany == '') {
                     layer.msg("请选择物流公司!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
 //                if (!uname.test(renewedBackName)) {
 //                    layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
 //                    renewed_flag = false;
 //                    return renewed_flag;
 //                }
-                if (!mobile.test(renewedBackTel)) {
+                if (!mobile.test(relationBackTel)) {
                     layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
             }
-            if (renewedBackStatus == 3) {
-                var renewedBackReceiptDate = $('#renewedBackReceiptDate').val();//仓库签收时间
-                if (renewedBackReceiptDate == null || renewedBackReceiptDate == '') {
+            if (relationBackStatus == 3) {
+                var relationBackReceiptDate = $('#relationBackReceiptDate').val();//仓库签收时间
+                if (relationBackReceiptDate == null || relationBackReceiptDate == '') {
                     layer.msg("仓库签收时间不能为空",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
             }
         }else if(type == 2){
-            var renewedIsTransfer = $('input[name="renewedIsTransfer"]:checked').val();
-            var renewedBackPostage = $('#renewedBackPostage').val().trim();//寄回邮费
-            var renewedAlipay = $('#renewedAlipay').val().trim();//支付宝账户
-            var renewedAlipayName = $('#renewedAlipayName').val().trim();//支付宝账户姓名
+            var relationIsTransfer = $('input[name="relationIsTransfer"]:checked').val();
+            var relationBackPostage = $('#relationBackPostage').val().trim();//寄回邮费
+            var relationAlipay = $('#relationAlipay').val().trim();//支付宝账户
+            var relationAlipayName = $('#relationAlipayName').val().trim();//支付宝账户姓名
 
-            if(renewedIsTransfer == 1){
-                if (!money.test(renewedBackPostage)) {
+            if(relationIsTransfer == 1){
+                if (!money.test(relationBackPostage)) {
                     layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
 //                if (!money.test(renewedAlipay)) {
 //                    layer.msg("支付宝账户格式不正确，请重新输入!",{icon: 5,time:1000});
@@ -902,18 +881,18 @@
 //                }
             }
         }else if(type == 3){
-            var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态
-            var renewedSendLogisticsCompany = $('#renewedSendLogisticsCompany').val();//寄出物流公司
-            var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
+            var relationSendStatus = $('input[name="relationSendStatus"]:checked').val();//寄回状态
+            var relationSendLogisticsCompany = $('#relationSendLogisticsCompany').val();//寄出物流公司
+            var relationSendLogisticsNo = $('#relationSendLogisticsNo').val();//寄出物流单号
 
-            if (renewedSendStatus == 1) {
-                var repairBackStatus = $('input[name="repairBackStatus"]:checked').val();//寄回状态
+            if (relationSendStatus == 1) {
+                var relationBackStatus = $('input[name="relationBackStatus"]:checked').val();//寄回状态
                 if (productType != 2) {
-                    var renewedBackEfastOrderId = $('#renewedBackEfastOrderId').val();//efast订单号
-                    if (renewedBackEfastOrderId == null || renewedBackEfastOrderId == '') {
+                    var relationBackEfastOrderId = $('#relationBackEfastOrderId').val();//efast订单号
+                    if (relationBackEfastOrderId == null || relationBackEfastOrderId == '') {
                         layer.msg("Efast订单号不能为空!", {icon: 5, time: 1000});
-                        renewed_flag = false;
-                        return renewed_flag;
+                        relation_flag = false;
+                        return relation_flag;
                     }
                 }
 //            if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
@@ -926,38 +905,38 @@
 //                renewed_flag = false;
 //                return renewed_flag;
 //            }
-            } else if (renewedSendStatus == 2 || renewedSendStatus == 3) {
-                if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
+            } else if (relationSendStatus == 2 || relationSendStatus == 3) {
+                if (relationSendLogisticsCompany == null || relationSendLogisticsCompany == '') {
                     layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
-                    renewed_flag = false;
+                    relation_flag = false;
                     return renewed_flag;
                 }
-                if (renewedSendLogisticsNo == null || renewedSendLogisticsNo == '') {
+                if (relationSendLogisticsNo == null || relationSendLogisticsNo == '') {
                     layer.msg("请填写物流单号!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
-                var renewedSendTel = $('#renewedSendTel').val();//收件人电话
+                var relationSendTel = $('#relationSendTel').val();//收件人电话
                 if (!mobile.test(renewedSendTel)) {
                     layer.msg("收件人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
-                var renewedSendName = $('#renewedSendName').val();//收件人姓名
-                if (renewedSendName == null || renewedSendName == '') {
+                var relationSendName = $('#relationSendName').val();//收件人姓名
+                if (relationSendName == null || relationSendName == '') {
                     layer.msg("收件人姓名格式不正确，请重新输入!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
-                var renewedSendAddress = $('#renewedSendAddress').val();
-                if (renewedSendAddress == null || renewedSendAddress == '') {
+                var relationSendAddress = $('#relationSendAddress').val();
+                if (relationSendAddress == null || relationSendAddress == '') {
                     layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
+                    relation_flag = false;
+                    return relation_flag;
                 }
             }
         }
-        return renewed_flag;
+        return relation_flag;
     }
 
     /**