Merge remote-tracking branch 'liujiankang/master'

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

@@ -61,6 +61,9 @@ public class CustomerInfo  implements Serializable {
     private String provinceName;
     private String cityName;
 
+    /*是否需要选择订单，用于处理添加客诉需不需要处理订单功能*/
+    private String isNeedSelectOrder;       //1：需要有订单    2：不需要有订单
+
     private String productName;         //客诉产品
     private String complaintClassName;  //客诉类型名称
     private String questionProfile;     //问题回复
@@ -630,4 +633,13 @@ public class CustomerInfo  implements Serializable {
     public void setCustomerDesc(String customerDesc) {
         this.customerDesc = customerDesc;
     }
+
+
+    public String getIsNeedSelectOrder() {
+        return isNeedSelectOrder;
+    }
+
+    public void setIsNeedSelectOrder(String isNeedSelectOrder) {
+        this.isNeedSelectOrder = isNeedSelectOrder;
+    }
 }

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

@@ -243,7 +243,6 @@
                 </div>
             </div>
             <div class="row cl">
-
                 <label class="form-label col-1 col-sm-1">
                     <div class="tit">处理结果</div>
                 </label>
@@ -256,7 +255,6 @@
             <input type="hidden" id="closedProdcues" name="closedProdcuesJson" value="">
             <input type="hidden" id="closedFittings" name="closedFittingsJson" value="">
 
-
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">处理类型：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
@@ -335,8 +333,6 @@
                 </div>
             </div>
 
-
-
             <div class="row cl" id="recipientInfoTitle" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收件信息：</label>
                 <div class="formControls col-8 col-sm-8">请先选择订单，系统自动填充姓名，电话和地址信息。</div>
@@ -637,7 +633,6 @@
 <script>
 
     $(function(){
-
     })
 
     /*是否是修改页面*/
@@ -664,6 +659,9 @@
     /*获取客服*/
     var sysAminList;
 
+    /*1：需要有订单    2：不需要有订单*/
+    var isNeedSelectOrder;
+
     /*初始化页面参数*/
     $(function () {
         /* 初始化单选框样式 */
@@ -759,15 +757,6 @@
         $(document).on('change', '#TDSArea', function() {
             setTDSCollect();
         });
-        /*实时监听文本框-- TDS进水*/
-//        document.getElementById("customerInTDS").addEventListener("input", function(){
-//            setTDSCollect();
-//        });
-        /*实时监听文本框-- TDS出水*/
-//        document.getElementById("customerOutTDS").addEventListener("input", function(){
-//            setTDSCollect();
-//        });
-
         /* 监听手机号 失去焦点时  将其他手机号码未填的 补充上去 */
         $(".associated-phone").blur(function (){
             var phone = $.trim($(this).val());

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

@@ -348,14 +348,13 @@ function getSysAdmin(){
 
 /*初始化产品类型 --  客诉头部的产品类型单选*/
 function initProduceType(){
-    var html = "";
     $.ajax({
         type: "POST",
         data: {
         },
         url: url_path + "/admin/customer/select_produce_type",
-        async: false,
         success: function(data){
+            var html = "";
             if (data.returnCode == 200) {
                 var check = "checked";
                 for(var i=0;i<data.returnMsg.productTypeList.length;i++){
@@ -369,12 +368,19 @@ function initProduceType(){
             }else{
                 html = '';
             }
+            $("#produceTypeHtml").html(html);
+            initCheck();
         },
         error: function(XmlHttpRequest, textStatus, errorThrown){
         }
     });
-    $("#produceTypeHtml").html(html);
-    initCheck();
+
+    /*绑定产品类型选择事件*/
+    $("input[name='typeId']").change(function (){
+        opentionSelectOrder($(this).val());
+    })
+    /*当前第一个默认选中上朵电动牙刷  isNeedSelectOrder = 2  默认不需要选择订单*/
+    opentionSelectOrder(2);
 }
 
 /**
@@ -1460,6 +1466,17 @@ function setStore(companyId,node){
     });
 }
 
+/**
+ * 控制展示订单
+ *  1：需要有订单    2：不需要有订单
+ */
+function  opentionSelectOrder(type){
+    isNeedSelectOrder = type ;
+    if(isNeedSelectOrder){
+        $("#orderHead").hide();
+        $("#order").hide();
+    }
+}
 
 /*===============================客诉提交  -- start -- =============================== */
 $(function(){