添加了换新处理

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

@@ -14,6 +14,16 @@ public class ClosedFitting  implements Serializable {
 
     private Integer closedFittingNumber;
 
+    private String fittingName;     //配件名称
+
+    public String getFittingName() {
+        return fittingName;
+    }
+
+    public void setFittingName(String fittingName) {
+        this.fittingName = fittingName;
+    }
+
     public Integer getClosedFittingId() {
         return closedFittingId;
     }

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

@@ -24,11 +24,11 @@ public class Reissue  implements Serializable {
     //  寄送人电话 
     private String reissueSendTel;
     //  寄送地址-省 
-    private String provinceNumber;
+    private Integer provinceNumber;
     //  寄送地址-市 
-    private String cityNumber;
+    private Integer cityNumber;
     //  寄送地址-区 
-    private String areaNumber;
+    private Integer areaNumber;
     //  寄送地址-省市区 
     private String reissueSendMergeAddress;
     //  寄送地址-详细地址 
@@ -103,27 +103,27 @@ public class Reissue  implements Serializable {
         this.reissueSendTel = reissueSendTel;
     }
 
-    public String getProvinceNumber() {
+    public Integer getProvinceNumber() {
         return provinceNumber;
     }
 
-    public void setProvinceNumber(String provinceNumber) {
+    public void setProvinceNumber(Integer provinceNumber) {
         this.provinceNumber = provinceNumber;
     }
 
-    public String getCityNumber() {
+    public Integer getCityNumber() {
         return cityNumber;
     }
 
-    public void setCityNumber(String cityNumber) {
+    public void setCityNumber(Integer cityNumber) {
         this.cityNumber = cityNumber;
     }
 
-    public String getAreaNumber() {
+    public Integer getAreaNumber() {
         return areaNumber;
     }
 
-    public void setAreaNumber(String areaNumber) {
+    public void setAreaNumber(Integer areaNumber) {
         this.areaNumber = areaNumber;
     }
 

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

@@ -1,7 +1,9 @@
 package com.iamberry.rst.core.cm;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 售后换新主键
@@ -41,11 +43,11 @@ public class Renewed  implements Serializable {
      //寄送人电话 
     private String renewedSendTel;
      //寄送地址-省 
-    private String provinceNumber;
+    private Integer provinceNumber;
      //寄送地址-市 
-    private String cityNumber;
+    private Integer cityNumber;
      //寄送地址-区 
-    private String areaNumber;
+    private Integer areaNumber;
      //寄送地址-省市区 
     private String renewedSendMergeAddress;
      //寄送地址-详细地址 
@@ -67,8 +69,132 @@ public class Renewed  implements Serializable {
     // 修改时间,
     private Date renewedUpdateTime;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    private String detectPhenomenon;            //工厂检测现象
+    private String detectFailureClassification; //故障分类
+    private String detectFailureCause;          //故障原因
+    private String detectResults;               //判定结果
+    private String detectPoint;                 //故障指向
+    private String detectAnalysis;              //原因分析
+    private Integer detectRevolutionProduced;   //是否转入生产部门
+    private Integer maintenanceIdRepair;        //是否可返修
+    private String maintenanceContent;          //返修内容
+    private Date maintenanceContentDate;        //返修日期
+    private Integer closedProdcueNumber;        //寄回产品数量
+    private String productName;                 //产品名称
+    private Integer detectState;                //品质检测状态
+
+    public Integer getDetectState() {
+        return detectState;
+    }
+
+    public void setDetectState(Integer detectState) {
+        this.detectState = detectState;
+    }
+
+    private List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();//寄回配件集合
+
+    public Integer getClosedProdcueNumber() {
+        return closedProdcueNumber;
+    }
+
+    public void setClosedProdcueNumber(Integer closedProdcueNumber) {
+        this.closedProdcueNumber = closedProdcueNumber;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public List<ClosedFitting> getClosedFittings() {
+        return closedFittings;
+    }
+
+    public void setClosedFittings(List<ClosedFitting> closedFittings) {
+        this.closedFittings = closedFittings;
+    }
+
+    public String getDetectPhenomenon() {
+        return detectPhenomenon;
+    }
+
+    public void setDetectPhenomenon(String detectPhenomenon) {
+        this.detectPhenomenon = detectPhenomenon;
+    }
+
+    public String getDetectFailureClassification() {
+        return detectFailureClassification;
+    }
+
+    public void setDetectFailureClassification(String detectFailureClassification) {
+        this.detectFailureClassification = detectFailureClassification;
+    }
+
+    public String getDetectFailureCause() {
+        return detectFailureCause;
+    }
+
+    public void setDetectFailureCause(String detectFailureCause) {
+        this.detectFailureCause = detectFailureCause;
+    }
+
+    public String getDetectResults() {
+        return detectResults;
+    }
+
+    public void setDetectResults(String detectResults) {
+        this.detectResults = detectResults;
+    }
+
+    public String getDetectPoint() {
+        return detectPoint;
+    }
+
+    public void setDetectPoint(String detectPoint) {
+        this.detectPoint = detectPoint;
+    }
+
+    public String getDetectAnalysis() {
+        return detectAnalysis;
+    }
+
+    public void setDetectAnalysis(String detectAnalysis) {
+        this.detectAnalysis = detectAnalysis;
+    }
+
+    public Integer getDetectRevolutionProduced() {
+        return detectRevolutionProduced;
+    }
+
+    public void setDetectRevolutionProduced(Integer detectRevolutionProduced) {
+        this.detectRevolutionProduced = detectRevolutionProduced;
+    }
+
+    public Integer getMaintenanceIdRepair() {
+        return maintenanceIdRepair;
+    }
+
+    public void setMaintenanceIdRepair(Integer maintenanceIdRepair) {
+        this.maintenanceIdRepair = maintenanceIdRepair;
+    }
+
+    public String getMaintenanceContent() {
+        return maintenanceContent;
+    }
+
+    public void setMaintenanceContent(String maintenanceContent) {
+        this.maintenanceContent = maintenanceContent;
+    }
+
+    public Date getMaintenanceContentDate() {
+        return maintenanceContentDate;
+    }
+
+    public void setMaintenanceContentDate(Date maintenanceContentDate) {
+        this.maintenanceContentDate = maintenanceContentDate;
     }
 
     public Integer getRenewedId() {
@@ -191,38 +317,38 @@ public class Renewed  implements Serializable {
         this.renewedSendTel = renewedSendTel;
     }
 
-    public String getProvinceNumber() {
+    public String getRenewedSendMergeAddress() {
+        return renewedSendMergeAddress;
+    }
+
+    public void setRenewedSendMergeAddress(String renewedSendMergeAddress) {
+        this.renewedSendMergeAddress = renewedSendMergeAddress;
+    }
+
+    public Integer getProvinceNumber() {
         return provinceNumber;
     }
 
-    public void setProvinceNumber(String provinceNumber) {
+    public void setProvinceNumber(Integer provinceNumber) {
         this.provinceNumber = provinceNumber;
     }
 
-    public String getCityNumber() {
+    public Integer getCityNumber() {
         return cityNumber;
     }
 
-    public void setCityNumber(String cityNumber) {
+    public void setCityNumber(Integer cityNumber) {
         this.cityNumber = cityNumber;
     }
 
-    public String getAreaNumber() {
+    public Integer getAreaNumber() {
         return areaNumber;
     }
 
-    public void setAreaNumber(String areaNumber) {
+    public void setAreaNumber(Integer areaNumber) {
         this.areaNumber = areaNumber;
     }
 
-    public String getRenewedSendMergeAddress() {
-        return renewedSendMergeAddress;
-    }
-
-    public void setRenewedSendMergeAddress(String renewedSendMergeAddress) {
-        this.renewedSendMergeAddress = renewedSendMergeAddress;
-    }
-
     public String getRenewedSendAddress() {
         return renewedSendAddress;
     }

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

@@ -41,11 +41,11 @@ public class Repair  implements Serializable {
     //  寄送人电话 
     private String repairSendTel;
     //  寄送地址-省 
-    private String provinceNumber;
+    private Integer provinceNumber;
     //  寄送地址-市 
-    private String cityNumber;
+    private Integer cityNumber;
     //  寄送地址-区 
-    private String areaNumber;
+    private Integer areaNumber;
     //  寄送地址-省市区 
     private String repairSendMergeAddress;
     //  寄送地址-详细地址 
@@ -187,27 +187,27 @@ public class Repair  implements Serializable {
         this.repairSendTel = repairSendTel;
     }
 
-    public String getProvinceNumber() {
+    public Integer getProvinceNumber() {
         return provinceNumber;
     }
 
-    public void setProvinceNumber(String provinceNumber) {
+    public void setProvinceNumber(Integer provinceNumber) {
         this.provinceNumber = provinceNumber;
     }
 
-    public String getCityNumber() {
+    public Integer getCityNumber() {
         return cityNumber;
     }
 
-    public void setCityNumber(String cityNumber) {
+    public void setCityNumber(Integer cityNumber) {
         this.cityNumber = cityNumber;
     }
 
-    public String getAreaNumber() {
+    public Integer getAreaNumber() {
         return areaNumber;
     }
 
-    public void setAreaNumber(String areaNumber) {
+    public void setAreaNumber(Integer areaNumber) {
         this.areaNumber = areaNumber;
     }
 

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

@@ -0,0 +1,27 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.ClosedFitting;
+import com.iamberry.rst.core.cm.Renewed;
+
+import java.util.List;
+
+/**
+ * 换新service
+ * Created by liuzhiwei on 2017/11/7.
+ */
+public interface RenewedService {
+
+    /**
+     * 获取换新详情和品质检测信息
+     * @param renewed
+     * @return
+     */
+    Renewed getRenewedInfo(Renewed renewed);
+
+    /**
+     * 获取寄回配件集合
+     * @param closedFitting
+     * @return
+     */
+    List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting);
+}

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

@@ -0,0 +1,31 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.ClosedFitting;
+import com.iamberry.rst.core.cm.Renewed;
+import com.iamberry.rst.faces.cm.RenewedService;
+import com.iamberry.rst.service.cm.mapper.RenewedMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 换新service
+ * Created by liuzhiwei on 2017/11/7.
+ */
+@Service
+public class RenewedServiceImpl implements RenewedService {
+
+    @Autowired
+    private RenewedMapper renewedMapper;
+
+    @Override
+    public Renewed getRenewedInfo(Renewed renewed) {
+        return renewedMapper.getRenewedInfo(renewed);
+    }
+
+    @Override
+    public List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting) {
+        return renewedMapper.listClosedFitting(closedFitting);
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.cm.mapper;
 
+import com.iamberry.rst.core.cm.ClosedFitting;
 import com.iamberry.rst.core.cm.Renewed;
 
 import java.util.List;
@@ -11,8 +12,6 @@ public interface RenewedMapper {
 
     int insertSelective(Renewed record);
 
-    Renewed selectByPrimaryKey(Integer renewedId);
-
     int updateByPrimaryKeySelective(Renewed record);
 
     int updateByPrimaryKey(Renewed record);
@@ -23,4 +22,18 @@ public interface RenewedMapper {
      * @return
      */
     List<Renewed> listRenewed(Renewed renewed);
+
+    /**
+     * 获取换新详情和品质检测信息
+     * @param renewed
+     * @return
+     */
+    Renewed getRenewedInfo(Renewed renewed);
+
+    /**
+     * 获取寄回配件集合
+     * @param closedFitting
+     * @return
+     */
+    List<ClosedFitting> listClosedFitting(ClosedFitting closedFitting);
 }

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

@@ -40,11 +40,56 @@
     renewed_desc, renewed_state, renewed_alipay, renewed_is_transfer, renewed_create_time, 
     renewed_update_time
   </sql>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from tb_rst_renewed
-    where renewed_id = #{renewedId,jdbcType=INTEGER}
+
+  <!-- 获取换新详情和品质检测信息 -->
+  <select id="getRenewedInfo" parameterType="Renewed" resultType="Renewed">
+    select
+      r.*,
+      d.detect_state detectState,
+      d.detect_phenomenon detectPhenomenon,
+      d.detect_failure_classification detectFailureClassification,
+      d.detect_failure_cause detectFailureCause,
+      d.detect_results detectResults,
+      d.detect_point detectPoint,
+      d.detect_analysis detectAnalysis,
+      d.detect_revolution_produced detectRevolutionProduced,
+      m.maintenance_id_repair maintenanceIdRepair,
+      m.maintenance_content maintenanceContent,
+      m.maintenance_content_date maintenanceContentDate,
+      p.closed_prodcue_number closedProdcueNumber,
+      pi.product_name productName
+    from
+      tb_rst_renewed r
+    LEFT JOIN tb_rst_complaint_detect d ON r.customer_id = d.customer_id
+    LEFT JOIN tb_rst_complaint_maintenance m ON d.detect_id = m.detect_id
+    LEFT JOIN tb_rst_closed_prodcue p ON p.relation_id = r.renewed_id
+    LEFT JOIN tb_rst_product_info pi ON p.product_id = pi.product_id
+    <where>
+      <if test="renewedId != null and renewedId != ''">
+        renewed_id = #{renewedId}
+      </if>
+      <if test="customerId != null and customerId != ''">
+        and r.customer_id = #{customerId}
+      </if>
+      <if test="renewedState != null and renewedState != ''">
+        and r.renewed_state = #{renewedState}
+      </if>
+    </where>
+  </select>
+
+  <!-- 获取寄回配件集合 -->
+  <select id="listClosedFitting" parameterType="ClosedFitting" resultType="ClosedFitting">
+    select
+      cf.closed_fitting_number closedFittingNumber,
+      pf.fittings_name fittingName
+    from
+      tb_rst_closed_fitting cf
+    LEFT JOIN tb_rst_product_fittings pf ON cf.fittings_id = pf.fittings_id
+    <where>
+      <if test="relationId != null and relationId != ''">
+        relation_id = #{relationId}
+      </if>
+    </where>
   </select>
 
   <!-- 查询售后换新集合 -->

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

@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import java.util.Date;
 import java.util.List;
 
@@ -52,6 +51,8 @@ public class AdminCustomerController {
     private VisitService visitService;
     @Autowired
     private QuestionDescribeService questionDescribeService;
+    @Autowired
+    private RenewedService renewedService;
 
     /**
      * 获取客诉列表
@@ -380,5 +381,39 @@ public class AdminCustomerController {
         rj.addResponseKeyValue("describe", describe);
         return rj;
     }
+
+    /**
+     * 获取换新详情
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:get:renewed")
+    @RequestMapping("/get_renewed_info")
+    public ResponseJson getRenewedInfo(HttpServletRequest request) {
+        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);
+        //获取换新详情和检测信息
+        renewed = renewedService.getRenewedInfo(renewed);
+        if (renewed == null) {
+            return new ResponseJson(500, "该客诉没有换新信息!", 500);
+        } else {
+            ClosedFitting closedFitting = new ClosedFitting();
+            closedFitting.setRelationId(renewed.getRenewedId());
+            //获取寄回配件集合
+            List<ClosedFitting> fittingList = renewedService.listClosedFitting(closedFitting);
+            if (fittingList != null && fittingList.size() > 0) {
+                renewed.setClosedFittings(fittingList);
+            }
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("renewed", renewed);
+            return rj;
+        }
+    }
 }
 

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

@@ -18,6 +18,7 @@
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .barcodeImg{margin:10px 0px}
         .table-bg thead th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}*/
     </style>
@@ -205,7 +206,193 @@
 				<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="hide_this(this)" href="javascript:;"></a>
 		</span>
         </div>
-        <!-- 查看已完成回访内容end -->
+        <!-- 查看问题描述内容end -->
+        <!-- 换新处理start -->
+        <div class="layui-layer layui-anim layui-layer-iframe" id="update-renewed-info" times="4" showtime="0" contype="string" style="display:none;z-index: 19891018; width: 700px; height: 700px; position: absolute; top: 100px; left: 250px;text-align: left;">
+            <form action="" name="form-visit-finish" method="post" class="form form-horizontal" id="form-visit-finish">
+                <div class="layui-layer-title" id="synOrder" style="cursor: move;" move="ok">换新处理</div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;当前进度：</label>
+                        <label id="renewedSchedule"></label>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls renewed_back_status">
+                        <label><span class="c-red">*</span>&nbsp;客户已寄回：</label>
+                        <input type="radio" name="renewedBackStatus" value="1"/><label>未寄回&nbsp;&nbsp;</label>
+                        <input type="radio" name="renewedBackStatus" value="2"/><label>已寄回&nbsp;&nbsp;</label>
+                        <input type="radio" name="renewedBackStatus" value="3"/><label>已收货&nbsp;&nbsp;</label>
+                    </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;寄回物流：</label>
+                        <select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" style="height: 30px;width: 100px;">
+                            <option value="sto">申通快递</option>
+                            <option value="yto">圆通快递</option>
+                            <option value="sf">顺丰快递</option>
+                            <option value="ems">邮政EMS</option>
+                            <option value="zto">中通快递</option>
+                            <option value="zjs">宅急送</option>
+                            <option value="yunda">韵达快递</option>
+                            <option value="cces">cces快递</option>
+                            <option value="pick">上门提货</option>
+                            <option value="htky">汇通快递</option>
+                            <option value="ttkdex">天天快递</option>
+                            <option value="stars">星晨急便</option>
+                            <option value="jd">京东快递</option>
+                            <option value="01">其他</option>
+                            <option value="02">上门送货</option>
+                        </select>
+                        <input type="text" id="renewedBackLogisticsNo" class="input-text" value="" style="width: 150px;" name="renewedBackLogisticsNo">
+                        <input type="text" id="renewedBackPostage" class="input-text" value="" style="width: 150px;" name="renewedBackPostage">
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;寄回信息：</label>
+                        <input type="text" id="renewedBackName" class="input-text" value="" style="width: 150px;" name="renewedBackName">
+                        <input type="text" id="renewedBackTel" class="input-text" value="" style="width: 150px;" name="renewedBackTel">
+                        <input type="text" id="renewedBackMachineNo" class="input-text" value="" style="width: 150px;" name="renewedBackMachineNo">
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;寄送产品：</label>
+                        <div id="renewedProduct" class="update-parts"></div>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <hr/>
+                <div style="margin-left: 10px;">
+                    <div class="formControls renewed_send_status" style="margin-top: 10px;">
+                        <label>是否已寄送：</label>
+                        <input type="radio" name="renewedSendStatus" value="1"/><label>未寄出&nbsp;&nbsp;</label>
+                        <input type="radio" name="renewedSendStatus" value="2"/><label>已寄出&nbsp;&nbsp;</label>
+                        <input type="radio" name="renewedSendStatus" value="3"/><label>已收货&nbsp;&nbsp;</label>
+                        <label>Efast订单号：</label>
+                        <label id="renewedBackEfastOrderId"></label>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;用户地址：</label>
+                        <input type="text" id="renewedSendName" class="input-text" value="" style="width: 150px;" name="renewedSendName">
+                        <input type="text" id="renewedSendTel" class="input-text" value="" style="width: 150px;" name="renewedSendTel">
+                    </div>
+                    <div class="formControls">
+                        <select id="provinceNumber" name="provinceNumber" style="height: 30px;width: 100px;" onchange=""></select>
+                        <select id="cityNumber" name="cityNumber" style="height: 30px;width: 100px;" onchange=""></select>
+                        <select id="areaNumber" name="areaNumber" style="height: 30px;width: 100px;" onchange=""></select>
+                    </div>
+                    <div class="formControls">
+                        <textarea id="renewedSendAddress" name="renewedSendAddress" cols="" rows="" style="width: 500px;height: 70px;" class="textarea" ></textarea>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;寄出物流：</label>
+                        <select name="renewedSendLogisticsCompany" id="renewedSendLogisticsCompany" style="height: 30px;width: 100px;">
+                            <option value="sto">申通快递</option>
+                            <option value="yto">圆通快递</option>
+                            <option value="sf">顺丰快递</option>
+                            <option value="ems">邮政EMS</option>
+                            <option value="zto">中通快递</option>
+                            <option value="zjs">宅急送</option>
+                            <option value="yunda">韵达快递</option>
+                            <option value="cces">cces快递</option>
+                            <option value="pick">上门提货</option>
+                            <option value="htky">汇通快递</option>
+                            <option value="ttkdex">天天快递</option>
+                            <option value="stars">星晨急便</option>
+                            <option value="jd">京东快递</option>
+                            <option value="01">其他</option>
+                            <option value="02">上门送货</option>
+                        </select>
+                        <input type="text" id="renewedSendLogisticsNo" class="input-text" value="" style="width: 150px;" name="renewedSendLogisticsNo">
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;备注：</label>
+                        <input type="text" id="renewedDesc" class="input-text" value="" style="width: 150px;" name="renewedDesc">
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <hr/>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;QC进度：</label>
+                        <div>
+                            <table class="table table-border table-bordered table-bg table-hover table-sort">
+                                <tr>
+                                    <th>工厂检测现象</th>
+                                    <th>故障分类</th>
+                                    <th>故障原因</th>
+                                    <th>判定结果</th>
+                                    <th>故障指向</th>
+                                    <th>原因分析</th>
+                                    <th>生产维修</th>
+                                </tr>
+                                <tr>
+                                    <td id="detectPhenomenon"></td>
+                                    <td id="detectFailureClassification"></td>
+                                    <td id="detectFailureCause"></td>
+                                    <td id="detectResults"></td>
+                                    <td id="detectPoint"></td>
+                                    <td id="detectAnalysis"></td>
+                                    <td id="detectRevolutionProduced"></td>
+                                </tr>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label><span class="c-red">*</span>&nbsp;返修进度：</label>
+                        <div>
+                            <table class="table table-border table-bordered table-bg table-hover table-sort">
+                                <tr>
+                                    <th>是否可返修</th>
+                                    <th>返修内容</th>
+                                    <th>返修日期</th>
+                                </tr>
+                                <tr>
+                                    <td id="maintenanceIdRepair"></td>
+                                    <td id="maintenanceContent"></td>
+                                    <td id="maintenanceContentDate"></td>
+                                </tr>
+                            </table>
+                        </div>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div style="margin-left: 10px;">
+                    <div class="formControls" style="margin-top: 10px;">
+                        <label>
+                            寄送产品将自动推送Efast，系统自动获取物流信息，并更新。<br/>
+                            如果在Efast作废订单等操作后，无法获取物流信息，请手动填写物流信息。
+                        </label>
+                    </div>
+                    <div class="col-4"> </div>
+                </div>
+                <div class="col-9 col-offset-3">
+                    <input class="btn btn-primary radius" onclick="updateVisitInfo();" type="button" value="&nbsp;&nbsp;确认&nbsp;&nbsp;">
+                </div>
+            </form>
+            <span class="layui-layer-setwin">
+				<a class="layui-layer-ico layui-layer-close layui-layer-close1" onclick="hide_this(this)" href="javascript:;"></a>
+		</span>
+        </div>
+        <!-- 换新处理start -->
         <form action="${path}/admin/customer/select_customer_list" method="post">
             <button type="button" style="cursor:pointer; float: left;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
             <input type="text" class="my-input"  style="width:100px;margin-right: 0px;" value="${customerId!}" placeholder="客户姓名" id="customerName" name="customerName">
@@ -309,29 +496,31 @@
                                     未解决
                                 <#elseif customer.customerIsSolve == 3>
                                     换新(
-                                    <#if customer.backStatus == 1>
-                                        未寄回
-                                    <#elseif customer.backStatus == 2>
-                                        已寄回
-                                    <#elseif customer.backStatus == 3>
-                                        已收货
-                                    </#if>,
-                                    <#if customer.sendStatus == 1>
-                                        未寄送
-                                    <#elseif customer.sendStatus == 2>
-                                        已寄送
-                                    <#elseif customer.sendStatus == 3>
-                                        已收货
-                                    </#if>,
-                                    <#if customer.detectState == 1>
-                                        待仓库转入
-                                    <#elseif customer.detectState == 2>
-                                        正在检查
-                                    <#elseif customer.detectState == 3>
-                                        检查通过
-                                    <#elseif customer.detectState == 4>
-                                        检查未通过
-                                    </#if>
+                                    <a style="text-decoration:none" href="javascript:void(0);" onclick="get_renewed_info(${customer.customerId!''})">
+                                        <#if customer.backStatus == 1>
+                                            未寄回
+                                        <#elseif customer.backStatus == 2>
+                                            已寄回
+                                        <#elseif customer.backStatus == 3>
+                                            已收货
+                                        </#if>,
+                                        <#if customer.sendStatus == 1>
+                                            未寄送
+                                        <#elseif customer.sendStatus == 2>
+                                            已寄送
+                                        <#elseif customer.sendStatus == 3>
+                                            已收货
+                                        </#if>,
+                                        <#if customer.detectState == 1>
+                                            待仓库转入
+                                        <#elseif customer.detectState == 2>
+                                            正在检查
+                                        <#elseif customer.detectState == 3>
+                                            检查通过
+                                        <#elseif customer.detectState == 4>
+                                            检查未通过
+                                        </#if>
+                                    </a>
                                     )
                                 <#elseif customer.customerIsSolve == 4>
                                     维修(
@@ -430,9 +619,9 @@
                                         </a>&nbsp;
                                     </#if>
                                 </#if>
-                                <a style="text-decoration:none" href="javascript:void(0);" title="修改客诉信息" onclick="admin_update_customer(${customer.customerId!''})">
+                                <#--<a style="text-decoration:none" href="javascript:void(0);" title="修改客诉信息" onclick="admin_update_customer(${customer.customerId!''})">
                                     <i class="Hui-iconfont">修改客诉信息</i>
-                                </a>&nbsp;
+                                </a>&nbsp;-->
                                 <#if customer.customerIsVisit == "1">
                                     <a style="text-decoration:none" href="javascript:void(0)" title="需要回访" onclick="showVisit(${customer.customerId!''})">
                                         <i class="Hui-iconfont">需要回访</i>
@@ -668,6 +857,147 @@
         });
     }
 
+    function get_renewed_info(customerId) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":customerId},
+            url: "${path}/admin/customer/get_renewed_info",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+
+                    var renewed = data.returnMsg.renewed;
+
+                    getProvince();
+                    getCity(renewed.provinceNumber);
+                    getDistrict(renewed.cityNumber);
+                    console.log(renewed);
+                    var renewedSchedule = '';
+                    switch (renewed.renewedBackStatus) {
+                        case 1:renewedSchedule += '待寄回,';break;
+                        case 2:renewedSchedule += '已寄回,';break;
+                        case 3:renewedSchedule += '已收货,';break;
+                    }
+                    switch (renewed.renewedSendStatus) {
+                        case 1:renewedSchedule += '待寄送,';break;
+                        case 2:renewedSchedule += '已寄送,';break;
+                        case 3:renewedSchedule += '已收货,';break;
+                    }
+                    switch (renewed.detectState) {
+                        case 1:renewedSchedule += '待仓库转入';break;
+                        case 2:renewedSchedule += '正在检查';break;
+                        case 3:renewedSchedule += '检查通过';break;
+                        case 3:renewedSchedule += '检查未通过';break;
+                    }
+                    var renewedProduct = '';
+                    if (renewed.productName != null && renewed.productName != '') {
+                        renewedProduct += '<span>'+ renewed.productName + '*' + renewed.closedProdcueNumber + '</span>';
+                    }
+                    if (renewed.closedFittings != null && renewed.length > 0) {
+                        $.each(renewed.closedFittings,function(index,element){
+                            renewedProduct += '<span>'+ this.fittingName + '*' + this.closedFittingNumber + '</span>';
+                        })
+                    }
+                    $(".renewed_back_status input[value='"+ renewed.renewedBackStatus +"']").attr("checked",true);
+                    $(".renewed_send_status input[value='"+ renewed.renewedSendStatus +"']").attr("checked",true);
+                    $('#renewedSchedule').html(renewedSchedule);
+                    $('#renewedProduct').val(renewedProduct);
+                    $("#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);
+                    $('#renewedBackName').val(renewed.renewedBackName);
+                    $('#renewedBackTel').val(renewed.renewedBackTel);
+                    $('#renewedBackMachineNo').val(renewed.renewedBackMachineNo);
+                    $('#renewedBackEfastOrderId').html(renewed.renewedBackEfastOrderId);
+                    $('#renewedSendName').val(renewed.renewedSendName);
+                    $('#renewedSendTel').val(renewed.renewedSendTel);
+                    $('#renewedSendAddress').val(renewed.renewedSendAddress);
+                    $('#renewedSendLogisticsNo').val(renewed.renewedSendLogisticsNo);
+                    $('#renewedDesc').val(renewed.renewedDesc);
+                    $('#detectPhenomenon').val(renewed.detectPhenomenon);
+                    $('#detectFailureClassification').val(renewed.detectFailureClassification);
+                    $('#detectFailureCause').val(renewed.detectFailureCause);
+                    $('#detectResults').val(renewed.detectResults);
+                    $('#detectPoint').val(renewed.detectPoint);
+                    $('#detectAnalysis').val(renewed.detectAnalysis);
+                    $('#detectRevolutionProduced').val(renewed.detectRevolutionProduced);
+                    $('#maintenanceIdRepair').val(renewed.maintenanceIdRepair);
+                    $('#maintenanceContent').val(renewed.maintenanceContent);
+                    $('#maintenanceContentDate').val(renewed.maintenanceContentDate);
+                    $('#update-renewed-info').show();
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
+
+    /**
+     * 获取省
+     */
+    function getProvince() {
+        var province = listProvince();
+        if(province!=null){
+            var provinceHtml = '';
+            for(var i=0;i<province.length;i++){
+                provinceHtml += '<option value="'+ province[i].provinceId +'">'+ province[i].province +'</option>';
+            }
+            $('#provinceNumber').append(provinceHtml);
+        }
+    }
+
+    /**
+     * 获取市
+     */
+    function getCity(provineceId) {
+        var city = listCity(provineceId,'');
+        if(city!=null){
+            var cityHtml = '';
+            for(var i=0;i<city.length;i++){
+                cityHtml += '<option value="'+ city[i].cityId +'">'+ city[i].city +'</option>';
+            }
+            $('#cityNumber').append(cityHtml);
+        }
+    }
+
+    /**
+     * 获取区
+     */
+    function getDistrict(cityId) {
+        var district = listDistrict(cityId,'');
+        if(district!=null){
+            var districtHtml = '';
+            for(var i=0;i<district.length;i++){
+                districtHtml += '<option value="'+ district[i].districtId +'">'+ district[i].district +'</option>';
+            }
+            $('#areaNumber').append(districtHtml);
+        }
+    }
+
+    /*监听省选择事件*/
+    $(document).on('change', '#provinceNumber', function() {
+        var proId = $("#provinceNumber").val();
+        $('#cityNumber option').remove();
+        getCity(proId);
+        var cityId = $("#cityNumber").val();
+        $('#areaNumber option').remove();
+        getDistrict(cityId);
+    });
+
+    /*监听市选择事件*/
+    $(document).on('change', '#cityNumber', function() {
+        var city = $("#cityNumber").val();
+        $('#areaNumber option').remove();
+        getDistrict(city);
+    });
+
+
 </script>
 </body>
 </html>