添加客诉，不需要添加订单

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

@@ -92,6 +92,8 @@ public class CustomerCommon implements Serializable {
     private Integer customerIsSolve;
     //Efast订单编号
     private String salesOrderId;
+    //是否需要添加订单
+    private Integer isNeedSelectOrder;
 
     public String getSalesOrderId() {
         return salesOrderId;
@@ -404,4 +406,12 @@ public class CustomerCommon implements Serializable {
     public void setRelationAlipayName(String relationAlipayName) {
         this.relationAlipayName = relationAlipayName;
     }
+
+    public Integer getIsNeedSelectOrder() {
+        return isNeedSelectOrder;
+    }
+
+    public void setIsNeedSelectOrder(Integer isNeedSelectOrder) {
+        this.isNeedSelectOrder = isNeedSelectOrder;
+    }
 }

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

@@ -62,7 +62,7 @@ public class CustomerInfo  implements Serializable {
     private String cityName;
 
     /*是否需要选择订单，用于处理添加客诉需不需要处理订单功能*/
-    private String isNeedSelectOrder;       //1：需要有订单    2：不需要有订单
+    private Integer isNeedSelectOrder;       //1：需要有订单    2：不需要有订单
 
     private String productName;         //客诉产品
     private String complaintClassName;  //客诉类型名称
@@ -635,11 +635,11 @@ public class CustomerInfo  implements Serializable {
     }
 
 
-    public String getIsNeedSelectOrder() {
+    public Integer getIsNeedSelectOrder() {
         return isNeedSelectOrder;
     }
 
-    public void setIsNeedSelectOrder(String isNeedSelectOrder) {
+    public void setIsNeedSelectOrder(Integer isNeedSelectOrder) {
         this.isNeedSelectOrder = isNeedSelectOrder;
     }
 }

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

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
 public class CustomerServiceImpl implements CustomerService {
@@ -81,6 +82,7 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     @Transactional
     public Integer saveCustomerInfo(CustomerInfo customerInfo,SalesOrder salesOrder){
+        Integer isNeedSelectOrder = customerInfo.getIsNeedSelectOrder();
 
         //添加客诉基本信息
         Integer flag = 0;
@@ -123,8 +125,10 @@ public class CustomerServiceImpl implements CustomerService {
                 customerInfo.getCustomerIsSolve() == 6 || customerInfo.getCustomerIsSolve() == 7)
                 ){
 
-            salesOrder = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
-            logger.info("-----------添加客诉-查询订单--------------");
+            if(isNeedSelectOrder == 1){
+                salesOrder = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
+                logger.info("-----------添加客诉-查询订单--------------");
+            }
 
             CustomerCommon customerCommon = customerInfo.getCustomerCommon();
             customerCommon.setCustomerId(customerInfo.getCustomerId()); //设置客诉id
@@ -269,6 +273,7 @@ public class CustomerServiceImpl implements CustomerService {
     @Override
     @Transactional
     public Integer updateCustomerInfo(CustomerInfo customerInfo,SalesOrder salesOrder){
+        Integer isNeedSelectOrder = customerInfo.getIsNeedSelectOrder();
 
         //删除旧的售后数据
         customerService.deleteCustomerAfterSales(customerInfo);
@@ -310,16 +315,23 @@ public class CustomerServiceImpl implements CustomerService {
                         customerInfo.getCustomerIsSolve() == 6 || customerInfo.getCustomerIsSolve() == 7)
                 ){
 
-            salesOrder = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
+            if(isNeedSelectOrder == 1){
+                salesOrder = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
+            }
+
             logger.info("-----------修改客诉-查询订单--------------");
             CustomerCommon customerCommon = customerInfo.getCustomerCommon();
             customerCommon.setCustomerId(customerInfo.getCustomerId()); //设置客诉id
             customerCommon.setRelationBackStatus(1); //寄回状态 1：未寄回
             customerCommon.setRelationSendStatus(1); //寄送状态 1：未寄送
             customerCommon.setRelationState(1); //状态  默认使用中
-            customerCommon.setOrderId(salesOrder.getSalesId()); //订单id
+            if(isNeedSelectOrder == 1){
+                customerCommon.setOrderId(salesOrder.getSalesId()); //订单id
+            }
             customerCommon.setTransactionNumber(customerInfo.getTransactionNumber());   //外部交易号
 
+            customerCommon.setIsNeedSelectOrder(isNeedSelectOrder); //是否需要添加订单
+
             customerCommon.setRelationIsTransfer(0);    //是否已转账邮费  0:不需要
             customerCommon.setRelationBackPostage(0);   //邮费默认为0
 
@@ -382,9 +394,7 @@ public class CustomerServiceImpl implements CustomerService {
                     customerService.saveComplaintDetectInfo(complaintDetectInfo,customerCommon);   //创建品检
                     break;
                 case 7: //无理由退货
-
 //                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
-
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
@@ -429,21 +439,22 @@ public class CustomerServiceImpl implements CustomerService {
             logger.info("-----------修改客诉-添加换新/维修/补发/退货/无理由退货信息成功--------------");
             customerCommon.setRelationId(relationId);
 
-            CustomerCommonUtil.setProduceOrFitting(customerInfo.getCustomerIsSolve(),customerCommon);
-
-            if(customerCommon.getClosedFittings()!=null && customerCommon.getClosedFittings().size() > 0){
-                closedFittingMapper.insert(customerCommon.getClosedFittings());
-            }
-            if(customerCommon.getClosedProdcues() != null && customerCommon.getClosedProdcues().size()>0){
-                closedProdcueMapper.insert(customerCommon.getClosedProdcues());
-            }
-            if(customerCommon.getSendProdcues() != null && customerCommon.getSendProdcues().size() > 0){
-                sendProdcueMapper.insert(customerCommon.getSendProdcues());
-            }
-            if(customerCommon.getSendFittings() != null && customerCommon.getSendFittings().size() > 0){
-                sendFittingMapper.insert(customerCommon.getSendFittings());
+            if(customerCommon.getIsNeedSelectOrder() == 1){
+                CustomerCommonUtil.setProduceOrFitting(customerInfo.getCustomerIsSolve(),customerCommon);
+                if(customerCommon.getClosedFittings()!=null && customerCommon.getClosedFittings().size() > 0){
+                    closedFittingMapper.insert(customerCommon.getClosedFittings());
+                }
+                if(customerCommon.getClosedProdcues() != null && customerCommon.getClosedProdcues().size()>0){
+                    closedProdcueMapper.insert(customerCommon.getClosedProdcues());
+                }
+                if(customerCommon.getSendProdcues() != null && customerCommon.getSendProdcues().size() > 0){
+                    sendProdcueMapper.insert(customerCommon.getSendProdcues());
+                }
+                if(customerCommon.getSendFittings() != null && customerCommon.getSendFittings().size() > 0){
+                    sendFittingMapper.insert(customerCommon.getSendFittings());
+                }
+                logger.info("-----------添加客诉-寄回寄出产品配件成功--------------");
             }
-            logger.info("-----------添加客诉-寄回寄出产品配件成功--------------");
         }
         return flag;
     }
@@ -638,6 +649,9 @@ public class CustomerServiceImpl implements CustomerService {
      */
     @Transactional
     public void saveComplaintDetectInfo(ComplaintDetectInfo complaintDetectInfo,CustomerCommon customerCommon){
+        if(customerCommon.getIsNeedSelectOrder() == 2){
+            return;
+        }
         Integer flag = 0;
         List<ComplaintDetectInfo> complaintDetectInfoList = new ArrayList<ComplaintDetectInfo>();
         for(int i=0 ;i< customerCommon.getClosedProdcues().size();i++){
@@ -674,6 +688,9 @@ public class CustomerServiceImpl implements CustomerService {
      */
     @Transactional
     public void saveComplaintSignclosedInfo(ComplaintSignclosedInfo complaintSignclosedInfo,CustomerCommon customerCommon){
+        if(customerCommon.getIsNeedSelectOrder() == 2){
+            return;
+        }
         Integer flag;
         complaintSignclosedInfo.setSignclosedType(1); //客诉寄回
         complaintSignclosedInfo.setSignclosedIsQuality(1); //是否平品检 1：需要品检

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

@@ -332,7 +332,7 @@
         customer_update_time = #{customerUpdateTime},
       </if>
       <if test="typeId != null" >
-        type_id = #{typeId}
+        type_id = #{typeId},
       </if>
       <if test="customerDesc != null" >
         customer_desc = #{customerDesc}

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

@@ -207,6 +207,12 @@ public class AdminCustomerController {
             customerCommon = customerCommonService.getListProduceAndFitting(customerCommon);
             mv.addObject("customerCommon", customerCommon);
 
+            if(customerCommon.getOrderId() == null || "".equals(customerCommon.getOrderId())){
+                customerInfo.setIsNeedSelectOrder(2);       //不需要订单
+            }else{
+                customerInfo.setIsNeedSelectOrder(1);
+            }
+
             /*查询所有的产品，颜色和配件信息*/
 
             List<Product> productList = productService.listProduce(new Product());
@@ -778,33 +784,36 @@ public class AdminCustomerController {
         if(rjx.getResultCode() == 500){
             return rjx;
         }
-        Integer flag = 0;
-        JSONArray jsonArray;
-        List<SendProdcue> sendProdcueList;
-        List<SendFitting> sendFittingList;
-        List<ClosedProdcue> closedProdcueList;
-        List<ClosedFitting> closedFittingList;
 
         Integer customerIsSolve = customerInfo.getCustomerIsSolve();    //处理类型
         String phone = customerInfo.getCustomerTel();       //手机号码
         Integer typeCompany = customerInfo.getTypeCompany();    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
 
-        jsonArray = JSONArray.fromObject(sendProdcuesJson);
-        sendProdcueList = (List) JSONArray.toCollection(jsonArray, SendProdcue.class);
+        Integer flag = 0;
+        if(customerInfo.getIsNeedSelectOrder() == 1){ ////1：需要有订单    2：不需要有订单
+            JSONArray jsonArray;
+            List<SendProdcue> sendProdcueList;
+            List<SendFitting> sendFittingList;
+            List<ClosedProdcue> closedProdcueList;
+            List<ClosedFitting> closedFittingList;
 
-        jsonArray = JSONArray.fromObject(sendFittingsJson);
-        sendFittingList = (List) JSONArray.toCollection(jsonArray, SendFitting.class);
+            jsonArray = JSONArray.fromObject(sendProdcuesJson);
+            sendProdcueList = (List) JSONArray.toCollection(jsonArray, SendProdcue.class);
 
-        jsonArray = JSONArray.fromObject(closedProdcuesJson);
-        closedProdcueList = (List) JSONArray.toCollection(jsonArray, ClosedProdcue.class);
+            jsonArray = JSONArray.fromObject(sendFittingsJson);
+            sendFittingList = (List) JSONArray.toCollection(jsonArray, SendFitting.class);
 
-        jsonArray = JSONArray.fromObject(closedFittingsJson);
-        closedFittingList = (List) JSONArray.toCollection(jsonArray, ClosedFitting.class);
+            jsonArray = JSONArray.fromObject(closedProdcuesJson);
+            closedProdcueList = (List) JSONArray.toCollection(jsonArray, ClosedProdcue.class);
 
-        customerCommon.setSendProdcues(sendProdcueList);
-        customerCommon.setSendFittings(sendFittingList);
-        customerCommon.setClosedProdcues(closedProdcueList);
-        customerCommon.setClosedFittings(closedFittingList);
+            jsonArray = JSONArray.fromObject(closedFittingsJson);
+            closedFittingList = (List) JSONArray.toCollection(jsonArray, ClosedFitting.class);
+
+            customerCommon.setSendProdcues(sendProdcueList);
+            customerCommon.setSendFittings(sendFittingList);
+            customerCommon.setClosedProdcues(closedProdcueList);
+            customerCommon.setClosedFittings(closedFittingList);
+        }
 
         customerInfo.setCustomerCommon(customerCommon);
         String orderId = "";
@@ -897,33 +906,35 @@ public class AdminCustomerController {
             return rjx;
         }
         Integer flag = 0;
-        JSONArray jsonArray;
-        List<SendProdcue> sendProdcueList;
-        List<SendFitting> sendFittingList;
-        List<ClosedProdcue> closedProdcueList;
-        List<ClosedFitting> closedFittingList;
 
         Integer customerIsSolve = customerInfo.getCustomerIsSolve();    //处理类型
         String phone = customerInfo.getCustomerTel();       //手机号码
         Integer typeCompany = customerInfo.getTypeCompany();    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
 
-        jsonArray = JSONArray.fromObject(sendProdcuesJson);
-        sendProdcueList = (List) JSONArray.toCollection(jsonArray, SendProdcue.class);
+        if(customerInfo.getIsNeedSelectOrder() == 1){
+            JSONArray jsonArray;
+            List<SendProdcue> sendProdcueList;
+            List<SendFitting> sendFittingList;
+            List<ClosedProdcue> closedProdcueList;
+            List<ClosedFitting> closedFittingList;
 
-        jsonArray = JSONArray.fromObject(sendFittingsJson);
-        sendFittingList = (List) JSONArray.toCollection(jsonArray, SendFitting.class);
+            jsonArray = JSONArray.fromObject(sendProdcuesJson);
+            sendProdcueList = (List) JSONArray.toCollection(jsonArray, SendProdcue.class);
 
-        jsonArray = JSONArray.fromObject(closedProdcuesJson);
-        closedProdcueList = (List) JSONArray.toCollection(jsonArray, ClosedProdcue.class);
+            jsonArray = JSONArray.fromObject(sendFittingsJson);
+            sendFittingList = (List) JSONArray.toCollection(jsonArray, SendFitting.class);
 
-        jsonArray = JSONArray.fromObject(closedFittingsJson);
-        closedFittingList = (List) JSONArray.toCollection(jsonArray, ClosedFitting.class);
+            jsonArray = JSONArray.fromObject(closedProdcuesJson);
+            closedProdcueList = (List) JSONArray.toCollection(jsonArray, ClosedProdcue.class);
 
-        customerCommon.setSendProdcues(sendProdcueList);
-        customerCommon.setSendFittings(sendFittingList);
-        customerCommon.setClosedProdcues(closedProdcueList);
-        customerCommon.setClosedFittings(closedFittingList);
+            jsonArray = JSONArray.fromObject(closedFittingsJson);
+            closedFittingList = (List) JSONArray.toCollection(jsonArray, ClosedFitting.class);
 
+            customerCommon.setSendProdcues(sendProdcueList);
+            customerCommon.setSendFittings(sendFittingList);
+            customerCommon.setClosedProdcues(closedProdcueList);
+            customerCommon.setClosedFittings(closedFittingList);
+        }
         customerInfo.setCustomerCommon(customerCommon);
         String orderId = "";
         if (customerInfo.getCustomerIsSolve() == 3 || customerInfo.getCustomerIsSolve() == 4 || customerInfo.getCustomerIsSolve() == 5) {

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

@@ -68,8 +68,10 @@
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">
         <form action="${path}/admin/customer/save_customer" method="post" class="form form-horizontal" id="form-customer-add"  onkeydown="if(event.keyCode==13)return false;">
-            <div class="row cl">
 
+            <input type="hidden" id="isNeedSelectOrder" name="isNeedSelectOrder" value="">
+
+            <div class="row cl">
                 <label class="form-label col-3">
                     <div class="tit-2">客诉基本信息</div>
                 </label>
@@ -120,7 +122,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>产品类型：</label>
                 <input type="hidden" id="typeCompany" name="typeCompany" value="">
-                <div class="formControls col-10 col-sm-10 skin-minimal" id="produceTypeHtml">
+                <div class="formControls col-10 col-sm-10 skin-minimal produce_type_html" id="produceTypeHtml">
                     <#--<div class="radio-box">
                         <input type="radio" id="tel-3" name="produceType" datatype="*" nullmsg="请选择产品类型！">
                         <label for="tel-3">净水机</label>
@@ -739,7 +741,7 @@
         });
 
         /*监听回访类型选择事件  是否需要回访  1:不需要回访  2:需要回复  */
-        initVisitEvent();
+//        initVisitEvent();
 
 
         /*监听回访选择客服的选择事件*/

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

@@ -71,6 +71,8 @@
 
             <input type="hidden" id="customerId" name="customerId" value="${customerInfo.customerId!''}">
 
+            <input type="hidden" id="isNeedSelectOrder" name="isNeedSelectOrder" value="${customerInfo.isNeedSelectOrder}">
+
             <div class="row cl">
                 <label class="form-label col-3">
                     <div class="tit-2">客诉基本信息</div>
@@ -538,7 +540,7 @@
             <div class="row cl" id="customerDescDiv">
                 <label class="form-label col-1 col-sm-1">备注：</label>
                 <div class="col-2 col-sm-2 col-offset-3">
-                    <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;margin-left: -279px;">${customerInfo.customerDesc}</textarea>
+                    <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;margin-left: -279px;">${customerInfo.customerDesc!''}</textarea>
                 </div>
             </div>
             <div class="row cl" id="sendAddressByPhone" style="display: none;">
@@ -754,6 +756,9 @@
     /* 用于判断是否第一次初始化省市区-- 只在选择类型为售后时使用 */
     var isInitAddress = ${customerInfo.customerIsSolve!''};
 
+    /*1：需要有订单    2：不需要有订单*/
+    var isNeedSelectOrder = ${customerInfo.isNeedSelectOrder};
+
     /*初始化页面参数*/
     $(function () {
         /* 初始化单选框样式 */
@@ -801,6 +806,32 @@
             initProcessResult(allCustomerType);
         })
 
+        /*默认选择是否需要选择订单*/
+        opentionSelectOrder(isNeedSelectOrder);
+
+        /*绑定产品类型选择事件*/
+        $("input[name='typeId']").change(function (){
+            var typeId = parseInt($(this).val());
+            var isOrder = 1;
+            switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7：Aiberle净水机    9 ：YULIA净水机
+                case 1:
+                    isOrder = 2;
+                    break;
+                case 6:
+                    isOrder = 1;
+                    break;
+                case 7:
+                    isOrder = 1;
+                    break;
+                case 9:
+                    isOrder = 1;
+                    break;
+                default:
+                    break;
+            }
+            opentionSelectOrder(isOrder);
+        })
+
         /*监听处理结果选择事件*/
         $("[name='customerIsSolve']").change(function(){
             initProcessResult(parseInt($(this).val()));

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

@@ -253,7 +253,7 @@ function initCheck(){
 
 /*初始化单选框样式*/
 function initCheckByNode(node){
-    node.iCheck({
+    $(node).iCheck({
         checkboxClass: 'icheckbox-blue',
         radioClass: 'iradio-blue',
         increaseArea: '20%'
@@ -360,7 +360,7 @@ function initProduceType(){
                 for(var i=0;i<data.returnMsg.productTypeList.length;i++){
                     var produce = data.returnMsg.productTypeList[i];
                     html += ' <div class="radio-box">' +
-                        '<input type="radio" id="produce-type-'+ i +'" name="typeId" typeCompany="'+ produce.typeCompany +'"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
+                        '<input type="radio" class="single_loading"  id="produce-type-'+ i +'" name="typeId" typeCompany="'+ produce.typeCompany +'"  datatype="*" value="'+ produce.typeId +'"  '+ check +' nullmsg="请选择产品类型！" >' +
                         ' <label for="produce-type-'+ i +'">'+ produce.typeName +'</label>' +
                         ' </div>';
                     check = "";
@@ -369,18 +369,36 @@ function initProduceType(){
                 html = '';
             }
             $("#produceTypeHtml").html(html);
-            initCheck();
+            initCheckByNode(".produce_type_html input");
+
+            /*绑定产品类型选择事件*/
+            $("input[name='typeId']").change(function (){
+                var typeId = parseInt($(this).val());
+                var isOrder = 1;
+                switch (typeId){    //1:Soodo电动牙刷   6:WaterO净水机    7：Aiberle净水机    9 ：YULIA净水机
+                    case 1:
+                        isOrder = 2;
+                        break;
+                    case 6:
+                        isOrder = 1;
+                        break;
+                    case 7:
+                        isOrder = 1;
+                        break;
+                    case 9:
+                        isOrder = 1;
+                        break;
+                    default:
+                        break;
+                }
+                opentionSelectOrder(isOrder);
+            })
+            /*当前第一个默认选中上朵电动牙刷  isNeedSelectOrder = 2  默认不需要选择订单*/
+            opentionSelectOrder(2);
         },
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }
     });
-
-    /*绑定产品类型选择事件*/
-    $("input[name='typeId']").change(function (){
-        opentionSelectOrder($(this).val());
-    })
-    /*当前第一个默认选中上朵电动牙刷  isNeedSelectOrder = 2  默认不需要选择订单*/
-    opentionSelectOrder(2);
 }
 
 /**
@@ -572,6 +590,11 @@ function initProcessResult(type){
             default:
                 break;
         }
+
+        if(isNeedSelectOrder == 2){     //不需要订单
+            $("#orderHead").hide();
+            $("#order").hide();
+        }
     }
     for(var i=0;i< result.length;i++){
         var html = statusHtml.replace("status_index",i+1);
@@ -1472,9 +1495,12 @@ function setStore(companyId,node){
  */
 function  opentionSelectOrder(type){
     isNeedSelectOrder = type ;
-    if(isNeedSelectOrder){
+    if(isNeedSelectOrder == 2){
         $("#orderHead").hide();
         $("#order").hide();
+    }else{
+        $("#orderHead").show();
+        $("#order").show();
     }
 }
 
@@ -1522,6 +1548,9 @@ function addCustomerReady(){
     //保存AQ
     saveQuestion(2);
 
+    /* 是否需要添加订单，赋值 */
+    $("#isNeedSelectOrder").val(isNeedSelectOrder);
+
     /* 录入电话号码和姓名到客诉基本信息里面  */
     /*if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 5 || allCustomerType == 6 || allCustomerType == 7){
         $("#customerName").val($("#sendName").val());
@@ -1616,136 +1645,140 @@ function addCustomerReady(){
     /*----处理描述--end-----*/
 
     /* --- 类型：售后   处理结果：维修/换新/补发/退货/无理由退货 -- 处理产品 start---- */
-    var sendProdcues = new Array();  //寄出产品表
-    var sendFittings = new Array();
-    var closedProdcues = new Array();
-    var closedFittings = new Array();
-
-    $("#addProduct").find(".input-color-number").each(function(){
-        var number = $(this).val();
-        if(number != null && number != "" && number != 0){
-            var product = new Object();
-            product.productId = $(this).parent().find(".input-produce-id").val();
-            product.colorId = $(this).parent().find(".input-color-id").val();
-            //换新、维修，退货，无理由退货，
-            if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 6 || allCustomerType == 7){
-                product.closedProdcueNumber = number;
-                closedProdcues.push(product);
-            }else if(allCustomerType == 5){
-                product.sendProdcueNumber = number;
-                sendProdcues.push(product);
-            }
-        }
-    })
 
-    $("#addProduct").find(".input-fittings-number").each(function(){
-        var number = $(this).val();
-        if(number != null && number != ""  && number != 0){
-            var fittings = new Object();
-            fittings.productId = $(this).parent().find(".input-produce-id").val();
-            fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
-            //换新、维修，退货，无理由退货，
-            if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 6 || allCustomerType == 7){
-                fittings.closedFittingNumber = number;
-                closedFittings.push(fittings);
-            }else if(allCustomerType == 5){
-                fittings.sendFittingNumber = number;
-                sendFittings.push(fittings);
-            }
-        }
-    })
+    if(isNeedSelectOrder == 1) {     //需要订单
 
-    $("#back-product").find(".input-color-number").each(function(){
-        var number = $(this).val();
-        if(number != null && number != ""  && number != 0){
-            //换新、维修，
-            if(allCustomerType == 3 || allCustomerType == 4){
-                var fittings = new Object();
-                fittings.productId = $(this).parent().find(".input-produce-id").val();
-                fittings.colorId = $(this).parent().find(".input-color-id").val();
-                fittings.sendProdcueNumber = number;
-                sendProdcues.push(fittings);
+        var sendProdcues = new Array();  //寄出产品表
+        var sendFittings = new Array();
+        var closedProdcues = new Array();
+        var closedFittings = new Array();
+
+        $("#addProduct").find(".input-color-number").each(function () {
+            var number = $(this).val();
+            if (number != null && number != "" && number != 0) {
+                var product = new Object();
+                product.productId = $(this).parent().find(".input-produce-id").val();
+                product.colorId = $(this).parent().find(".input-color-id").val();
+                //换新、维修，退货，无理由退货，
+                if (allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 6 || allCustomerType == 7) {
+                    product.closedProdcueNumber = number;
+                    closedProdcues.push(product);
+                } else if (allCustomerType == 5) {
+                    product.sendProdcueNumber = number;
+                    sendProdcues.push(product);
+                }
             }
-        }
-    })
+        })
 
-    $("#back-product").find(".input-fittings-number").each(function(){
-        var number = $(this).val();
-        if(number != null && number != "" && number != 0){
-            //换新、维修
-            if(allCustomerType == 3 || allCustomerType == 4){
+        $("#addProduct").find(".input-fittings-number").each(function () {
+            var number = $(this).val();
+            if (number != null && number != "" && number != 0) {
                 var fittings = new Object();
                 fittings.productId = $(this).parent().find(".input-produce-id").val();
                 fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
-                fittings.sendFittingNumber = number;
-                sendFittings.push(fittings);
+                //换新、维修，退货，无理由退货，
+                if (allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 6 || allCustomerType == 7) {
+                    fittings.closedFittingNumber = number;
+                    closedFittings.push(fittings);
+                } else if (allCustomerType == 5) {
+                    fittings.sendFittingNumber = number;
+                    sendFittings.push(fittings);
+                }
             }
-        }
-    })
+        })
 
-    var backErrorMsg = "请选择一个replace_error_msg寄回的产品或配件并填写一个以上的数量！"
-    var sendErrorMsg = "请选择一个replace_error_msg寄送的产品或配件并填写一个以上的数量！"
-    var process = true;
-    switch (allCustomerType){
-        case 3:
-            process = processIsEmpty([closedProdcues,closedFittings]);
-            if(!process){
-                var msg = backErrorMsg.replace("replace_error_msg","换新");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
-            }
-            process = processIsEmpty([sendProdcues,sendFittings]);
-            if(!process){
-                var msg = sendErrorMsg.replace("replace_error_msg","换新");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
-            }
-            break;
-        case 4:
-            process = processIsEmpty([closedProdcues,closedFittings]);
-            if(!process){
-                var msg = backErrorMsg.replace("replace_error_msg","维修");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
-            }
-            process = processIsEmpty([sendProdcues,sendFittings]);
-            if(!process){
-                var msg = sendErrorMsg.replace("replace_error_msg","维修");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
-            }
-            break;
-        case 5:
-            process = processIsEmpty([sendProdcues,sendFittings]);
-            if(!process){
-                var msg = sendErrorMsg.replace("replace_error_msg","补发");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
-            }
-            break;
-        case 6:
-            process = processIsEmpty([closedProdcues,closedFittings]);
-            if(!process){
-                var msg = backErrorMsg.replace("replace_error_msg","退货");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
+        $("#back-product").find(".input-color-number").each(function () {
+            var number = $(this).val();
+            if (number != null && number != "" && number != 0) {
+                //换新、维修，
+                if (allCustomerType == 3 || allCustomerType == 4) {
+                    var fittings = new Object();
+                    fittings.productId = $(this).parent().find(".input-produce-id").val();
+                    fittings.colorId = $(this).parent().find(".input-color-id").val();
+                    fittings.sendProdcueNumber = number;
+                    sendProdcues.push(fittings);
+                }
             }
-            break;
-        case 7:
-            process = processIsEmpty([closedProdcues,closedFittings]);
-            if(!process){
-                var msg = backErrorMsg.replace("replace_error_msg","退货");
-                layer.msg(msg, {icon: 5, time: 3000});
-                return false;
+        })
+
+        $("#back-product").find(".input-fittings-number").each(function () {
+            var number = $(this).val();
+            if (number != null && number != "" && number != 0) {
+                //换新、维修
+                if (allCustomerType == 3 || allCustomerType == 4) {
+                    var fittings = new Object();
+                    fittings.productId = $(this).parent().find(".input-produce-id").val();
+                    fittings.fittingsId = $(this).parent().find(".input-fittings-id").val();
+                    fittings.sendFittingNumber = number;
+                    sendFittings.push(fittings);
+                }
             }
-            break;
-        default:
-            break;
+        })
+
+        var backErrorMsg = "请选择一个replace_error_msg寄回的产品或配件并填写一个以上的数量！"
+        var sendErrorMsg = "请选择一个replace_error_msg寄送的产品或配件并填写一个以上的数量！"
+        var process = true;
+        switch (allCustomerType) {
+            case 3:
+                process = processIsEmpty([closedProdcues, closedFittings]);
+                if (!process) {
+                    var msg = backErrorMsg.replace("replace_error_msg", "换新");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                process = processIsEmpty([sendProdcues, sendFittings]);
+                if (!process) {
+                    var msg = sendErrorMsg.replace("replace_error_msg", "换新");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                break;
+            case 4:
+                process = processIsEmpty([closedProdcues, closedFittings]);
+                if (!process) {
+                    var msg = backErrorMsg.replace("replace_error_msg", "维修");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                process = processIsEmpty([sendProdcues, sendFittings]);
+                if (!process) {
+                    var msg = sendErrorMsg.replace("replace_error_msg", "维修");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                break;
+            case 5:
+                process = processIsEmpty([sendProdcues, sendFittings]);
+                if (!process) {
+                    var msg = sendErrorMsg.replace("replace_error_msg", "补发");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                break;
+            case 6:
+                process = processIsEmpty([closedProdcues, closedFittings]);
+                if (!process) {
+                    var msg = backErrorMsg.replace("replace_error_msg", "退货");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                break;
+            case 7:
+                process = processIsEmpty([closedProdcues, closedFittings]);
+                if (!process) {
+                    var msg = backErrorMsg.replace("replace_error_msg", "退货");
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    return false;
+                }
+                break;
+            default:
+                break;
+        }
+        $("#sendProdcues").val(JSON.stringify(sendProdcues));
+        $("#sendFittings").val(JSON.stringify(sendFittings));
+        $("#closedProdcues").val(JSON.stringify(closedProdcues));
+        $("#closedFittings").val(JSON.stringify(closedFittings));
     }
-    $("#sendProdcues").val(JSON.stringify(sendProdcues));
-    $("#sendFittings").val(JSON.stringify(sendFittings));
-    $("#closedProdcues").val(JSON.stringify(closedProdcues));
-    $("#closedFittings").val(JSON.stringify(closedFittings));
 
     var visitTimeSelect = $("input[name='visitTimeSelect']:checked").val();
     var visit_date = $('#datemin').val();