Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

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-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java

@@ -46,6 +46,7 @@ public class EfastOrder implements Serializable{
     private String orderPostFirm;               //快递公司
     private String orderDealCode;               //交易号
     private List<EfastOrderItem> itemList;      //订单项集合
+    private Integer returnOrderType;                 //退单类型 1退货单(含退款),2退货单,3退款单可不传
 
     // 推送状态
     private String returnStatus;
@@ -267,6 +268,13 @@ public class EfastOrder implements Serializable{
     public void setPlatformOrderId(String platformOrderId) {
         this.platformOrderId = platformOrderId;
     }
+    public Integer getReturnOrderType() {
+        return returnOrderType;
+    }
+
+    public void setReturnOrderType(Integer returnOrderType) {
+        this.returnOrderType = returnOrderType;
+    }
 
     public String getOrderSellerRemark() {
         return orderSellerRemark;

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

@@ -119,7 +119,7 @@ public interface CustomerService {
      * @return
      * @throws Exception
      */
-    void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status);
+    void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status,Integer returnType);
     /**
      * 添加仓储
      * @param customerCommon

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java

@@ -81,4 +81,10 @@ public interface ProduceService {
      * @return
      */
     List<WechatMp> listWechatMp();
+
+    /**
+     * 获取所有牙刷信息
+     * @return
+     */
+    List<Produce> listToothInfo();
 }

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

@@ -498,7 +498,7 @@ public class CustomerServiceImpl implements CustomerService {
                     record.setRelationId(renewed.getRenewedId());
                     customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
                     customerService.setName(customerCommon);
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,8);
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,8,2);
                 }
                 //删除寄出寄回产品
                 closedRecord.setRelationId(renewed.getRenewedId());
@@ -524,7 +524,7 @@ public class CustomerServiceImpl implements CustomerService {
                     record.setRelationId(repair.getRepairId());
                     customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
                     customerService.setName(customerCommon);
-                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8,2);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
                 }
                 //删除寄出寄回产品
                 closedRecord.setRelationId(repair.getRepairId());
@@ -550,7 +550,7 @@ public class CustomerServiceImpl implements CustomerService {
                     record.setRelationId(reissue.getReissueId());
                     customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
                     customerService.setName(customerCommon);
-                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8,2);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
                 }
                 //删除寄出产品
                 sendProdcue.setRelationId(reissue.getReissueId());
@@ -885,7 +885,7 @@ public class CustomerServiceImpl implements CustomerService {
             myAddress =  address[3];
         }
         efastOrder.setOrderAddress(myAddress);
-        efastOrder.setOrderStatus(2);
+        efastOrder.setOrderStatus(1);
 
         efastOrder.setOrderNum(num); //产品数量
         efastOrder.setOrderAmount(amout);   //商品总价
@@ -961,7 +961,7 @@ public class CustomerServiceImpl implements CustomerService {
      * @throws RuntimeException
      */
     @Transactional
-    public void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status){
+    public void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status,Integer returnType){
 
         SalesOrder order = new SalesOrder();
         order.setSalesId(salesOrder.getSalesId());
@@ -973,20 +973,30 @@ public class CustomerServiceImpl implements CustomerService {
         EfastOrder efastOrder = new EfastOrder();
         List<EfastOrderItem> itemList = new ArrayList<>();
 
-        for(int i=0;i<customerCommon.getSendProdcues().size();i++){
+        /*for(int i=0;i<customerCommon.getSendProdcues().size();i++){
             SendProdcue sendProdcue = customerCommon.getSendProdcues().get(i);
             EfastOrderItem efastOrderItem = new EfastOrderItem();
             efastOrderItem.setItemColorBar(sendProdcue.getProductColor().getColorBar());
             efastOrderItem.setItemNum(sendProdcue.getSendProdcueNumber());
             efastOrderItem.setItemDiscount(sendProdcue.getProductColor().getColorPrice());
             itemList.add(efastOrderItem);
+        }*/
+        SalesOrderItem salesOrderItem = new SalesOrderItem();
+        salesOrderItem.setItemOrderId(salesOrder.getSalesId());
+        List<SalesOrderItem> salesOrderItemList = salesOrderMapper.listSalesOrderItem(salesOrderItem);
+        for(SalesOrderItem item : salesOrderItemList){
+            EfastOrderItem efastOrderItem = new EfastOrderItem();
+            efastOrderItem.setItemColorBar(item.getItemColorBar());
+            efastOrderItem.setItemNum(item.getItemNum());
+            efastOrderItem.setItemDiscount(item.getItemProductPrice());
+            itemList.add(efastOrderItem);
         }
         efastOrder.setOrderDealCode(salesOrder.getSalesDealCode()); //交易号
         efastOrder.setOrderPostFirm(salesOrder.getSalesPostFirm()); //物流代码
         efastOrder.setOrderPostNum(salesOrder.getSalesPostNum()); //物流单号
         efastOrder.setOrderId(salesOrder.getSalesOrderId());        //订单编号
         efastOrder.setItemList(itemList);
-
+        efastOrder.setReturnOrderType(returnType);//退单类型
         JSONObject jsonObject = new JSONObject();
         try{
             jsonObject = efastOrderService.returnOrderFormEfast(efastOrder);
@@ -1048,6 +1058,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;
                             }
                         }
@@ -1058,6 +1070,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;
                             }
                         }
@@ -1067,6 +1081,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;
                             }
                         }
@@ -1076,6 +1091,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;
                             }
                         }
@@ -1085,6 +1101,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-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -57,7 +57,7 @@
     where customer_id = #{customerId,jdbcType=INTEGER}
   </delete>
 
-  <!-- 查询客诉基本信息列表 -->
+  <!-- 查询客诉基本信息列表 老排序规则 ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc -->
   <select id="listCustomer" parameterType="CustomerInfo" resultMap="customerMap">
     select
       c.customer_id,
@@ -137,6 +137,12 @@
       <if test="visitDesignatedAdminId != null">
         and v.designated_admin_id = #{visitDesignatedAdminId}
       </if>
+      <if test="startTime != null">
+        and c.customer_create_time &gt; #{startTime}
+      </if>
+      <if test="endTime != null">
+        and c.customer_create_time &lt; #{endTime}
+      </if>
       <if test="sendLogisticsNo != null and sendLogisticsNo != ''">
         and c.customer_id in (
             SELECT customer_id
@@ -161,7 +167,8 @@
         )
       </if>
     </where>
-    ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
+
+    ORDER BY c.customer_id desc
   </select>
 
   <resultMap id="customerMap" type="CustomerInfo">

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -525,6 +525,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
             resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
             resultJson = resultJson.replaceAll("[\\t\\n\\r]", "");
+            if (resultJson.indexOf("江西省 南昌市 新建县 \"江西南昌市新建县县城内江西南昌新建县黄家湖东路1666号众森红谷一品45栋2单元601室")!=-1){
+                resultJson = resultJson.replace("江西省 南昌市 新建县 \"江西南昌市新建县县城内江西南昌新建县黄家湖东路1666号众森红谷一品45栋2单元601室","江西南昌市新建县县城内江西南昌新建县黄家湖东路1666号众森红谷一品45栋2单元601室");
+            }
             JSONObject jsonObject = JSONObject.fromObject(resultJson);
             // default HTTP SUCCESS
             JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
@@ -605,7 +608,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
         Map<String, String> requestData = new HashMap<String, String>();
         requestData.put("return_shipping_name", efastOrder.getOrderPostFirm());		// 退单物流代码
         requestData.put("kehu_return_invoice_no", efastOrder.getOrderPostNum());	// 退单物流单号
-        requestData.put("return_type", "2");
+        requestData.put("return_type", efastOrder.getReturnOrderType().toString());//退单类型 1退货单(含退款),2退货单,3退款单可不传
         requestData.put("app_nick", NameUtils.getConfig("app_nick"));
         requestData.put("app_key", NameUtils.getConfig("app_key"));
         requestData.put("app_secret", NameUtils.getConfig("app_secret"));

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -291,4 +291,9 @@ public class ProduceServiceImpl implements ProduceService {
     public List<WechatMp> listWechatMp() {
         return produceMapper.listWechatMp();
     }
+
+    @Override
+    public List<Produce> listToothInfo() {
+        return produceMapper.listToothInfo();
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java

@@ -101,5 +101,9 @@ public interface ProduceMapper {
      */
     List<WechatMp> listWechatMp();
 
-
+    /**
+     * 获取所有牙刷信息
+     * @return
+     */
+    List<Produce> listToothInfo();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -505,4 +505,23 @@
         wechat_mp_pubno AS wechatMpPubno
         from tb_rst_pts_wechat_mp
     </select>
+
+
+    <select id="listToothInfo" resultType="Produce">
+        SELECT
+        tb_rst_pts_produce.produce_id AS produceId,
+        tb_rst_pts_produce.produce_no AS produceNo,
+        tb_rst_pts_produce.produce_type AS produceType,
+        tb_rst_pts_produce.produce_name AS produceName,
+        tb_rst_pts_produce.produce_status AS  produceStatus,
+        tb_rst_pts_produce.produce_pattern AS producePattern,
+        tb_rst_pts_produce.produce_model AS produceModel,
+        tb_rst_pts_produce.produce_feature AS  produceFeature,
+        tb_rst_pts_produce.produce_remake AS produceRemake,
+        tb_rst_pts_produce.produce_create_time AS  produceCreateTime,
+        tb_rst_pts_produce.produce_update_time AS produceUpdateTime,
+        tb_rst_pts_produce.wechat_mp_id AS wechatMpId
+        FROM tb_rst_pts_produce
+        WHERE produce_type=3
+    </select>
 </mapper>

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

@@ -375,8 +375,8 @@ public class AdminCustomerController {
         salesOrder.setSalesRemainDeposit(0);
         salesOrder.setSalesType(1);
 
-        salesOrder.setSalesStatus(0);//确认状态:0(未确认)1(确认)2(挂起)3(作废)
-        salesOrder.setSalesShippingStatus(0);    //发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+        salesOrder.setSalesStatus(1);//确认状态:0(未确认)1(确认)2(挂起)3(作废)
+        salesOrder.setSalesShippingStatus(1);    //发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)*****+++
         salesOrder.setSalesPayStatus(2);   //已付款
         salesOrder.setSalesProcessStatus(0);  //单据状态:0(正常单)1(问题单)
         salesOrder.setSalesIsSend(0);        //0：否 1：是  是否通知配货
@@ -484,6 +484,11 @@ public class AdminCustomerController {
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ModelAndView mv = new ModelAndView("cm/customer/custome_list");
+        if(customerInfo.getAdminId() == null){
+            //获取登录员工id
+            Integer adminId = AdminUtils.getLoginAdminId();
+            customerInfo.setAdminId(adminId);
+        }
         PagedResult<CustomerInfo> pagedResult = customerService.listCustomer(pageNO, pageSize, customerInfo, totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
@@ -1266,8 +1271,8 @@ public class AdminCustomerController {
     @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");
+        /*String closedProducts = request.getParameter("closed_products");
+        String closedFittings = request.getParameter("closed_fittings");*/
         String mergeAddress = request.getParameter("merge_address");
         if (!StringUtils.isNotEmpty(renewed.getRenewedId().toString())) {
             return new ResponseJson(500, "该换新信息不能修改!", 500);
@@ -1275,13 +1280,13 @@ public class AdminCustomerController {
 //        if (StringUtils.isNotEmpty(renewed.getRenewedBackPostage().toString())) {
 //            renewed.setRenewedBackPostage(renewed.getRenewedBackPostage().intValue() * 100);
 //        }
-        if (!StringUtils.isNotEmpty(renewed.getRenewedBackEfastOrderId())) {
+        /*if (!StringUtils.isNotEmpty(renewed.getRenewedBackEfastOrderId())) {
             return new ResponseJson(500, "请输入efast订单号!", 500);
-        }
+        }*/
         if (StringUtils.isNotEmpty(mergeAddress)) {
             renewed.setRenewedSendMergeAddress(mergeAddress);
         }
-
+    if(renewed.getRenewedBackStatus() != null){
         if(renewed.getRenewedBackStatus() != 1){
             ComplaintSignclosedInfo cs = new ComplaintSignclosedInfo();
             cs.setSignclosedCustomerId(renewed.getCustomerId());
@@ -1289,9 +1294,10 @@ public class AdminCustomerController {
             cs.setSignclosedLogisticsNumber(renewed.getRenewedBackLogisticsNo());
             complaintSignclosedInfoService.updateSignclosedByCustomerId(cs);
         }
+    }
 
         //修改换新信息
-        int num = renewedService.updateRenewedInfo(renewed, closedProducts, closedFittings);
+        int num = renewedService.updateRenewedInfo(renewed, null, null);
         if (num > 0) {
             return new ResponseJson(200, "修改成功!", 200);
         } else {
@@ -1359,8 +1365,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");
@@ -1374,12 +1380,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);
         }
@@ -1393,16 +1402,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/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -205,7 +205,14 @@ public class AdminSignclosedController {
         Map<String, Integer> alreadyFittingsMap = new HashMap<>();
         if(alreadyFittingsName != null && alreadyFittingsName.length> 0) {
             for (int i = 0; i < alreadyFittingsName.length; i++) {
-                alreadyFittingsMap.put(alreadyFittingsName[i], Integer.valueOf(request.getParameter("alreadyFittingsId" + alreadyFittingsName[i])));
+              String afId =   request.getParameter("alreadyFittingsId" + alreadyFittingsName[i]);
+                if(afId == null || afId.equals("")){
+                    msg.setResultCode(200);
+                    msg.setReturnCode(504);
+                    return msg;
+                }else{
+                    alreadyFittingsMap.put(alreadyFittingsName[i], Integer.valueOf(afId));
+                }
             }
         }
         String signclosedDate = request.getParameter("signclosed_date");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -826,6 +826,7 @@ public class AdminOrderController {
                                        @RequestParam("tel[]") String tel,
                                        @RequestParam("info[]") String[] infos,
                                        @RequestParam("num[]") String num,
+                                       @RequestParam("remark[]") String remark,
                                        @RequestParam("filePath") String filePath,
                                        @RequestParam("postType") String postType,
                                        @RequestParam("productName") String productName,
@@ -840,7 +841,7 @@ public class AdminOrderController {
         }
         // 读取文件中内容
         List<EfastOrder> orderEfasts = ExcelUtil.readCell(request.getServletContext().getRealPath(filePath),
-                productName, maps, infos, tel, name,platformOrder, num, priceMap, postType, shopId);
+                productName, maps, infos, tel, name,platformOrder, num,remark, priceMap, postType, shopId);
         logger.info("---------orderEfasts订单个数为："+orderEfasts.size() + "------------");
         StringBuffer sb = new StringBuffer();
         for (int i = 0; i < orderEfasts.size(); i++) {

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -374,4 +374,24 @@ public class MachineController {
         }
         return rsj;
     }
+
+    /**
+     * 查询所有牙刷信息（电动牙刷项目也调用此功能）
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/listToothInfo")
+    public RespJsonBean listToothInfo(HttpServletRequest request) {
+        RespJsonBean rsj = new RespJsonBean();
+        List<Produce> produce = produceService.listToothInfo();
+        if(produce != null){
+            rsj.setResultCode(200);
+            rsj.addResponseKeyValue("produce",produce);
+
+        }else{
+            rsj.setResultCode(500);
+        }
+        return rsj;
+    }
 }

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -306,7 +306,7 @@ public class ExcelUtil {
 
 
     public static List<EfastOrder> readCell(String filePath, String productName, String[] maps,
-                                            String[] infos, String tel, String name,String platformOrder, String num,
+                                            String[] infos, String tel, String name,String platformOrder, String num,String remark,
                                             Map<String, ProductColor> price, String postType, String shopId)
             throws IOException {
         Map<String, String> map = new HashMap<>();
@@ -340,6 +340,7 @@ public class ExcelUtil {
         int telColumnIndex = -1;
         int productColumnIndex = -1;
         int numColumnIndex = -1;
+        int remarkColumnIndex = -1;
         int[] infoColumnIndex = new int[infos.length];
         int infoCount = 0;
 
@@ -363,6 +364,9 @@ public class ExcelUtil {
             } else if (num.equals(cell.getStringCellValue().trim())) {
                 // 匹配购买数量
                 numColumnIndex = cell.getColumnIndex();
+            }  else if (remark.equals(cell.getStringCellValue().trim())) {
+                // 匹配备注
+                remarkColumnIndex = cell.getColumnIndex();
             } else {
                 // 匹配地址（可能是多个，需要组合连接）
                 for (int i = 0; i < infos.length; i++) {
@@ -422,6 +426,7 @@ public class ExcelUtil {
 
                 order.setOrderProductBarCode(OrderProductBarCodeValue);
                 String orderNum = getValue(temp.getCell(numColumnIndex));
+                String orderRemark = getValue(temp.getCell(remarkColumnIndex));
                 if(orderNum == null || "".equals(orderNum)){
                     order.setReturnStatus("error");
                     order.setReturnMsg("数量不正确");
@@ -429,7 +434,7 @@ public class ExcelUtil {
                 }else{
                     order.setOrderNum(Integer.valueOf(orderNum));               // 读取购买数量
                 }
-
+                order.setOrderRemark(orderRemark);
                 if (infoColumnIndex.length == 1){
                     // 如果infoColumnIndex = 1, 则表示需要截取（可能是-、“ ”）
                     Cell cell = temp.getCell(infoColumnIndex[0]);
@@ -475,7 +480,6 @@ public class ExcelUtil {
                 order.setOrderOpenId(order.getOrderAddressTel());
                 order.setOrderProductName(price.get(order.getOrderProductBarCode()).getColorName());
                 order.setOrderId(OrderNoUtil.createOrderCode(Math.abs(new Random().nextInt(1000))));
-                order.setOrderRemark("");
                 order.setOrderStoreId(shopId);           // 微商/代理商仓库
                 order.setOid(oid);                       // oid
                 if (postType.equals("ems")) {

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

@@ -319,7 +319,7 @@
             <div class="row cl" id="recipientInfo" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="*1-16" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
@@ -521,10 +521,10 @@
                 <div class="row cl">
                     <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>被回访人：</label>
                     <div class="formControls col-2 col-sm-2">
-                        <input type="text" class="input-text" value="" placeholder="填写回访人姓名" id="" name="visitName"  datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="回访人姓名格式不正确！" >
+                        <input type="text" class="input-text" value="" placeholder="填写回访人姓名" id="" name="visitName"  datatype="*1-16" errormsg="回访人姓名格式不正确！" >
                     </div>
                     <div class="formControls col-2 col-sm-2">
-                        <input type="text" class="input-text associated-phone" value="" placeholder="填写回访人手机号" id="" name="visitTel" datatype="m" errormsg="回访人手机号码格式不正确！">
+                        <input type="text" class="input-text associated-phone" value="" placeholder="填写回访人手机号" id="" name="visitTel" datatype="n11-12" ignore="ignore" errormsg="回访人手机号码格式不正确！">
                     </div>
                 </div>
                 <div class="row cl">

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

@@ -42,6 +42,8 @@
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
+            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
+            <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>
 
             <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
 
@@ -118,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>
@@ -164,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>
                                     已解决
@@ -185,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)>
@@ -200,7 +211,7 @@
                                                     </#if>
                                                 </#if>
                                             </#list>
-                                        </#if>
+                                        </#if>-->
                                         </font>
                                     </a>
                                     )
@@ -220,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)>
@@ -235,7 +246,7 @@
                                                         </#if>
                                                     </#if>
                                                 </#list>
-                                            </#if></font>
+                                            </#if>--></font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 5>
@@ -337,7 +348,6 @@
 <#include "/base/page_util.ftl">
 </tfoot>
 <script type="text/javascript">
-
     /**
      * 跳转到添加customer页面
      */

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

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
 <#include "/base/add_base.ftl">
-    <title>客诉列表</title>
+    <title>订单列表</title>
     <style>
         .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
         .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
@@ -58,7 +58,6 @@
 </head>
 <body>
 <div class="page-container">
-
     <div class="order-list">
         <div class="text-c">
             <form action="" method="post">

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

@@ -409,11 +409,20 @@
                                                         <input type="hidden" class="input-produce-id" value="${product.productId}">
                                                         <input type="hidden" class="input-color-id" value="${color.colorId}">
                                                         <#assign number = ""/>
-                                                         <#list customerCommon.sendProdcues as sendProdcues>
-                                                               <#if sendProdcues.colorId == color.colorId >
-                                                                   <#assign number = sendProdcues.sendProdcueNumber/>
-                                                               </#if>
-                                                         </#list>
+                                                            <#if (customerCommon.sendProdcues?size>0)>
+                                                                <#list customerCommon.sendProdcues as sendProdcues>
+                                                                    <#if sendProdcues.colorId == color.colorId >
+                                                                        <#assign number = sendProdcues.sendProdcueNumber/>
+                                                                    </#if>
+                                                                </#list>
+                                                            <#else >
+                                                                <#list customerCommon.closedProdcues as closedProdcues>
+                                                                    <#if closedProdcues.colorId == color.colorId >
+                                                                        <#assign number = closedProdcues.closedProdcueNumber/>
+                                                                    </#if>
+                                                                </#list>
+                                                            </#if>
+
                                                         <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="产品数量" id="color-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
                                                     </td>
                                                 </tr>
@@ -431,11 +440,21 @@
                                                         <input type="hidden" class="input-produce-id" value="${fittingsInfo.productId}">
                                                         <input type="hidden" class="input-fittings-id" value="${fittingsInfo.fittingsId}">
                                                         <#assign number = ""/>
-                                                        <#list customerCommon.sendFittings as sendFittings>
-                                                            <#if sendFittings.fittingsId == fittingsInfo.fittingsId >
-                                                                <#assign number = sendFittings.sendFittingNumber/>
-                                                            </#if>
-                                                        </#list>
+
+                                                        <#if (customerCommon.sendFittings?size>0)>
+                                                            <#list customerCommon.sendFittings as sendFittings>
+                                                                <#if sendFittings.fittingsId == fittingsInfo.fittingsId >
+                                                                    <#assign number = sendFittings.sendFittingNumber/>
+                                                                </#if>
+                                                            </#list>
+                                                        <#else>
+                                                            <#list customerCommon.closedFittings as closedFittings>
+                                                                <#if closedFittings.fittingsId == fittingsInfo.fittingsId >
+                                                                    <#assign number = closedFittings.closedFittingNumber/>
+                                                                </#if>
+                                                            </#list>
+                                                        </#if>
+
                                                         <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="${number}" placeholder="配件数量" id="fittings-1-1" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)">
                                                     </td>
                                                 </tr>
@@ -1021,10 +1040,10 @@
                     $("#processResultStatus").show();
                     $("#orderHead").show();
                     $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
+                    $("#recipientInfo").hide();
+                    $("#recipientInfoTitle").hide();
+                    $("#recipientAddress").hide();
+                    $("#recipientAddressText").hide();
                     $("#renewedProduct").show();
                     $("#TDScollect").show();
                     $("#TDScollectShow").show();
@@ -1041,10 +1060,10 @@
                     $("#processResultStatus").show();
                     $("#orderHead").show();
                     $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
+                    $("#recipientInfo").hide();
+                    $("#recipientInfoTitle").hide();
+                    $("#recipientAddress").hide();
+                    $("#recipientAddressText").hide();
                     $("#renewedProduct").show();
                     $("#TDScollect").show();
                     $("#TDScollectShow").show();

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

@@ -18,49 +18,74 @@
         .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-renewed" name="form-update-renewed">
-        <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="renewedId" name="renewedId" />
+                <input type="hidden" id="renewedId" name="renewedId" seleType="primary"/>
                 <span id="renewedSchedule" 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="renewedBackStatus" 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="renewedBackStatus" value="2">
-                    <label for="tel-4">已寄回</label>
+                <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 class="radio-box">
-                    <input type="radio" id="tel-5" name="renewedBackStatus" 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="renewedBackStatus" 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">
+                        <label for="tel-4">已寄回</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-5" name="renewedBackStatus" value="3" seleType="send">
+                        <label for="tel-5">已收货</label>
+                    </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="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select">
+				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select" seleType="send">
                     <option value="">物流公司</option>
 					<option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
@@ -79,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="renewedBackLogisticsNo" name="renewedBackLogisticsNo" 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>
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="renewedBackLogisticsNo" name="renewedBackLogisticsNo">
-                <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>
-        </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" id="tel-6" name="renewedIsTransfer" value="0">
-                    <label for="tel-6">不需要转账</label>
+
+            <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="radio-box">
-                    <input type="radio" id="tel-7" name="renewedIsTransfer" value="1">
-                    <label for="tel-7">已转账</label>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="renewedBackName" name="renewedBackName" seleType="send">
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-8" name="renewedIsTransfer" value="2">
-                    <label for="tel-8">待转账</label>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel" 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>
+                    </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="renewedBackName" name="renewedBackName">
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" value="" placeholder="寄件人电话" id="renewedBackTel" name="renewedBackTel">
-            </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="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" />
-                <div style="float: left;">
-                    <button type="button" style="cursor:pointer;height: 30px;" class="my-btn-search" onclick="showProductList();">修改产品</button>
+        <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="renewedIsTransfer" value="0" seleType="postage">
+                        <label for="tel-6">不需要转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-7" name="renewedIsTransfer" 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">
+                        <label for="tel-8">待转账</label>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="cl">
-            <div class="formControls col-2 col-sm-2 text-r">
+            <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="renewedBackPostage" name="renewedBackPostage" seleType="postage">
+                    <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="renewedAlipay" name="renewedAlipay" seleType="postage">
+                </div>
             </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_renewed_info(2);" class="btn btn-primary" type="button">确认修改</button>
                 </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-10" name="renewedSendStatus" value="1">
-                    <label for="tel-10">未寄出</label>
+        <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-11" name="renewedSendStatus" value="2">
-                    <label for="tel-11">已寄出</label>
+                <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">
+                        <label for="tel-10">未寄出</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-11" name="renewedSendStatus" 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">
+                        <label for="tel-12">已收货</label>
+                    </div>
+                    Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId" seleType="sendInformation">
                 </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-12" name="renewedSendStatus" value="3">
-                    <label for="tel-12">已收货</label>
+
+                <#--<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>
-                Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId">
-            </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="renewedSendName" name="renewedSendName">
-            </div>
-            <div class="formControls col-5 col-sm-5">
-                <input type="text" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel">
-            </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-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="renewedSendName" name="renewedSendName" seleType="sendInformation">
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" placeholder="填写收件人手机号" id="renewedSendTel" name="renewedSendTel" 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;">
+                    </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="provinceNumber" id="provinceNumber" class="select"></select>
+                        <select name="provinceNumber" id="provinceNumber" 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="cityNumber" id="cityNumber" class="select"></select>
+                        <select name="cityNumber" id="cityNumber" 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="areaNumber" id="areaNumber" class="select"></select>
-                        <input type="hidden" id="merge_address" name="merge_address">
+                        <select name="areaNumber" id="areaNumber" class="select" seleType="sendInformation"></select>
+                        <input type="hidden" id="merge_address" name="merge_address" seleType="sendInformation">
                     </span>
+                        </div>
+                    </div>
                 </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="renewedSendAddress" name="renewedSendAddress">
-            </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 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="renewedSendAddress" name="renewedSendAddress" 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="renewedSendLogisticsCompany" id="renewedSendLogisticsCompany" class="select">
+				<select name="renewedSendLogisticsCompany" id="renewedSendLogisticsCompany" class="select" seleType="sendInformation">
 					<option value="">物流公司</option>
                     <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
@@ -234,78 +272,73 @@
                     <option value="02">上门送货</option>
 				</select>
 			</span>
+                        </div>
+                        <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo" 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="renewedDesc" name="renewedDesc" seleType="sendInformation">
+                    </div>
                 </div>
-                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="快递单号" id="renewedSendLogisticsNo" name="renewedSendLogisticsNo">
-            </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="renewedDesc" name="renewedDesc">
-            </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 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>
+                </div>
             </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 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="row cl">
-            <div class="formControls col-2 col-sm-2">
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                寄送产品将自动推送Efast，系统自动获取物流信息，并更新。如果在Efast作废订单等操作后，无法获取物流信息，请手动填写物流信息。
+        <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 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();" class="btn btn-primary" type="button">确认修改</button>
-            </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}$/; //中文英文
@@ -329,13 +362,18 @@
         $("input[name='renewedSendStatus']").change(function (){
             initSendInfo($(this).val());
         })
+
+        /* 监听邮费状态按钮 */
+        $("input[name='renewedIsTransfer']").change(function (){
+            initPostageInfo($(this).val());
+        })
     });
 
     /*初始化寄回信息*/
     function initBackInfo(statusCode){
         if(statusCode == 1){
             $("#backLogisticsInfo").hide();
-            $("#backTransferInfo").hide();
+            /*$("#backTransferInfo").hide();*/
             $("#backUserInfo").hide();
         }else{
             $("#backLogisticsInfo").show();
@@ -344,6 +382,15 @@
         }
     }
 
+    /*显示隐藏邮费信息*/
+    function initPostageInfo(statusCode){
+        if(statusCode == 1){
+            $("#postageInformation").show();
+        }else{
+            $("#postageInformation").hide();
+        }
+    }
+
     /*初始化寄出信息*/
     function initSendInfo(statusCode){
         if(statusCode == 1){
@@ -537,9 +584,9 @@
                         case 3:renewedSchedule += '已收货,';break;
                     }
                     switch (renewed.renewedSendStatus) {
-                        case 1:renewedSchedule += '未寄出,';break;
-                        case 2:renewedSchedule += '已寄出,';break;
-                        case 3:renewedSchedule += '已收货,';break;
+                        case 1:renewedSchedule += '未寄出';break;
+                        case 2:renewedSchedule += '已寄出';break;
+                        case 3:renewedSchedule += '已收货';break;
                     }
 
                     var renewedProduct = '';
@@ -578,11 +625,12 @@
                             $(this).iCheck('check');
                         }
                     });
-
                     /*初始化寄回信息*/
                     initBackInfo(renewed.renewedBackStatus);
                     /*初始化寄出信息*/
                     initSendInfo(renewed.renewedSendStatus);
+                    //初始化邮费信息
+                    initPostageInfo(renewed.renewedIsTransfer);
 
                     $('#renewedSchedule').html(renewedSchedule);
                     $("#renewedBackLogisticsCompany option[value='" + renewed.renewedBackLogisticsCompany + "']").attr("selected","true");
@@ -613,14 +661,14 @@
                     var maintenance_table = $('#maintenance_table');
                     if (renewed.complaintDetectList != null) {
                         $.each(renewed.complaintDetectList,function (i,item) {
-                            if (i == 0) {
+                            /*if (i == 0) {
                                 switch (this.detectState) {
                                     case 1:renewedSchedule += '待仓库转入';break;
                                     case 2:renewedSchedule += '正在检查';break;
                                     case 3:renewedSchedule += '检查通过';break;
                                     case 4:renewedSchedule += '检查未通过';break;
                                 }
-                            }
+                            }*/
                             var detectRevolutionProducedMsg = "";
                             switch (this.detectRevolutionProduced){
                                 case 1:
@@ -655,21 +703,54 @@
         })
     }
 
+   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_renewed_info() {
-        var renewed_flag = checkRenewed();
+    function update_renewed_info(type) {
+        var renewed_flag = checkRenewed(type);
+        //省市县
         var provinceNumber = $("#provinceNumber").find("option:selected").text();
         var cityNumber = $("#cityNumber").find("option:selected").text();
         var areaNumber = $("#areaNumber").find("option:selected").text();
         $('#merge_address').val(provinceNumber+'-'+cityNumber+'-'+areaNumber);
 
+        //寄回邮费
         var renewedBackPostage = $("#renewedBackPostage").val();
         $("#renewedBackPostage").val(parseInt(renewedBackPostage*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 (renewed_flag) {
             $.ajax({
                 cache: true,
                 type: "POST",
-                data: $('#form-update-renewed').serialize(),
+                data: obj,
                 url: "${path}/admin/customer/update_renewed_info",
                 async: false,
                 success: function(data){
@@ -692,15 +773,15 @@
     }
 
     /*校验换新填写信息*/
-    function checkRenewed() {
+    function checkRenewed(type) {
         var renewed_flag = true;
-        var renewedBackStatus = $('input[name="renewedBackStatus"]:checked').val();//寄回状态
-        var renewedBackLogisticsNo = $('#renewedBackLogisticsNo').val().trim();//物流单号
-        var renewedBackPostage = $('#renewedBackPostage').val().trim();//寄回邮费
+        var renewedBackLogisticsNo = $('#renewedBackLogisticsNo').val().trim();//寄回物流单号
         var renewedBackLogisticsCompany = $("#renewedBackLogisticsCompany option:selected").val();//寄回物流公司
-        var renewedBackName = $('#renewedBackName').val();
-        var renewedBackTel = $('#renewedBackTel').val();
-        if (renewedBackStatus == 1) {
+        var renewedBackName = $('#renewedBackName').val();//寄件人姓名
+        var renewedBackTel = $('#renewedBackTel').val();//寄件人电话
+        if(type == 1){
+            var renewedBackStatus = $('input[name="renewedBackStatus"]:checked').val();//寄回状态
+            if (renewedBackStatus == 1) {
 //            if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
 //                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
 //                renewed_flag = false;
@@ -726,56 +807,51 @@
 //                renewed_flag = false;
 //                return renewed_flag;
 //            }
-        } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
-            if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
-                layer.msg("物流信息不能为空!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (!money.test(renewedBackPostage)) {
-                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedBackLogisticsCompany == null || renewedBackLogisticsCompany == '') {
-                layer.msg("请选择物流公司!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (!uname.test(renewedBackName)) {
-                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
+            } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
+                if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
+                    layer.msg("物流单号不能为空!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                if (renewedBackLogisticsCompany == null || renewedBackLogisticsCompany == '') {
+                    layer.msg("请选择物流公司!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                if (!uname.test(renewedBackName)) {
+                    layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                if (!mobile.test(renewedBackTel)) {
+                    layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
             }
-            if (!mobile.test(renewedBackTel)) {
-                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
+        }else if(type == 2){
+            var renewedIsTransfer = $('input[name="renewedIsTransfer"]:checked').val();
+            var renewedBackPostage = $('#renewedBackPostage').val().trim();//寄回邮费
+            var renewedAlipay = $('#renewedAlipay').val().trim();//支付宝账户
+
+            if(renewedIsTransfer == 1){
+                if (!money.test(renewedBackPostage)) {
+                    layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                if (!money.test(renewedAlipay)) {
+                    layer.msg("支付宝账户格式不正确，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
             }
-        }
-        var renewedSendName = $('#renewedSendName').val();
-        if (!uname.test(renewedSendName)) {
-            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
-            renewed_flag = false;
-            return renewed_flag;
-        }
-        var renewedSendTel = $('#renewedSendTel').val();
-        if (!mobile.test(renewedSendTel)) {
-            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
-            renewed_flag = false;
-            return renewed_flag;
-        }
-        var renewedSendAddress = $('#renewedSendAddress').val();
-        if (renewedSendAddress == null || renewedSendAddress == '') {
-            layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
-            renewed_flag = false;
-            return renewed_flag;
-        }
-        var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态
-        var renewedSendLogisticsCompany = $('#renewedSendLogisticsCompany').val();//寄出物流公司
-        var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
+        }else if(type == 3){
+            var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态
+            var renewedSendLogisticsCompany = $('#renewedSendLogisticsCompany').val();//寄出物流公司
+            var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
 
-        if (renewedSendStatus == 1) {
+            if (renewedSendStatus == 1) {
 //            if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
 //                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
 //                renewed_flag = false;
@@ -786,16 +862,35 @@
 //                renewed_flag = false;
 //                return renewed_flag;
 //            }
-        } else if (renewedSendStatus == 2 || renewedSendStatus == 3) {
-            if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
-                layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
-            }
-            if (renewedSendLogisticsNo == null || renewedSendLogisticsNo == '') {
-                layer.msg("请填写物流单号!",{icon: 5,time:1000});
-                renewed_flag = false;
-                return renewed_flag;
+            } else if (renewedSendStatus == 2 || renewedSendStatus == 3) {
+                if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
+                    layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                if (renewedSendLogisticsNo == null || renewedSendLogisticsNo == '') {
+                    layer.msg("请填写物流单号!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                var renewedSendTel = $('#renewedSendTel').val();//收件人电话
+                if (!mobile.test(renewedSendTel)) {
+                    layer.msg("收件人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                var renewedSendName = $('#renewedSendName').val();//收件人姓名
+                if (renewedSendName == null || renewedSendName == '') {
+                    layer.msg("收件人姓名格式不正确，请重新输入!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
+                var renewedSendAddress = $('#renewedSendAddress').val();
+                if (renewedSendAddress == null || renewedSendAddress == '') {
+                    layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
+                    renewed_flag = false;
+                    return renewed_flag;
+                }
             }
         }
         return renewed_flag;

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);
     });

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

@@ -149,8 +149,8 @@
                                 <#else >
                             </#if>
                                 <#if detect.detectRevolutionProduced == 1>
-                                    <a style="text-decoration:none" href="javascript:;" title="转入生产"
-                                       onclick="update_info('转入生产','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','800','550');">
+                                    <a style="text-decoration:none" href="javascript:;" title="检测完成"
+                                       onclick="update_info('检测完成','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','800','550');">
                                         <i class="Hui-iconfont">&#xe6e1;</i>
                                     </a>
                                 </#if>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_detail.ftl

@@ -47,6 +47,7 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         .txt-red{color:red}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
     </style>
     <title>客诉基本信息</title>
 </head>
@@ -137,7 +138,7 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">发货时间：</label>
+            <label class="form-label col-1 col-sm-1"><#--发货时间：--></label>
             <div class="formControls col-4 col-sm-4">
                 <label>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
@@ -155,31 +156,31 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">购买产品信息</label>
-            <div class="formControls col-7 col-sm-7 text-c">
-                <table class="table table-border table-bg table-bordered">
-                    <tr class="text-c">
-                        <th>产品名称</th>
-                        <th>产品颜色</th>
-                        <th>产品市场价</th>
-                        <th>产品折扣价</th>
-                        <th>产品数量</th>
-                    </tr>
-                    <#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >
-                        <#list order.salesOrderItemList as item>
-                            <tr class="text-c">
-                                <td>${item.itemProductName!''}</td>
-                                <td>${item.itemProductColor!''}</td>
-                                <td>${item.itemProductPrice/100!''}</td>
-                                <td>${item.itemProductDiscount/100!''}</td>
-                                <td>${item.itemNum}</td>
-                            </tr>
-                        </#list>
-                    </#if>
-                </table>
-            </div>
-        </div>
+        <#--<div class="row cl">-->
+            <#--<label class="form-label col-1 col-sm-1">购买产品信息</label>-->
+            <#--<div class="formControls col-7 col-sm-7 text-c">-->
+                <#--<table class="table table-border table-bg table-bordered">-->
+                    <#--<tr class="text-c">-->
+                        <#--<th>产品名称</th>-->
+                        <#--<th>产品颜色</th>-->
+                        <#--<th>产品市场价</th>-->
+                        <#--<th>产品折扣价</th>-->
+                        <#--<th>产品数量</th>-->
+                    <#--</tr>-->
+                    <#--<#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >-->
+                        <#--<#list order.salesOrderItemList as item>-->
+                            <#--<tr class="text-c">-->
+                                <#--<td>${item.itemProductName!''}</td>-->
+                                <#--<td>${item.itemProductColor!''}</td>-->
+                                <#--<td>${item.itemProductPrice/100!''}</td>-->
+                                <#--<td>${item.itemProductDiscount/100!''}</td>-->
+                                <#--<td>${item.itemNum}</td>-->
+                            <#--</tr>-->
+                        <#--</#list>-->
+                    <#--</#if>-->
+                <#--</table>-->
+            <#--</div>-->
+        <#--</div>-->
         <div class="row cl">
             <label class="form-label col-1 col-sm-1">收货人姓名：</label>
             <div class="formControls col-4 col-sm-4">
@@ -200,6 +201,7 @@
             <label class="form-label col-1 col-sm-1">快递公司：</label>
             <div class="formControls col-4 col-sm-4">
                 <label>
+                <#if order.salesPostFirm??>
                     <#if order.salesPostFirm == 'sto'>
                         申通快递
                     <#elseif order.salesPostFirm == 'yto'>
@@ -230,7 +232,10 @@
                         其他
                     <#elseif order.salesPostFirm == '02'>
                         上门送货
+                    <#elseif order.salesPostFirm == 'eyb'>
+                        E邮宝
                     </#if>
+                </#if>
                 </label>
             </div>
             <label class="form-label col-1 col-sm-1">快递单号：</label>
@@ -248,6 +253,7 @@
                 <label>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
         </div>
+         <button type="button" style="cursor:pointer;height: 35px;margin-left: 400px;"onClick="javascript :history.back(-1);" class="my-btn-search">返回</button>
     </form>
     </div>
 </article>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
 <#include "/base/list_base.ftl">
-    <title>客诉列表</title>
+    <title>订单列表</title>
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
@@ -25,7 +25,7 @@
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> 客诉管理
-    <span class="c-gray en">&gt;</span> 客诉列表
+    <span class="c-gray en">&gt;</span> 订单列表
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 
@@ -64,7 +64,11 @@
             <input type="text" style="width:150px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 导出</button>
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button>
+            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button><br>
+            <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
+            <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>
+
+            </div>
         </form>
     </div>
 
@@ -84,6 +88,7 @@
                 <th width="50">支付金额</th>
                 <th width="50">是否付款</th>
                 <th width="50">是否发货</th>
+                <th width="50">订单备注</th>
                 <th width="60">创建时间</th>
                 <th width="50">操作</th>
             </tr>
@@ -133,6 +138,8 @@
                                 其他
                             <#elseif order.salesPostFirm == '02'>
                                 上门送货
+                            <#elseif order.salesPostFirm == 'eyb'>
+                                E邮宝
                             </#if>
                         </#if>
                     </td>
@@ -155,6 +162,7 @@
                             备货中
                         </#if>
                     </td>
+                    <td>${order.salesAdminRemark!''}</td>
                     <td>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
                     <td>
                         <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="sales_order_detail(${order.salesId!''})">
@@ -172,8 +180,59 @@
 </div>
 <tfoot>
 <#include "/base/page_util.ftl">
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.min.js"> </script>
+<script type="text/javascript" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+<script type="text/plain" id="upload_ue"></script>
 </tfoot>
 <script type="text/javascript">
+    /*判断上传类型 1：上传excel推送订单   2:下载订单 */
+    var editorType;
+    var _editor;
+    $(function() {
+        //重新实例化一个编辑器，防止在上面的editor编辑器中显示上传的图片或者文件
+        _editor = UE.getEditor('upload_ue',{
+            initialFrameWidth : 375,
+            initialFrameHeight: 600
+        });
+        _editor.ready(function () {
+            _editor.setDisabled("attachment");//设置编辑器不可用
+            _editor.hide();//隐藏编辑器，因为不会用到这个编辑器实例，所以要隐藏
+            //侦听图片上传
+            _editor.addListener('beforeInsertImage', function (t, arg) {
+                console.log(arg[0].src);
+                $("#picture").attr("value", arg[0].src);//将地址赋值给相应的input,只去第一张图片的路径
+                $("#preview").attr("src", arg[0].src);  //图片预览
+            });
+            //侦听文件上传，取上传文件列表中第一个上传的文件的路径
+            _editor.addListener('afterUpfile', function (t, arg) {
+                console.log(arg[0].url);
+                if(editorType == 1){
+                    window.location.href=root_path + '/admin/order/upload_excel?file='+arg[0].url;
+                    $("#file").attr("value", _editor.options.filePath + arg[0].url);
+                }else{
+                    window.location.href=root_path + '/admin/order/download_excel?file='+arg[0].url;
+                }
+            });
+        });
+    });
+    //弹出文件上传的对话框
+    function upFiles() {
+        var myFiles = _editor.getDialog("attachment");
+        myFiles.open();
+        editorType = 1;
+    }
+    /*  交易号文件上传 */
+    function downloadOrder(){
+        var myFiles = _editor.getDialog("attachment");
+        myFiles.open();
+        editorType = 2;
+    }
+    //弹出图片上传的对话框
+    function upImage() {
+        var myImage = _editor.getDialog("insertimage");
+        myImage.open();
+    }
 
     /*进入订单详情*/
     function sales_order_detail(salesId) {

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

@@ -81,7 +81,7 @@
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回物流：</label>
                 <div class="formControls col-2 col-sm-2 skin-minimal">
                     <span class="select-box">
-                    <select name="signclosedLogistics" class="select">
+                    <select id="signclosedLogistics" name="signclosedLogistics" class="select">
                         <option value="">请选择物流公司</option>
                         <option value="sto">申通快递</option>
                         <option value="yto">圆通快递</option>
@@ -400,6 +400,7 @@
         }
         var signclosedLogistics = $("#signclosedLogistics").val();
         if( signclosedLogistics == null || signclosedLogistics == "" ){
+            alert(signclosedLogistics);
             layer.msg('请选择物流公司',{icon: 5,time:1000});
             return;
         }
@@ -456,7 +457,7 @@
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    layer.msg('添加成功',{icon: 1,time:1000},function () {
+                    layer.msg('签收成功，请及时转入品检部门！',{icon: 1,time:1000},function () {
                         location.replace(location.href);
                         window.location.href= "${path}/admin/signclosed/select_signclosed_list";
                     });
@@ -466,6 +467,8 @@
                     layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
                 } else if(data.returnCode == 503) {
                     layer.msg('请输入产品数量',{icon: 5,time:1000});
+                } else if(data.returnCode == 504) {
+                    layer.msg('请输入配件数量',{icon: 5,time:1000});
                 }else{
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -71,6 +71,14 @@
                 </td>
             </tr>
             <tr class="text-c">
+                <td>备注</td>
+                <td>
+                <#list heads as head>
+                    <label><input type="radio" value="${head}" class="product-remark" name="product-remark"/>${head}</label>
+                </#list>
+                </td>
+            </tr>
+            <tr class="text-c">
                 <td>物流方式</td>
                 <td>
                     <label><input type="radio" value="ems" checked="checked" class="product-post-type" name="product-post-type"/>EMS</label>
@@ -157,6 +165,7 @@
                             <th width="200">地址</th>
                             <th width="80">产品名称</th>
                             <th width="30">购买数量</th>
+                            <th width="30">备注</th>
                             <th width="80">推送状态</th>
                         </tr>
                         </thead>
@@ -256,6 +265,13 @@
         for (var i = 0; i < productShopNum.length; i++) {
             numArray[i] = productShopNum[i].value;
         }
+
+        var orderRemark = $(".product-remark:checked");// 备注
+        var remarkArray = new Array();
+        for (var i = 0; i < orderRemark.length; i++) {
+            remarkArray[i] = orderRemark[i].value;
+        }
+
         var productName = $(".product-name:checked");
 
         if(platformOrdersName == nameArray[0] ){
@@ -288,7 +304,8 @@
                 "info":infoArray,
                 "postType":$(".product-post-type").val(),
                 "shopId":$("#shop-id").val(),
-                "num":numArray
+                "num":numArray,
+                "remark":remarkArray
         },function(result){
             if (result.returnCode != 200) {
                 layer.msg('加载失败，请重试，请确认选择内容对应无误!',{icon: 5,time:3000});
@@ -313,6 +330,7 @@
                             '<td style="' + style + '">' + order.orderAddress + '</td>'+
                             '<td style="' + style + '">' + order.orderProductName + '</td>'+
                             '<td style="' + style + '">' + order.orderNum + '</td>'+
+                            '<td style="' + style + '">' + order.orderRemark + '</td>'+
                             '<td style="' + style + '">' + order.returnMsg + '</td>'+
                             '</tr>');
                 }

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/request_message.ftl

@@ -36,9 +36,9 @@
 		</div>
 		<div class="my-content">
 			<div style="margin: 10px 0;">
-			<label class="tit"><div class="icon-wen">问</div><span id="questionName"></span></label>
+			<label class="tit"><div class="icon-wen">问</div><br/><span id="questionName"></span></label>
 			</div>
-			<label class="tit"><div class="icon-ji">答</div></label>
+			<label class="tit"><div class="icon-ji">答</div><br/></label>
 			<ul class="ul-list">
 				<!--<li>01.拧开背部排水口阀门螺母，拔掉硅胶塞，套上配备的出水硅胶管，放置接水容器</li>
 				<li>02.插上电源，开启设备背部电源开关，面板所有指示灯亮起</li>

watero-rst-web/src/main/webapp/WEB-INF/views/wap/cm/send_message.ftl

@@ -47,7 +47,7 @@
 		</div>
 	</div>
 		<div class="tel">
-			售后热线：<a href="tel:4008006692">400-800-6692</a>
+			<#--售后热线：<a href="tel:4008006692">400-800-6692</a>-->
 		</div>
 		<div style="text-align: center;">
 			<p>以上信息是否解决了您的问题？</p>