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

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

@@ -806,7 +806,7 @@ public class AdminCustomerController {
         if (flag < 1) {
             return new ResponseJson(500, "添加客诉失败!", 500);
         }
-
+        String msg = "";
         //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
         if (customerIsSolve == 3 || customerIsSolve == 4 || customerIsSolve == 5 || customerIsSolve == 6 || customerIsSolve == 7) {
             String solveMsg = "";
@@ -852,8 +852,9 @@ public class AdminCustomerController {
 //            if (!"SUCCESS".equals(result)) {
 //                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
 //            }
+            msg = "，请前往Efast进行换货/退货操作。";
         }
-        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + "，请前往Efast进行换货/退货操作。", 200);
+        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + msg, 200);
     }
 
     /**

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

@@ -68,10 +68,6 @@
 <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;">
-
-            <input type="hidden" id="customerName" name="customerName" value="">
-            <input type="hidden" id="customerTel" name="customerTel" value="">
-
             <div class="row cl">
 
                 <label class="form-label col-3">
@@ -135,6 +131,15 @@
                     </div>-->
                 </div>
             </div>
+            <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 skin-minimal">
+                    <input type="text" class="input-text" placeholder="用户姓名" id="customerName" name="customerName" value="">
+                </div>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text" class="input-text" placeholder="用户电话" id="customerTel" name="customerTel" value="">
+                </div>
+            </div>
 
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客诉问题：</label>

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

@@ -38,7 +38,7 @@
     <div class="text-c">
         <form action="${path}/admin/customer/select_customer_list" method="post">
             <button type="button" style="cursor:pointer; float: left;height: 35px;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
-            <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
+            <input type="text" class="my-input"  style="width:90px;margin-right: 0px; margin-left: -65px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
             <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">
@@ -46,7 +46,7 @@
             <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">-->
-
+            <br>
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 100px;margin: 0px;padding: 6px 10px 6px 15px;">
                 <option value="">处理结果</option>
                 <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
@@ -102,6 +102,7 @@
                     </#list>
                 </#if>
             </select>
+            <br>
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>
     </div>
@@ -169,8 +170,13 @@
                             <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>
                             <td>
                                 <#if (customer.sendLogisticsNo??) || (customer.backLogisticsNo??)>
-                                    寄回：${customer.backLogisticsNo!''}<br>
-                                    寄出：${customer.sendLogisticsNo!''}
+
+                                        <#if (customer.backLogisticsNo??)>
+                                            寄回：${customer.backLogisticsNo!''}<br>
+                                        </#if>
+                                        <#if customer.sendLogisticsNo??>
+                                            寄出：${customer.sendLogisticsNo!''}
+                                        </#if>
                                 <#else>
                                     无
                                 </#if>

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

@@ -68,7 +68,7 @@
                     </div>
                 </div>
 
-                <div class="row cl" id="backLogisticsInfo" style="display: none">
+                <div class="row cl" id="backLogisticsInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回信息</strong>
                     </div>
@@ -229,10 +229,10 @@
         get_book_goods_info();
         showUpdateSendProduct();
 
-        /* 监听寄回状态按钮 */
+        /*/!* 监听寄回状态按钮 *!/
         $("input[name='backGoodsBackStatus']").change(function (){
             initBackInfo($(this).val());
-        })
+        })*/
 
         /* 监听邮费状态按钮 */
 //        $("input[name='backGoodsIsTransfer']").change(function (){
@@ -240,7 +240,7 @@
 //        })
     });
 
-    /*初始化寄回信息*/
+    /*/!*初始化寄回信息*!/
     function initBackInfo(statusCode){
         if(statusCode == 1){
             $("#backLogisticsInfo").hide();
@@ -251,7 +251,7 @@
             $("#backTransferInfo").show();
             $("#backUserInfo").show();
         }
-    }
+    }*/
 
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
@@ -445,8 +445,8 @@
                         }
                     });
 
-                    /*初始化寄回信息*/
-                    initBackInfo(backGoods.backGoodsBackStatus);
+                    /*/!*初始化寄回信息*!/
+                    initBackInfo(backGoods.backGoodsBackStatus);*/
 
                     var backProduct = '';
                     if (backGoods.closedProdcues != null && backGoods.closedProdcues.length > 0) {

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

@@ -70,8 +70,6 @@
         <form action="${path}/admin/customer/update_customer" method="post" class="form form-horizontal" id="form-customer-add"  onkeydown="if(event.keyCode==13)return false;">
 
             <input type="hidden" id="customerId" name="customerId" value="${customerInfo.customerId!''}">
-            <input type="hidden" id="customerName" name="customerName" value="">
-            <input type="hidden" id="customerTel" name="customerTel" value="">
 
             <div class="row cl">
                 <label class="form-label col-3">
@@ -136,7 +134,15 @@
                     </#list>
                 </div>
             </div>
-
+            <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 skin-minimal">
+                    <input type="text" class="input-text" placeholder="用户姓名" id="customerName" name="customerName" value="${customerInfo.customerName!''}">
+                </div>
+                <div class="formControls col-2 col-sm-2 skin-minimal">
+                    <input type="text" class="input-text" placeholder="用户电话" id="customerTel" name="customerTel" value="${customerInfo.customerTel!''}">
+                </div>
+            </div>
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客诉问题：</label>
                 <div class="formControls col-2 col-sm-2"> <span class="select-box">
@@ -288,7 +294,7 @@
                     <button type="button" class="btn btn-primary" id="selectOrder">搜索订单</button>
                 </div>
             </div>
-            <#if salesOrder??>
+
             <div class="row cl" id="order" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-9 col-sm-9 text-c">
@@ -304,6 +310,7 @@
                             <th style="text-align: center;">购买日期</th>
                         </tr>
                         <tr id="showOrder">
+                                <#if salesOrder??>
                                 <td style="text-align: center;">${salesOrder.companyName!''}</td>
                                 <td style="text-align: center;">${salesOrder.storeName!''}</td>
                                 <td style="text-align: center;">${salesOrder.salesOrderId!''}</td>
@@ -316,16 +323,17 @@
                                     </#list>
                                 </td>
                                 <td style="text-align: center;">${(salesOrder.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
-                        </tr>
+                            </#if>
+                         </tr>
                         <tr id="showOrderAddress" style="">
                             <td style="text-align: center;">收货地址</td>
-                            <td style="text-align: center;" colspan="7"> ${salesOrder.salesAddressInfo}</td>
+                            <td style="text-align: center;" colspan="7"> <#if salesOrder??>${salesOrder.salesAddressInfo}</#if></td>
                         </tr>
                     </table>
 
                 </div>
             </div>
-            </#if>
+
             <input type="hidden" id="companyId" name="companyId" value="<#if salesOrder??>${salesOrder.salesCompanyId}</#if>">
             <input type="hidden" id="storeId" name="storeId" value="<#if salesOrder??>${salesOrder.salesStoreId}</#if>">
             <input type="hidden" id="orderId" name="salesId" value="<#if salesOrder??>${salesOrder.salesId}</#if>">

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

@@ -61,7 +61,7 @@
                     </div>
                 </div>
 
-                <div class="row cl" id="backLogisticsInfo" style="display: none">
+                <div class="row cl" id="backLogisticsInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回信息</strong>
                     </div>
@@ -209,13 +209,13 @@
         get_noreason_info();
         showUpdateSendProduct();
 
-        /* 监听寄回状态按钮 */
+        /*/!* 监听寄回状态按钮 *!/
         $("input[name='noreasonBackBackStatus']").change(function (){
             initBackInfo( $(this).val());
-        })
+        })*/
     });
 
-    /*初始化寄回信息*/
+    /*/!*初始化寄回信息*!/
     function initBackInfo(statusCode){
         if(statusCode == 1){
             $("#backLogisticsInfo").hide();
@@ -226,7 +226,7 @@
             $("#backTransferInfo").show();
             $("#backUserInfo").show();
         }
-    }
+    }*/
 
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
@@ -420,8 +420,8 @@
                         }
                     });
 
-                    /*初始化寄回信息*/
-                    initBackInfo(noreasonBack.noreasonBackBackStatus);
+                    /*/!*初始化寄回信息*!/
+                    initBackInfo(noreasonBack.noreasonBackBackStatus);*/
 
                     var noreasonProduct = '';
                     if (noreasonBack.closedProdcues != null && noreasonBack.closedProdcues.length > 0) {

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

@@ -234,6 +234,8 @@
                         上门送货
                     <#elseif order.salesPostFirm == 'eyb'>
                         E邮宝
+                    <#elseif order.salesPostFirm == 'dbkd'>
+                        德邦物流
                     </#if>
                 </#if>
                 </label>

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

@@ -140,6 +140,8 @@
                                 上门送货
                             <#elseif order.salesPostFirm == 'eyb'>
                                 E邮宝
+                            <#elseif order.salesPostFirm == 'dbkd'>
+                                德邦物流
                             </#if>
                         </#if>
                     </td>

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

@@ -227,6 +227,12 @@
         });
     }
 
+    /*超时控制器*/
+    var timeout=setTimeout(function(){
+        layer.msg('连接超时，请重试!',{icon: 5,time:3000});
+        },100000
+    );
+
     // 提交
     function sub() {
         var map = $(".productmap:checked");                 // 第三方平台的产品信息和Efast的产品信息管理数据 id-name
@@ -307,6 +313,12 @@
                 "num":numArray,
                 "remark":remarkArray
         },function(result){
+
+            if(timeout){ //清除定时器
+                clearTimeout(timeout);
+                timeout=null;
+            }
+
             if (result.returnCode != 200) {
                 layer.msg('加载失败，请重试，请确认选择内容对应无误!',{icon: 5,time:3000});
             } else {

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

@@ -939,8 +939,14 @@ function setSelectOrder(orderId){
                     $("#sendName").val(salesOrder.salesAddressName); //收件人名称
                     $("#sendTel").val(salesOrder.salesAddressTel);  //收件人电话号码
 
-                    $("#customerName").val(salesOrder.salesAddressName); //收件人名称
-                    $("#customerTel").val(salesOrder.salesAddressTel);  //收件人电话号码
+                    var name = $("#customerName").val();
+                    var tel = $("#customerTel").val();
+                    if(name == "" || name == null){
+                        $("#customerName").val(salesOrder.salesAddressName); //收件人名称
+                    }
+                    if(tel == "" || tel == null){
+                        $("#customerTel").val(salesOrder.salesAddressTel);  //收件人电话号码
+                    }
                 }
                 // $("#showOrderAddress").html(address);
             }else{
@@ -1392,10 +1398,10 @@ $(function(){
 /* 添加客诉的准备 */
 function addCustomerReady(){
     /* 录入电话号码和姓名到客诉基本信息里面  */
-    if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 5 || allCustomerType == 6 || allCustomerType == 7){
+    /*if(allCustomerType == 3 || allCustomerType == 4 || allCustomerType == 5 || allCustomerType == 6 || allCustomerType == 7){
         $("#customerName").val($("#sendName").val());
         $("#customerTel").val($("#sendTel").val());
-    }
+    }*/
 
     /*验证来源入口*/
     var customerSourceType = $("input:radio[name='customerSourceType']:checked").val();