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

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

@@ -42,7 +42,7 @@ public class SalesOrder implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesCreateTime;           //创建时间
-    private String salesAdminRemark;        //后台的备注
+    private String salesAdminRemark;        //后台的备注 -- 卖家备注
     private String salesUserRemark;         //用户备注
     private String salesPayNumber;          //交易尾号
     private Integer salesStoreId;           //店铺id

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

@@ -873,6 +873,8 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setOrderOpenId("1");//身份证
 
         efastOrder.setOrderRemark(salesOrder.getOrderNoteRemark()); //订单备注
+        efastOrder.setOrderBuyerRemark(salesOrder.getSalesUserRemark()); //买家备注
+        efastOrder.setOrderSellerRemark(salesOrder.getSalesAdminRemark()); //卖家备注
 
         String[] address = salesOrder.getSalesAddressInfo().split("-");
         efastOrder.setOrderProvince(address[0]);

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

@@ -853,7 +853,7 @@ public class AdminCustomerController {
 //                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
 //            }
         }
-        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + "请前往Efast 换货/退货操作。", 200);
+        return new ResponseJson(200, "录入客诉成功！客诉编号：" + customerId + ",请前往Efast进行换货/退货操作。", 200);
     }
 
     /**
@@ -920,53 +920,6 @@ public class AdminCustomerController {
             return new ResponseJson(500, "修改客诉失败!", 500);
         }
 
-        //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
-        /*if (customerIsSolve == 3 || customerIsSolve == 4 || customerIsSolve == 5 || customerIsSolve == 6 || customerIsSolve == 7) {
-            String solveMsg = "";
-            switch (customerIsSolve) {
-                case 3:
-                    solveMsg = "为您更换新机";
-                    break;
-                case 4:
-                    solveMsg = "为您维修机器";
-                    break;
-                case 5:
-                    solveMsg = "为您补发产品";
-                    break;
-                case 6:
-                    solveMsg = "为您办理退货";
-                    break;
-                case 7:
-                    solveMsg = "为您办理退货";
-                    break;
-            }
-
-            String addCustomerSuccessMsg = "";
-            String typeMsg = "";
-            switch (typeCompany) {
-                case 1:
-                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_WATERO;
-                    typeMsg = "美国WaterO售后";
-                    break;
-                case 2:
-                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_SHANGDUO;
-                    typeMsg = "上朵售后";
-                    break;
-                case 3:
-                    addCustomerSuccessMsg = SmsConfig.ADD_CUSTOMER_SUCCESS_YULIA;
-                    typeMsg = "YULIA售后";
-                    break;
-            }
-
-            Object [] msg = new Object[]{solveMsg,typeMsg};
-            String text = MessageFormat.format(addCustomerSuccessMsg, msg);
-            logger.info("添加客诉成功后，给 "+ phone +" 手机用户发送短信：" + text );
-            String result = smsService.sendOtherCMS(phone, text);
-
-            if (!"SUCCESS".equals(result)) {
-                return new ResponseJson(505, "添加客诉发送短信失败，失败原因：" + result + "<br>客诉信息发送失败并不影响客诉添加。客诉编号为："+ customerId, 505);
-            }
-        }*/
         return new ResponseJson(200, "修改客诉成功!客诉编号为：" + customerId, 200);
     }
 

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

@@ -54,6 +54,7 @@
             height: 35px;
             line-height: 35px;
         }
+
     </style>
     <title>添加客诉 - 客诉管理 - RST</title>
 </head>
@@ -411,13 +412,15 @@
                     &nbsp;&nbsp;&nbsp;&nbsp;<span id="DTS-in"></span>&nbsp;&nbsp;  <span id="DTS-out"></span>
                 </div>
             </div>
+
             <div class="row cl" id="sendAddressInfo">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>寄回信息：</label>
-                <div class="formControls col-5 col-sm-5" style="height: 250px" id="sendAddressSmsHtml">
+                <div class="formControls col-5 col-sm-5" style="height: 240px" id="sendAddressSmsHtml">
                    <#-- <script id="sendAddressSms" type="text/plain" style="width:983px;height:200px;"></script>
                     </script>-->
                 </div>
             </div>
+
             <div class="row cl" id="sendAddressByPhone" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
@@ -430,6 +433,7 @@
                     <div id="m-msg" style="color: #e00"></div>
                 </div>
             </div>
+
             <div class="row cl" id="updateProduct" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>更换产品：</label>
                 <div class="formControls col-9 col-sm-9" >
@@ -517,6 +521,7 @@
                     </div>
                 </div>
             </div>
+
             <div id="needToVisit" style="display: none;">
                 <div class="row cl">
                     <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>被回访人：</label>
@@ -603,6 +608,8 @@
 
     /*是否是修改页面*/
     var isUpdate = false;
+    /*是否需要回访  只有修改页面才会使用*/
+    var customerIsVisit = false;
 
     /*个人id*/
     var adminId = 0;

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

@@ -260,9 +260,9 @@
                     </div>
 
                     <div class="row cl" id="recipientAddressText" style=" margin-top: 20px;">
-                        <label class="form-label col-1 col-sm-1" style="width: 110px;"><span class="c-red">*</span>订单备注：</label>
+                        <label class="form-label col-1 col-sm-1" style="width: 110px;">商家备注：</label>
                         <div class="formControls col-10 col-sm-10">
-                            <textarea name="orderNoteRemark" id="orderNoteRemark" cols="" rows="2" class="textarea" placeholder="订单备注" onKeyUp="$.Huitextarealength(this,50)"></textarea>
+                            <textarea name="salesAdminRemark" id="salesAdminRemark" cols="" rows="2" class="textarea" placeholder="商家备注" onKeyUp="$.Huitextarealength(this,50)"></textarea>
                         </div>
                     </div>
 
@@ -305,6 +305,15 @@
             searchOrder();
         });
 
+        /*初始化  搜索订单  */
+       //searchOrder();
+
+        /*回车搜索*/
+        $('.input-text').keydown(function(event){
+            if(event.keyCode == 13){ //绑定回车
+                $('#searchOrder').click();
+            }
+        });
     })
 
     /**
@@ -416,6 +425,13 @@
             tipSweep: true, //若为true，则只在表单提交时验证
             ajaxPost: true, //异步提交
             beforeCheck: function (curform) {  //验证通过之前执行的函数
+                var salesCompanyId = $("#salesCompanyId").val();
+                var salesStoreId = $("#salesStoreId").val();
+                if(salesCompanyId == null || salesCompanyId == "" || typeof(salesCompanyId) == "undefined" ||
+                        salesStoreId == null || salesStoreId == "" || typeof(salesStoreId) == "undefined"){
+                    layer.msg("请选择销售公司与店铺", {icon: 5, time: 3000});
+                    return  false;
+                }
             },
             beforeSubmit: function (curform) {  //验证通过之后执行的函数
                 var pro = $("#province").find("option:selected").text();

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

@@ -20,8 +20,15 @@
         .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">
@@ -35,36 +42,94 @@
                 <span id="backGoodsSchedule" 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="backGoodsBackStatus" value="1">
-                    <label for="tel-3">未寄回</label>
-                </div>
-                <div class="radio-box">
-                    <input type="radio" id="tel-4" name="backGoodsBackStatus" value="2">
-                    <label for="tel-4">已寄回</label>
+        <div id="tab_demo" class="HuiTab">
+            <div class="tabBar clearfix"><span>寄回信息</span><span>邮费信息</span><span>工厂检查信息</span><span>工厂返修进度</span></div>
+
+         <div class="tabCon">
+
+        <#--<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="backGoodsBackStatus" value="1" seleType="send">-->
+                    <#--<label for="tel-3">未寄回</label>-->
+                <#--</div>-->
+                <#--<div class="radio-box">-->
+                    <#--<input type="radio" id="tel-4" name="backGoodsBackStatus" value="2" seleType="send">-->
+                    <#--<label for="tel-4">已寄回</label>-->
+                <#--</div>-->
+                <#--<div class="radio-box">-->
+                    <#--<input type="radio" id="tel-5" name="backGoodsBackStatus" value="3" seleType="send">-->
+                    <#--<label for="tel-5">已收货</label>-->
+                <#--</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;">-->
+			<#--<span class="select-box">-->
+				<#--<select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select" seleType="send">-->
+					<#--<option value="">物流公司</option>-->
+                    <#--<option value="sto">申通快递</option>-->
+                    <#--<option value="yto">圆通快递</option>-->
+                    <#--<option value="sf">顺丰快递</option>-->
+                    <#--<option value="ems">邮政EMS</option>-->
+                    <#--<option value="zto">中通快递</option>-->
+                    <#--<option value="zjs">宅急送</option>-->
+                    <#--<option value="yunda">韵达快递</option>-->
+                    <#--<option value="cces">cces快递</option>-->
+                    <#--<option value="pick">上门提货</option>-->
+                    <#--<option value="htky">汇通快递</option>-->
+                    <#--<option value="ttkdex">天天快递</option>-->
+                    <#--<option value="stars">星晨急便</option>-->
+                    <#--<option value="jd">京东快递</option>-->
+                    <#--<option value="01">其他</option>-->
+                    <#--<option value="02">上门送货</option>-->
+				<#--</select>-->
+			<#--</span>-->
+                <#--</div>-->
+                <#--<input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo" seleType="send">-->
+              <#--<!--  <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage">-->
+                <#--<input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">&ndash;&gt;-->
+            <#--</div>-->
+        <#--</div>-->
+
+            <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-5" name="backGoodsBackStatus" value="3">
-                    <label for="tel-5">已收货</label>
+                <div class="formControls col-10 col-sm-10 skin-minimal">
+                    <div class="radio-box">
+                        <input type="radio" id="tel-3" name="backGoodsBackStatus" value="1" seleType="send">
+                        <label for="tel-3">未寄回</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-4" name="backGoodsBackStatus" value="2" seleType="send">
+                        <label for="tel-4">已寄回</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-5" name="backGoodsBackStatus" 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="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select">
-					<option value="">物流公司</option>
-                    <option value="sto">申通快递</option>
+				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" 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,83 +146,125 @@
                     <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="backGoodsBackLogisticsNo" name="backGoodsBackLogisticsNo">
-                <input style="width: 150px;margin-right: 10px;" type="text" class="input-text" value="" placeholder="寄回邮费" id="backGoodsBackPostage" name="backGoodsBackPostage">
-                <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">
             </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" seleType="send">
+                </div>
+                <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_back_goods();" class="btn btn-primary" type="button">确认提交</button>
+                </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_back_goods();" class="btn btn-primary" type="button">确认提交</button>-->
+                 <#--</div>-->
+             <#--</div>-->
+
+       <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="backGoodsIsTransfer" value="0">
+                    <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0" seleType="postage">
                     <label for="tel-6">不需要转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1">
+                    <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">
                     <label for="tel-7">已转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2">
+                    <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
                     <label for="tel-8">待转账</label>
                 </div>
             </div>
         </div>
+
+                <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="backGoodsBackPostage" name="backGoodsBackPostage" seleType="postage">
+                        <input style="width: 150px;margin-top: 20px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay" seleType="postage">
+                    </div>
+                </div>
         <div class="row cl" style="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="backGoodsBackName" name="backGoodsBackName">
+                <input type="text" class="input-text" value="" placeholder="寄件人姓名" id="backGoodsBackName" name="backGoodsBackName" seleType="send">
             </div>
             <div class="formControls col-5 col-sm-5">
-                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel">
-            </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 id="backGoodsProduct" class="update-parts" 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>
-            </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>
-                <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">
-                <textarea name="backGoodsDesc" id="backGoodsDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
+                <input type="text" style="width: 190px;margin:0 10px;" class="input-text" value="" placeholder="寄件人电话" id="backGoodsBackTel" name="backGoodsBackTel" seleType="send">
             </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 id="backGoodsProduct" class="update-parts" 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>-->
+            <#--</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>-->
+                <#--<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">-->
+                <#--<textarea name="backGoodsDesc" id="backGoodsDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>-->
+            <#--</div>-->
+        <#--</div>-->
         <div class="row cl">
             <div class="formControls col-2 col-sm-2">
             </div>
@@ -165,6 +272,7 @@
                 <button onClick="update_back_goods();" class="btn btn-primary" type="button">确认提交</button>
             </div>
         </div>
+           </div>
     </form>
     </div>
 </article>
@@ -173,6 +281,13 @@
 
 <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}$/; //中文英文
     var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
@@ -190,6 +305,11 @@
         $("input[name='backGoodsBackStatus']").change(function (){
             initBackInfo($(this).val());
         })
+
+        /* 监听邮费状态按钮 */
+        $("input[name='backGoodsIsTransfer']").change(function (){
+            initPostageInfo($(this).val());
+        })
     });
 
     /*初始化寄回信息*/

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

@@ -701,6 +701,8 @@
 
     /*是否是修改页面*/
     var isUpdate = true;
+    /*是否需要回访  只有修改页面才会使用*/
+    var customerIsVisit = true;
 
     /*个人id*/
     var adminId = 0;
@@ -868,220 +870,29 @@
         });
     }
 
-
     /**
-     * 选择处理结果-- 默认选择已解决
-     * type : 1 ：已解决  2：未解决  3：换新  4：维修  5：补发   6：退货  7：无理由退货
+     * 设置省市区
      */
-    function initProcessResult(type){
-
-        if(type == null || type == ""){
-            type = 1;
-        }
-
-        allCustomerType = type;
-
-        if(allCustomerInfoType == null || allCustomerInfoType == ""){
-            allCustomerInfoType = $("input[name='customerCounselType']:checked").val();
-        }
-
-        var statusHtml = '<li><span class="arrow"></span><div class="number">status_index</div><div>status_html</div></li>';
-        var resultHtml = '';
-        var result = {};
-        var resultProductTableTitle = {};
-
-        $("#solved").show(); //已解决
-        $("#noSolved").show();//未解决
-        if(allCustomerInfoType == 1){  //售前
-            $("#renewed").hide();
-            $("#maintain").hide();
-            $("#reissue").hide();
-            $("#backGoods").hide();
-            $("#noReasonBack").hide();
-
-            switch(type)
-            {
-                case 1:
-                    otherHied();
-                    visitByType(1);
-                    break;
-                case 2:
-                    otherHied();
-                    visitByType(2);
-                    break;
-                default:
-                    break;
-            }
-        }else if(allCustomerInfoType == 2){ //售后
-
-            if(!isInitSendAddressSms){
-                initComplaintQuestionInfo("m");
-                isInitSendAddressSms = true;
-            }
-
-            /* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
-            if(isInitAddress == 1 || isInitAddress == 2){
-//                var proId = setPro(null,2);
-//                var cityId = setCity(null,proId,2);
-//                setDistrict(null,cityId,2);
-//                isInitAddress = 1;
-            }else if(isInitAddress == 3 || isInitAddress == 4 ||  isInitAddress == 5 ||  isInitAddress == 6 ||  isInitAddress == 7){
-                    setPro(null,2);  //创建省
-                    setCity(null,proId,2);
-                    setDistrict(null, cityId, 2);
-                <#if customerCommon.provinceNumber?? >
-                    var proId = ${customerCommon.provinceNumber!''};
-                    $("#province option[value='"+ proId +"']").attr("selected","true"); //设置省
-                </#if>
-                <#if customerCommon.cityNumber?? >
-                    var cityId = ${customerCommon.cityNumber!''};
-                    $("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市
-                </#if>
-                <#if customerCommon.areaNumber?? >
-                    var disId = ${customerCommon.areaNumber!''};
-                    $("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区
-                    isInitAddress = 1;
-                </#if>
-            }
-
-            $("#renewed").show();
-            $("#maintain").show();
-            $("#reissue").show();
-            $("#backGoods").show();
-            $("#noReasonBack").show();
-            switch(type)
-            {
-                case 1:
-                    otherHied();
-                    visitByType(1);
-                    break;
-                case 2:
-                    otherHied();
-                    visitByType(2); //需要回访
-                    break;
-                case 3: //换新
-                    result = isSolve.renewed;
-                    resultProductTableTitle = isSolveTitleMsg.renewed;
-                    $("#relationProduct").html("换新产品");
-                    $("#processResultStatus").show();
-                    $("#orderHead").show();
-                    $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
-                    $("#renewedProduct").show();
-                    $("#TDScollect").show();
-                    $("#TDScollectShow").show();
-                    $("#sendAddressInfo").show();
-                    $("#sendAddressByPhone").show();
-                    $("#updateProduct").show(); //换新产品
-                    $("#postageAccount").show();    //邮费转账账户
-                    visitByType(2); //需要回访
-                    break;
-                case 4: //维修
-                    result = isSolve.maintain;
-                    resultProductTableTitle = isSolveTitleMsg.maintain;
-                    $("#relationProduct").html("维修产品");
-                    $("#processResultStatus").show();
-                    $("#orderHead").show();
-                    $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
-                    $("#renewedProduct").show();
-                    $("#TDScollect").show();
-                    $("#TDScollectShow").show();
-                    $("#sendAddressInfo").show();
-                    $("#sendAddressByPhone").show();
-                    $("#updateProduct").show();//维修产品
-                    $("#postageAccount").show();    //邮费转账账户
-                    visitByType(2); //需要回访
-                    break;
-                case 5://补发
-                    result = isSolve.reissue;
-                    resultProductTableTitle = isSolveTitleMsg.reissue;
-                    $("#relationProduct").html("补发产品");
-                    $("#processResultStatus").show();
-                    $("#orderHead").show();
-                    $("#order").show();
-                    $("#recipientInfo").show();
-                    $("#recipientInfoTitle").show();
-                    $("#recipientAddress").show();
-                    $("#recipientAddressText").show();
-                    $("#renewedProduct").show();
-                    $("#TDScollect").show();
-                    $("#TDScollectShow").show();
-                    $("#sendAddressInfo").hide();
-                    $("#sendAddressByPhone").hide();
-                    $("#updateProduct").hide();
-                    $("#postageAccount").hide();    //邮费转账账户 -- 隐藏
-                    visitByType(2); //需要回访
-                    break;
-                case 6: //退货
-                    result = isSolve.backGoods;
-                    resultProductTableTitle = isSolveTitleMsg.backGoods;
-                    $("#relationProduct").html("退货产品");
-                    $("#processResultStatus").show();
-                    $("#orderHead").show();
-                    $("#order").show();
-                    $("#recipientInfo").hide();
-                    $("#recipientInfoTitle").hide();
-                    $("#recipientAddress").hide();
-                    $("#recipientAddressText").hide();
-                    $("#renewedProduct").show();
-                    $("#TDScollect").show();
-                    $("#TDScollectShow").show();
-                    $("#sendAddressInfo").show();
-                    $("#sendAddressByPhone").show();
-                    $("#updateProduct").hide();
-                    $("#postageAccount").show();    //邮费转账账户
-                    visitByType(2); //需要回访
-                    break;
-                case 7://无理由退货
-                    result = isSolve.noReasonBack;
-                    resultProductTableTitle = isSolveTitleMsg.noReasonBack;
-                    $("#relationProduct").html("退货产品");
-                    $("#processResultStatus").show();
-                    $("#orderHead").show();
-                    $("#order").show();
-                    $("#recipientInfo").hide();
-                    $("#recipientInfoTitle").hide();
-                    $("#recipientAddress").hide();
-                    $("#recipientAddressText").hide();
-                    $("#renewedProduct").show();
-                    $("#TDScollect").show();
-                    $("#TDScollectShow").show();
-                    $("#sendAddressInfo").show();
-                    $("#sendAddressByPhone").show();
-                    $("#updateProduct").hide();
-                    $("#postageAccount").show();    //邮费转账账户
-                    visitByType(2); //需要回访
-                    break;
-                default:
-                    break;
-            }
-        }
-        for(var i=0;i< result.length;i++){
-            var html = statusHtml.replace("status_index",i+1);
-            html = html.replace("status_html",result[i]);
-            resultHtml += html;
-        }
-
-        if(resultProductTableTitle != null && resultProductTableTitle.length > 0){
-            /* 根据处理类型来切换 产品列表的列名称 */
-            for(var i=0;i<resultProductTableTitle[0].length;i++){
-                $("#table1").find("th").eq(i).html(resultProductTableTitle[0][i]);
-            }
-            for(var i=0;i<resultProductTableTitle[1].length;i++){
-                $("#table2").find("th").eq(i).html(resultProductTableTitle[1][i]);
-            }
-        }
-
-        $("#processResultStatus").html(resultHtml);
+    function setAddressInfo(){
+        var proId = setPro(null,1);  //创建省
+        <#if customerCommon.provinceNumber?? >
+            var proId = ${customerCommon.provinceNumber!''};
+            $("#province option[value='"+ proId +"']").attr("selected","true"); //设置省
+        </#if>
+
+        var cityId = setCity(null,proId,2);
+        <#if customerCommon.cityNumber?? >
+            var cityId = ${customerCommon.cityNumber!''};
+            $("#city option[value='" + cityId + "']").attr("selected", "true"); //设置市
+        </#if>
+
+        setDistrict(null, cityId, 2);
+        <#if customerCommon.areaNumber?? >
+            var disId = ${customerCommon.areaNumber!''};
+            $("#district option[value='" + disId + "']").attr("selected", "true"); //设置地区
+            isInitAddress = 1;
+        </#if>
     }
-
 </script>
 <!--/请在上方写此页面业务相关的脚本-->
 </body>

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

@@ -18,6 +18,12 @@
         .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;}
+
+        .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>
@@ -34,6 +40,11 @@
             </div>
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}">
+
+        <div class="tabBar clearfix"><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>
@@ -55,6 +66,10 @@
             </div>
         </div>
 
+        </div>
+
+        <div class="tabCon">
+
         <div class="row cl" id="sendUserInfo" style="display: none;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
@@ -159,6 +174,8 @@
                 <button onClick="update_reissue_info();" class="btn btn-primary" type="button">确认修改</button>
             </div>
         </div>
+
+        </div>
     </form>
     </div>
 </article>
@@ -170,6 +187,14 @@
 <script type="text/javascript" src="${path}/common/static/h-ui.admin/js/H-ui.admin.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}$/; //中文英文
     var money = /^(0{1}|([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/;//金额
@@ -182,10 +207,11 @@
         });
         get_reissue_info();
 
-        /* 监听寄出状态按钮 */
+        /* 监听寄回状态按钮 */
         $("input[name='reissueSendStatus']").change(function (){
-            initSendInfo($(this).val());
+            initBackInfo($(this).val());
         })
+
     });
 
     /*初始化寄出信息*/

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

@@ -65,7 +65,7 @@ var tool = [
     'fontborder', //字符边框
     'superscript', //上标
     'formatmatch', //格式刷
-    //'source', //源代码
+    'source', //源代码 --
     'blockquote', //引用
     'pasteplain', //纯文本粘贴模式
     'selectall', //全选
@@ -201,7 +201,7 @@ var isSolveTitleMsg = {
 /*===============================定义全局变量以及监听事件和初始化  -- end -- =============================== */
 
 
-/*用于初始化回访信息的展示*/
+/*用于初始化监听回访信息的展示*/
 function initVisitEvent(){
     $("input[name='customerIsVisit']").change(function (){
         if($(this).val() == 2){
@@ -239,6 +239,10 @@ function initCheckByNode(node){
 * type 1:不需要回访  2：需要回访
 * */
 function visitByType(type){
+    if(isUpdate &&  customerIsVisit){
+        customerIsVisit = false;
+        return false;
+    }
     if(1 == type){  //不需要回访
         $("#customer-visit-2").iCheck('check');  //设置不需要回访
         $("#needToVisit").css("display","none");
@@ -397,13 +401,16 @@ function initProcessResult(type){
             initComplaintQuestionInfo("m");
             isInitSendAddressSms = true;
         }
-
-        /* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
-        if(isInitAddress == 0){
-            var proId = setPro(null,2);
-            var cityId = setCity(null,proId,2);
-            setDistrict(null,cityId,2);
-            isInitAddress = 1;
+        if(isUpdate){       //修改页面加载省市区
+            setAddressInfo();       //修改页面才会调用
+        }else{
+            /* 在选择售后类型是，直接初始化省市区，使用isInitAddress 变量来判断 */
+            if(isInitAddress == 0){
+                var proId = setPro(null,2);
+                var cityId = setCity(null,proId,2);
+                setDistrict(null,cityId,2);
+                isInitAddress = 1;
+            }
         }
 
         $("#renewed").show();
@@ -753,13 +760,13 @@ function sendPhone(type,node){
         questionId = complaint_questionId;
 
         //desc = UE.getEditor('sendAddressSms').getContent();
-        desc = $("#sendAddressSmsHtml").html();    //取值从html填写
+        //desc = $("#sendAddressSmsHtml").html();    //取值从html填写  -- 邮寄地址不用传过去，直接后台取
 
-        if(desc == null || desc == ""){
-            layer.close(index);
-            layer.msg("请填写邮寄信息内容！", {icon: 5, time: 3000});
-            return false;
-        }
+        // if(desc == null || desc == ""){
+        //     layer.close(index);
+        //     layer.msg("请填写邮寄信息内容！", {icon: 5, time: 3000});
+        //     return false;
+        // }
     }else{
         layer.close(index);
         layer.msg("发送报错！", {icon: 5, time: 3000});