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

@@ -868,9 +868,7 @@ public class AdminCustomerController {
         if (customerInfo.getIsNeedSelectOrder() == 1) {
             JSONArray jsonArray;
             List<SendProdcue> sendProdcueList;
-            List<SendFitting> sendFittingList;
             List<ClosedProdcue> closedProdcueList;
-            List<ClosedFitting> closedFittingList;
 
             jsonArray = JSONArray.fromObject(sendProdcuesJson);
             sendProdcueList = (List) JSONArray.toCollection(jsonArray, SendProdcue.class);

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

@@ -435,7 +435,7 @@
                     <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="relationSendName"  errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel"  errormsg="联系人电话格式不正确！">
                 </div>
                 <div class="formControls col-2 col-sm-2"  id="postageAccount">
                     <input type="text" class="input-text" value="" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">
@@ -772,7 +772,6 @@
     /*加载TDS地址信息*/
     var addressUlc = init_address($(".init_address"));
 
-//    var ulcRelationAddress = init_address($(".relation_address"));
     var ulcRelationAddress = init_address($(".relation_address"));
 
     /*是否是修改页面*/

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

@@ -450,7 +450,7 @@
                     <input type="text" class="input-text" value="${cmRelation.relationSendName!''}" placeholder="填写收件人姓名" id="sendName" name="relationSendName" errormsg="联系人格式不正确！" >
                 </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="${cmRelation.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel" datatype="" errormsg="联系人电话格式不正确！">
+                    <input type="text" class="input-text" value="${cmRelation.relationSendTel!''}" placeholder="填写收件人手机号" id="sendTel" name="relationSendTel"  errormsg="联系人电话格式不正确！">
                 </div>
                 <div class="formControls col-2 col-sm-2"  id="postageAccount">
                     <input type="text" class="input-text" value="${cmRelation.relationAlipay!''}" placeholder="邮费转账 支付宝账户" id="relationAlipay" name="relationAlipay" errormsg="邮费转账账户！">

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

@@ -112,7 +112,7 @@
 
                         <div style="float: left;">
                             地址详情:
-                            <select class="my-select" name="addr-info" id="addr-addressInfo" matchSelect="收货人地址|收件人地址|详细地址|收货地址|收件地址|客户地址" style="height: 30px;width: 180px;margin: 0px;">
+                            <select class="my-select" name="addr-info" id="addr-addressInfo" matchSelect="收货人地址|收件人地址|详细地址|收货地址|收件地址|客户地址|地址" style="height: 30px;width: 180px;margin: 0px;">
                             <#list heads as head>
                                 <option value="${head}" >${head}</option>
                             </#list>
@@ -125,7 +125,7 @@
             <tr class="text-c">
                 <td width="55">产品名称</td>
                 <td style="text-align: left;">
-                    <select class="my-select" name="product-name" id="product-name" matchSelect="网店品名|商品名称|产品名称|货品名称|商品信息|商品选项|商品|SKU|SKU规格" style="height: 30px;width: 180px;margin: 0px;">
+                    <select class="my-select" name="product-name" id="product-name" matchSelect="网店品名|商品名称|产品名称|货品名称|商品信息|商品选项|商品|SKU|SKU规格|品名" style="height: 30px;width: 180px;margin: 0px;">
                         <#list heads as head>
                             <option value="${head}" >${head}</option>
                         </#list>

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

@@ -651,6 +651,7 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg("拆单成功", {icon: 1, time: 3000});
+                    location.replace(location.href);
                 }else{
                     layer.msg(data.resultMsg, {icon: 5, time: 3000});
                 }