客诉修改

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

@@ -38,8 +38,7 @@ public class CustomerInfo  implements Serializable {
     private String customerTel;
     // 微信昵称
     private String customerWechatName;
-    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-    @Deprecated
+    //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货     客诉修改 --> 不维护此字段
     private Integer customerIsSolve;
     //  是否需要回访  1:不需要回访  2:需要回复 
     private String customerIsVisit;
@@ -436,22 +435,9 @@ public class CustomerInfo  implements Serializable {
         this.customerTel = customerTel;
     }
 
-
-
-    /**
-     * 不维护此字段
-     * @param
-     */
-    @Deprecated
     public Integer getCustomerIsSolve() {
         return customerIsSolve;
     }
-
-    /**
-     * 请使用
-     * @param customerIsSolve
-     */
-    @Deprecated
     public void setCustomerIsSolve(Integer customerIsSolve) {
         this.customerIsSolve = customerIsSolve;
     }

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

@@ -6,6 +6,7 @@ import com.iamberry.rst.core.cm.BackGoods;
  * 退货service
  * Created by liuzhiwei on 2017/11/8.
  */
+@Deprecated
 public interface BackGoodsService {
 
     /**

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

@@ -23,6 +23,12 @@ public interface CmRelationService {
      */
     CmRelation  getCmRelationById(Integer  id);
     /**
+     * select relation by customer
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationByCustomerId(Integer  id);
+    /**
      * 增加数据
      * @param  cmRelation
      * @return Integer
@@ -40,4 +46,6 @@ public interface CmRelationService {
      * @return Integer
      */
     Integer  delete(Integer  id);
+
+    void getSendAndBackProduct(CmRelation cmRelation);
 }

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

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.cm.*;
 
 import java.util.List;
 
+@Deprecated
 public interface CustomerCommonService {
     /**
      * 获取寄送寄回的产品和配件

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

@@ -7,6 +7,7 @@ import java.util.List;
 /**
  * 客诉-产品配件service
  */
+@Deprecated
 public interface FittingsInfoService {
     /**
      * 添加配件信息

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

@@ -5,6 +5,7 @@ import com.iamberry.rst.core.cm.NoreasonBack;
 /**
  * Created by liuzhiwei on 2017/11/14.
  */
+@Deprecated
 public interface NoreasonBackService {
 
     /**

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

@@ -7,6 +7,7 @@ import java.util.List;
 /**
  * Created by Administrator on 2017/11/9.
  */
+@Deprecated
 public interface ReissueService {
 
     /**

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

@@ -9,6 +9,7 @@ import java.util.List;
  * 换新service
  * Created by liuzhiwei on 2017/11/7.
  */
+@Deprecated
 public interface RenewedService {
 
     /**

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

@@ -8,6 +8,7 @@ import java.util.List;
  * 维修Service
  * Created by liuzhiwei on 2017/11/8.
  */
+@Deprecated
 public interface RepairService {
 
     /**

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

@@ -1,8 +1,12 @@
 package com.iamberry.rst.service.cm;
 
+import com.iamberry.rst.core.cm.ClosedProdcue;
 import com.iamberry.rst.core.cm.CmRelation;
+import com.iamberry.rst.core.cm.SendProdcue;
 import com.iamberry.rst.faces.cm.CmRelationService;
+import com.iamberry.rst.service.cm.mapper.ClosedProdcueMapper;
 import com.iamberry.rst.service.cm.mapper.CmRelationMapper;
+import com.iamberry.rst.service.cm.mapper.SendProdcueMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +21,11 @@ import java.util.List;
 public class CmRelationServiceImpl  implements CmRelationService {
     @Autowired
     private CmRelationMapper cmRelationMapper;
+    @Autowired
+    private ClosedProdcueMapper closedProdcueMapper;
+    @Autowired
+    private SendProdcueMapper sendProdcueMapper;
+
     /**
      * 获取集合
      * @param  cmRelation
@@ -35,6 +44,12 @@ public class CmRelationServiceImpl  implements CmRelationService {
     public  CmRelation  getCmRelationById(Integer  id){
         return  cmRelationMapper.getCmRelationById(id);
     }
+
+    @Override
+    public CmRelation getCmRelationByCustomerId(Integer id) {
+        return  cmRelationMapper.getCmRelationByCustomerId(id);
+    }
+
     /**
      * 增加数据
      * @param  cmRelation
@@ -62,4 +77,17 @@ public class CmRelationServiceImpl  implements CmRelationService {
     public  Integer  delete(Integer  id){
         return  cmRelationMapper.delete(id);
     }
+
+    @Override
+    public void getSendAndBackProduct(CmRelation cmRelation) {
+        ClosedProdcue closedProdcue = new ClosedProdcue();
+        closedProdcue.setRelationId(cmRelation.getRelationId());
+        List<ClosedProdcue>  closedProdcueList = closedProdcueMapper.listclosedProdcue(closedProdcue);
+        cmRelation.setClosedProdcues(closedProdcueList);
+
+        SendProdcue sendProdcue = new SendProdcue();
+        sendProdcue.setRelationId(cmRelation.getRelationId());
+        List<SendProdcue> sendProdcueList = sendProdcueMapper.listSendProdcue(sendProdcue);
+        cmRelation.setSendProdcues(sendProdcueList);
+    }
 }

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

@@ -22,6 +22,14 @@ public interface CmRelationMapper {
      * @return  cmRelation
      */
     CmRelation  getCmRelationById(Integer  id);
+
+    /**
+     * select relation by customer
+     * @param  id
+     * @return  cmRelation
+     */
+    CmRelation  getCmRelationByCustomerId(Integer  id);
+
     /**
      * 增加数据
      * @param  cmRelation

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

@@ -21,12 +21,12 @@
 
   <insert id="insert" parameterType="ClosedProdcue" >
     insert into tb_rst_cm_closed_prodcue ( relation_id, product_id, closed_prodcue_machine_no,
-      color_id, closed_prodcue_number,closed_prodcue_type,color_bar)
+      color_id, closed_prodcue_number,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId}, #{node.closedProdcueMachineNo},
-       #{node.colorId}, #{node.closedProdcueNumber},#{node.closedProdcueType},#{node.colorBar}
+       #{node.colorId}, #{node.closedProdcueNumber},#{node.colorBar}
       )
     </foreach>
   </insert>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.mapper.CmRelationMapper">
+<mapper namespace="com.iamberry.rst.service.cm.mapper.CmRelationMapper">
     <resultMap  id="BaseResultMap" type="CmRelation" >
         <result    column="relation_id"    property="relationId" />
         <result    column="proc_method_id"    property="procMethodId" />
@@ -149,6 +149,14 @@
         from tb_rst_cm_relation t
         where t.relation_id= #{relationId}
     </select>
+
+    <select id="getCmRelationByCustomerId" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_cm_relation t
+        where t.customer_id= #{customerId}
+    </select>
+
     <insert id="save" parameterType="CmRelation"  useGeneratedKeys="true"  keyProperty="relationId" >
         insert into
         tb_rst_cm_relation

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

@@ -53,12 +53,12 @@
 
   <insert id="insert" parameterType="SendProdcue" >
     insert into tb_rst_cm_send_prodcue ( relation_id, product_id,
-      color_id, send_prodcue_number,send_produce_type,color_bar)
+      color_id, send_prodcue_number,color_bar)
     values
     <foreach collection="list" item="node" index="index" separator="," open="" close="">
       (
         #{node.relationId}, #{node.productId},
-        #{node.colorId}, #{node.sendProdcueNumber}, #{node.sendProduceType}, #{node.colorBar}
+        #{node.colorId}, #{node.sendProdcueNumber},  #{node.colorBar}
       )
     </foreach>
 

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

@@ -105,6 +105,10 @@ public class AdminCustomerController {
     private RelationOrderService relationOrderService;
     @Autowired
     private GenerateKeyUtil generateKeyUtil ;
+    @Autowired
+    private CmRelationService cmRelationService ;
+    @Autowired
+    private ProcMethodService procMethodService ;
 
 
     /**
@@ -173,95 +177,18 @@ public class AdminCustomerController {
         Integer loginAdminId = AdminUtils.getLoginAdminId();
         //查询客诉基本信息
         CustomerInfo customerInfo = customerService.getCustomerInfo(customerId);
-        /*客诉信息处理-stast*/
-        //对于区域处理
-        if (customerInfo != null && customerInfo.getCustomerArea() != null) {
-//            String[] customerAreaAndCity = customerInfo.getCustomerArea().split("-");
-//            customerInfo.setProvinceName(customerAreaAndCity[0]);
-//            City city
-//            addressService.listCity(customerAreaAndCity[0]);
-//            customerInfo.setCityName(customerAreaAndCity[0]);
-        }
-        /*客诉信息处理-end*/
-        CustomerCommon customerCommon = new CustomerCommon();
-        if (customerInfo.getCustomerIsSolve() != null) {
-            switch (customerInfo.getCustomerIsSolve()) {   //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-                case 3://获取换新
-                    Renewed renewed = new Renewed();
-                    renewed.setCustomerId(customerInfo.getCustomerId());
-                    renewed = renewedService.getRenewed(renewed);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(3, renewed);
-                    break;
-                case 4://维修
-                    Repair repair = new Repair();
-                    repair.setCustomerId(customerInfo.getCustomerId());
-                    repair = repairService.getRepair(repair);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(4, repair);
-                    break;
-                case 5:
-                    Reissue reissue = new Reissue();
-                    reissue.setCustomerId(customerInfo.getCustomerId());
-                    reissue = reissueService.getReissue(reissue);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(5, reissue);
-                    break;
-                case 6:
-                    BackGoods backGoods = new BackGoods();
-                    backGoods.setCustomerId(customerInfo.getCustomerId());
-                    backGoods = backGoodsService.getBackGoods(backGoods);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(6, backGoods);
-                    break;
-                case 7:
-                    NoreasonBack noreasonBack = new NoreasonBack();
-                    noreasonBack.setCustomerId(customerInfo.getCustomerId());
-                    noreasonBack = noreasonBackService.getNoreasonBack(noreasonBack);
-                    customerCommon = CustomerCommonUtil.getCustomerCommon(7, noreasonBack);
-                    break;
-            }
-
-            /*查询所有需要寄入寄出的产品*/
-            customerCommon.setCustomerIsSolve(customerInfo.getCustomerIsSolve());
-            customerCommon = customerCommonService.getListProduceAndFitting(customerCommon);
-
-            // 2018/4/18  页面只会给寄回的赋值，在处理方式为补发的情况下，寄出需要赋值到寄回当中
-            if (customerInfo.getCustomerIsSolve() == 5) {
-                //售后寄回产品表
-                List<ClosedProdcue> closedProdcues = new ArrayList<ClosedProdcue>();
-                for (SendProdcue sendProdcue : customerCommon.getSendProdcues()) {
-                    ClosedProdcue closedProdcue = new ClosedProdcue();
-                    closedProdcue.setRelationId(sendProdcue.getRelationId());
-                    closedProdcue.setProductType(sendProdcue.getProductType());
-                    closedProdcue.setProductId(sendProdcue.getProductId());
-                    closedProdcue.setColorId(sendProdcue.getColorId());
-                    closedProdcue.setClosedProductName(sendProdcue.getSendProduceName());
-                    closedProdcue.setClosedColorName(sendProdcue.getSendColorName());
-                    closedProdcue.setClosedProdcueNumber(sendProdcue.getSendProdcueNumber());
-                    closedProdcue.setColorBar(sendProdcue.getColorBar());
-                    closedProdcues.add(closedProdcue);
-                }
-                //售后寄回产品配件表
-                List<ClosedFitting> closedFittings = new ArrayList<ClosedFitting>();
-                for (SendFitting sendFitting : customerCommon.getSendFittings()) {
-                    ClosedFitting closedFitting = new ClosedFitting();
-                    closedFitting.setRelationId(sendFitting.getRelationId());
-                    closedFitting.setClosedFittingType(sendFitting.getSendFittingType());
-                    closedFitting.setProductId(sendFitting.getProductId());
-                    closedFitting.setFittingsId(sendFitting.getFittingsId());
-                    closedFitting.setClosedProductName(sendFitting.getSendProductName());
-                    closedFitting.setClosedFittingsName(sendFitting.getSendFittingsName());
-                    closedFitting.setClosedFittingNumber(sendFitting.getSendFittingNumber());
-                    closedFitting.setColorBar(sendFitting.getColorBar());
-                    closedFittings.add(closedFitting);
-                }
-                customerCommon.setClosedProdcues(closedProdcues);
-                customerCommon.setClosedFittings(closedFittings);
-            }
-            mv.addObject("customerCommon", customerCommon);
-
-            if (customerInfo.getTypeId() == 1) {
-                customerInfo.setIsNeedSelectOrder(2);       //不需要订单
-            } else {
-                customerInfo.setIsNeedSelectOrder(1);
-            }
+        /*查询处理方式*/
+        CmRelation cmRelation = cmRelationService.getCmRelationByCustomerId(customerInfo.getCustomerId());
+        /*获取寄出寄入产品*/
+        cmRelationService.getSendAndBackProduct(cmRelation);
+        /*处理方式*/
+        ProcMethod procMethod = procMethodService.getProcMethodById(cmRelation.getProcMethodId());
+
+        if (customerInfo.getTypeId() == 1 || (procMethod.getProcMethodIsSend()==2 && procMethod.getProcMethodIsBack() == 2)) {
+            customerInfo.setIsNeedSelectOrder(2);       //不需要订单
+        } else {
+            customerInfo.setIsNeedSelectOrder(1);
+        }
 
             /*查询所有的产品，颜色和配件信息*/
 //            List<Product> productList = productService.listProduce(new Product());
@@ -278,31 +205,30 @@ public class AdminCustomerController {
 //            }
 //            mv.addObject("productList", productList);
 
-            if (customerInfo.getTypeId() != 1 && (customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5 ||
-                    customerInfo.getCustomerIsSolve() == 6 || customerInfo.getCustomerIsSolve() == 7)) {
-                RelationOrder relationOrder = new RelationOrder();
-                relationOrder.setRelationType(customerCommon.getCustomerIsSolve());
-                relationOrder.setRelationId(customerCommon.getRelationId());
-                List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
+        //setIsNeedSelectOrder
+        if (customerInfo.getIsNeedSelectOrder() == 1 ) {
+            RelationOrder relationOrder = new RelationOrder();
+            relationOrder.setRelationId(cmRelation.getRelationId());
+            List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
 
-                String[] salesIds = new String[relationOrderList.size()];
-                for (int k = 0; k < relationOrderList.size(); k++) {
-                    salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
-                }
-                SalesOrder so = new SalesOrder();
-                so.setSalesIds(salesIds);
-                List<SalesOrder> orderList = salesOrderService.listSalesOrder(so);
-                for (SalesOrder sor : orderList) {
-                    SalesOrderItem salesOrderItem = new SalesOrderItem();
-                    salesOrderItem.setItemOrderId(sor.getSalesId());
-                    List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
-                    sor.setSalesOrderItemList(salesOrderItemList);
-                }
-                mv.addObject("salesOrderList", orderList);
-            } else {
-                mv.addObject("salesOrderList", null);
+            String[] salesIds = new String[relationOrderList.size()];
+            for (int k = 0; k < relationOrderList.size(); k++) {
+                salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
+            }
+            SalesOrder so = new SalesOrder();
+            so.setSalesIds(salesIds);
+            List<SalesOrder> orderList = salesOrderService.listSalesOrder(so);
+            for (SalesOrder sor : orderList) {
+                SalesOrderItem salesOrderItem = new SalesOrderItem();
+                salesOrderItem.setItemOrderId(sor.getSalesId());
+                List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(salesOrderItem);
+                sor.setSalesOrderItemList(salesOrderItemList);
             }
+            mv.addObject("salesOrderList", orderList);
+        } else {
+            mv.addObject("salesOrderList", null);
         }
+
         if ("2".equals(customerInfo.getCustomerIsVisit())) { //1:不需要回访  2:需要回访
             Visit visit = new Visit();
             visit.setCustomerId(customerInfo.getCustomerId());
@@ -320,7 +246,8 @@ public class AdminCustomerController {
         ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
         List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(complaintTypeInfo);
 
-
+        mv.addObject("cmRelation", cmRelation);
+        mv.addObject("procMethod", procMethod);
         mv.addObject("customerInfo", customerInfo);
         mv.addObject("typeList", typeList);
         mv.addObject("complaintTypeList", complaintTypeList);
@@ -863,7 +790,7 @@ public class AdminCustomerController {
     @RequiresPermissions("customer:add:customer")
     @RequestMapping("/save_customer")
     public ResponseJson addCustomer(HttpServletRequest request, CustomerInfo customerInfo, SalesOrder salesOrder, CmRelation cmRelation,
-                                    String sendProdcuesJson,  String closedProdcuesJson) throws Exception {
+                                    String sendProdcuesJson,String closedProdcuesJson) throws Exception {
         ResponseJson rjx = this.isValiData(customerInfo);
         if (rjx.getResultCode() == 500) {
             return rjx;

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

@@ -357,51 +357,18 @@
                 <label class="form-label col-1 col-sm-1">处理结果：</label>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                         <select class="select" id="procTypeId" ulcId="2" ulcValName="procTypeName" ulcValId="procTypeId"  ulcURL="/admin/proc/type" msg="" ulcList="list">
+                         <select class="select" id="procTypeId" name="procTypeId" ulcId="2" ulcValName="procTypeName" ulcValId="procTypeId"  ulcURL="/admin/proc/type" msg="" ulcList="list">
                          </select>
                      </span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <span class="select-box">
-                         <select class="select" id="procMethodId"  ulcId="3"  ulcValName="procMethodName" ulcValId="procMethodId"  ulcURL="/admin/proc/method?procTypeId=" msg="" ulcList="list" >
+                         <select class="select" id="procMethodId" name="procMethodId"  ulcId="3"  ulcValName="procMethodName" ulcValId="procMethodId"  ulcURL="/admin/proc/method?procTypeId=" msg="" ulcList="list" >
                          </select>
                      </span>
                 </div>
             </div>
-            <#--
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1">处理类型：</label>
-                <div class="formControls col-10 col-sm-10 skin-minimal">
-                    <div class="radio-box" id="solved">
-                        <input type="radio" id="customer-process-1" value="1" name="customerIsSolve" >
-                        <label for="customer-process-1">已解决</label>
-                    </div>
-                    <div class="radio-box" id="noSolved">
-                        <input type="radio" id="customer-process-2" value="2" name="customerIsSolve">
-                        <label for="customer-process-2">未解决</label>
-                    </div>
-                    <div class="radio-box" id="renewed" style="display: none">
-                        <input type="radio" id="customer-process-3" value="3" name="customerIsSolve" checked>
-                        <label for="customer-process-3">换新</label>
-                    </div>
-                    <div class="radio-box" id="maintain" style="display: none">
-                        <input type="radio" id="customer-process-4" value="4" name="customerIsSolve" >
-                        <label for="customer-process-4">维修</label>
-                    </div>
-                    <div class="radio-box" id="reissue" style="display: none">
-                        <input type="radio" id="customer-process-5" value="5" name="customerIsSolve">
-                        <label for="customer-process-5">补发</label>
-                    </div>
-                    <div class="radio-box" id="backGoods" style="display: none">
-                        <input type="radio" id="customer-process-6" value="6" name="customerIsSolve">
-                        <label for="customer-process-6">退货</label>
-                    </div>
-                    <div class="radio-box" id="noReasonBack" style="display: none">
-                        <input type="radio" id="customer-process-7" value="7" name="customerIsSolve">
-                        <label for="customer-process-7">无理由退货</label>
-                    </div>
-                </div>
-            </div>-->
+
 
             <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>

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

@@ -455,13 +455,13 @@
             <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="${customerCommon.relationSendName!''}" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="联系人格式不正确！" >
+                    <input type="text" class="input-text" value="${cmRelation.relationSendName!''}" placeholder="填写收件人姓名" id="sendName" name="relationSendName" datatype="/^[\u4e00-\u9fa5]{1,20}$/" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="${customerCommon.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text" value="${cmRelation.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="m" errormsg="联系人电话格式不正确！">
                 </div>
                 <div class="formControls col-2 col-sm-2"  id="postageAccount">
-                    <input type="text" class="input-text" value="${customerCommon.relationAlipay!''}" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">
+                    <input type="text" class="input-text" value="${cmRelation.relationAlipay!''}" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">
                 </div>
             </div>
             <div class="row cl" id="recipientAddress" style="display: none;">
@@ -493,7 +493,7 @@
             <div class="row cl" id="recipientAddressText" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-5 col-sm-5">
-                    <textarea name="relationSendAddress" id="sendAddress" cols="" rows="2" datatype="*" errormsg="收货地址不正确！" class="textarea" placeholder="请填写详细地址，最多支持50字符" onKeyUp="$.Huitextarealength(this,50)">${customerCommon.relationSendAddress!''}</textarea>
+                    <textarea name="relationSendAddress" id="sendAddress" cols="" rows="2" datatype="*" errormsg="收货地址不正确！" class="textarea" placeholder="请填写详细地址，最多支持50字符" onKeyUp="$.Huitextarealength(this,50)">${cmRelation.relationSendAddress!''}</textarea>
                     <span id="addrssMsg"></span>
                 </div>
             </div>
@@ -512,8 +512,8 @@
                         </thead>
                         <tbody id="addProduct">
 
-                            <#if (customerCommon.closedProdcues?size>0)>
-                                <#list customerCommon.closedProdcues as closedProdcues>
+                            <#if (cmRelation.closedProdcues?size>0)>
+                                <#list cmRelation.closedProdcues as closedProdcues>
                                 <tr>
                                         <td style="text-align: center;">
                                             ${closedProdcues.closedProductName!""}
@@ -532,7 +532,7 @@
                                         </td>
                                 </tr>
                                 </#list>
-                                <#list customerCommon.closedFittings as closedFittings>
+                                <#list cmRelation.closedFittings as closedFittings>
                                     <tr>
                                         <td style="text-align: center;">
                                             ${closedFittings.closedProductName!""}
@@ -564,11 +564,11 @@
                     <div class="row cl" id="customerCostsDiv" style="display: none;">
                             <label class="form-label col-1 col-sm-1">工厂报价：</label>
                     <div class="col-2 col-sm-2">
-                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${customerCommon.relationFactoryCosts!''}">
+                            <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="${cmRelation.relationFactoryCosts!''}">
                             </div>
                             <label class="form-label col-1 col-sm-1">给客户报价：</label>
                     <div class="col-2 col-sm-2">
-                            <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${customerCommon.relationCustomerCosts!''}">
+                            <input type="text" class="input-text trim_input" placeholder="客户报价" id="relationCustomerCosts" name="relationCustomerCosts" value="${cmRelation.relationCustomerCosts!''}">
                             </div>
                             </div>
                     <div class="row cl" id="sendInformationTitle">
@@ -1057,20 +1057,20 @@
      */
     function setAddressInfo(){
         var proId = setPro(null,1);  //创建省
-        <#if customerCommon.provinceNumber?? >
-            var proId = ${customerCommon.provinceNumber!''};
+        <#if cmRelation.provinceNumber?? >
+            var proId = ${cmRelation.provinceNumber!''};
             $("#province option[value='"+ proId +"']").attr("selected","true"); //设置省
         </#if>
 
         var cityId = setCity(null,proId,2);
-        <#if customerCommon.cityNumber?? >
-            var cityId = ${customerCommon.cityNumber!''};
+        <#if cmRelation.cityNumber?? >
+            var cityId = ${cmRelation.cityNumber!''};
             $("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市
         </#if>
 
         setDistrict(null, cityId, 2);
-        <#if customerCommon.areaNumber?? >
-            var disId = ${customerCommon.areaNumber!''};
+        <#if cmRelation.areaNumber?? >
+            var disId = ${cmRelation.areaNumber!''};
             $("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区
             isInitAddress = 1;
         </#if>

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -408,7 +408,6 @@ function initProduceType(){
  *
  */
 function ulcProcessResult(data){
-    console.log(JSON.stringify(data));
     initProcessResult(data[1].procMethodIsBack,data[1].procMethodIsSend);
 }