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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/order/ProductColor.java

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

@@ -227,7 +227,7 @@
                             <#if customer.customerSecondaryCustomer == '1' >是</#if>
                             <#if customer.customerSecondaryCustomer == '2' >否</#if></td>
 
-                            <td>${customer.companyName!''}<br/>${customer.storeName!''}</td>
+                            <td>${customer.storeName!''}</td>
                             <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
                             <#--<td>${customer.customerArea!''}</td>
                             <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>-->

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

@@ -99,7 +99,12 @@
                                         </#list>
                                     </#if>
                                 </td>
-                                <td><a onclick="deleteSendbackInfo(${(sendbackInfo.sendbackId)!});">删除</a>&nbsp;&nbsp;<a onclick="getSendbackInfo(${(sendbackInfo.sendbackId)!});">修改</a>&nbsp;&nbsp;<#if sendbackInfo.sendbackStatus == 2><a onclick="updateSendbackStatus(${(sendbackInfo.sendbackId)!});">签收</a></#if></td>
+                                <td><#if sendbackInfo.sendbackStatus != 3><a onclick="deleteSendbackInfo(${(sendbackInfo.sendbackId)!});">删除</a>&nbsp;&nbsp;<a onclick="getSendbackInfo(${(sendbackInfo.sendbackId)!});">修改</a>&nbsp;&nbsp;
+                                        <#if sendbackInfo.sendbackStatus == 2>
+                                        <a onclick="updateSendbackStatus(${(sendbackInfo.sendbackId)!});">签收</a>
+                                        </#if>
+                                    </#if>
+                                </td>
                             </tr>
                             </#list>
                         <#else>
@@ -129,10 +134,10 @@
                         <input type="radio" id="tel-b2" name="sendbackStatus" value="2">
                         <label for="tel-b2">已寄回</label>
                     </div>
-                    <div class="radio-box">
+                    <#--<div class="radio-box">
                         <input type="radio" id="tel-b3" name="sendbackStatus" value="3">
                         <label for="tel-b3">已签收</label>
-                    </div>
+                    </div>-->
                 </div>
             </div>
             <div class="row cl" id="backLogisticsInfo">
@@ -204,14 +209,14 @@
                         <input type="hidden" id="sendProdcues" value="">
                     </div>
                 </div>
-                <div class="row cl" style="position: relative;/*display: none;*/">
+                <#--<div class="row cl" style="position: relative;/*display: none;*/">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>仓库签收时间</strong>
                     </div>
                     <div class="formControls col-4 col-sm-4">
                         <input type="text" placeholder="请选择仓库签收时间" id="sendbackSignTime"  name="sendbackSignTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly" seleType="send">
                     </div>
-                </div>
+                </div>-->
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -240,10 +245,10 @@
                         <input type="radio" id="tel-c2" name="sendbackStatuss" value="2">
                         <label for="tel-c2">已寄回</label>
                     </div>
-                    <div class="radio-box">
+                    <#--<div class="radio-box">
                         <input type="radio" id="tel-c3" name="sendbackStatuss" value="3">
                         <label class="c-success">已签收</label>
-                    </div>
+                    </div>-->
                 </div>
             </div>
             <div class="row cl" id="backLogisticsInfos">
@@ -313,14 +318,14 @@
                         <input type="hidden" id="sendProdcuess" value="">
                     </div>
                 </div>
-                <div class="row cl" style="position: relative;/*display: none;*/">
+                <#--<div class="row cl" style="position: relative;/*display: none;*/">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>仓库签收时间</strong>
                     </div>
                     <div class="formControls col-4 col-sm-4">
                         <input type="text" placeholder="请选择仓库签收时间" id="sendbackSignTimes"  name="sendbackSignTimes" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly">
                     </div>
-                </div>
+                </div>-->
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2">
                     </div>
@@ -1235,7 +1240,7 @@
                     $("#sendbackLogisticsNos").val(info.sendbackLogisticsNo);
                     $("#sendbackNames").val(info.sendbackName);
                     $("#sendbackTels").val(info.sendbackTel);
-                    $("#sendbackSignTimes").val(info.sendbackSignTime);
+                    /*$("#sendbackSignTimes").val(info.sendbackSignTime);*/
                     $("#productbodyIds").find(".input-prodcueNumber-ids").each(function () {
                         for(var i=0;i<info.listSendbackItem.length;i++){
                            if(info.listSendbackItem[i].sendbackProductId == $(this).parents("tr").find(".input-produce-ids").eq(0).val()
@@ -1263,7 +1268,7 @@
             var sendbackLogisticsNo = $("#sendbackLogisticsNo").val();
             var sendbackName = $("#sendbackName").val();
             var sendbackTel = $("#sendbackTel").val();
-            var sendbackSignTime = $("#sendbackSignTime").val();
+            /*var sendbackSignTime = $("#sendbackSignTime").val();*/
             var sendProdcues = new Array();  //寄出产品表
 
             $("#productbodyId").find(".input-prodcueNumber-id").each(function () {
@@ -1295,10 +1300,10 @@
                 layer.msg("请输入寄回人电话!",{icon: 5,time:1000});
                 return;
             }
-            if(sendbackSignTime == null || postageAlipayName == ""){
+            /*if(sendbackSignTime == null || postageAlipayName == ""){
                 layer.msg("请输入签收时间!",{icon: 5,time:1000});
                 return;
-            }
+            }*/
             $.ajax({
                 cache: true,
                 type: "POST",
@@ -1308,7 +1313,6 @@
                     "sendbackLogisticsNo" : sendbackLogisticsNo,
                     "sendbackName" : sendbackName,
                     "sendbackTel" : sendbackTel,
-                    "sendbackSignTime" : sendbackSignTime,
                     "sendProdcues" : SendProdcues
                 },
                 url: "${path}/admin/customer/add_SendbackInfo",
@@ -1341,6 +1345,7 @@
                                     '<td>'+sendbackStatus+'</td>' +
                                     '<td>'+html+'</td>' +
                                     '<td>'+htmls+'</td></tr>');
+                            $("#addSendBackDiv").hide();
                             layer.msg("添加成功!",{icon: 1,time:1000});
 
                     } else {
@@ -1361,7 +1366,7 @@
         var sendbackLogisticsNo = $("#sendbackLogisticsNos").val();
         var sendbackName = $("#sendbackNames").val();
         var sendbackTel = $("#sendbackTels").val();
-        var sendbackSignTime = $("#sendbackSignTimes").val();
+        /*var sendbackSignTime = $("#sendbackSignTimes").val();*/
         var sendProdcues = new Array();  //寄出产品表
 
         $("#productbodyIds").find(".input-prodcueNumber-ids").each(function () {
@@ -1394,10 +1399,10 @@
             layer.msg("请输入寄回人电话!",{icon: 5,time:1000});
             return;
         }
-        if(sendbackSignTime == null || postageAlipayName == ""){
+        /*if(sendbackSignTime == null || postageAlipayName == ""){
             layer.msg("请输入签收时间!",{icon: 5,time:1000});
             return;
-        }
+        }*/
         $.ajax({
             cache: true,
             type: "POST",
@@ -1407,7 +1412,6 @@
                 "sendbackLogisticsNo" : sendbackLogisticsNo,
                 "sendbackName" : sendbackName,
                 "sendbackTel" : sendbackTel,
-                "sendbackSignTime" : sendbackSignTime,
                 "sendProdcues" : SendProdcues
             },
             url: "${path}/admin/customer/update_SendbackInfo",
@@ -1439,6 +1443,7 @@
                             '<td>'+sendbackStatus+'</td>' +
                             '<td>'+html+'</td>' +
                             '<td>'+htmls+'</td>');
+                    $("#addSendBackDiv").hide();
                     layer.msg("修改成功!",{icon: 1,time:1000});
 
                 } else {
@@ -2449,14 +2454,14 @@
                     return relation_flag;
                 }
             }
-            if (relationBackStatus == 3) {
+            /*if (relationBackStatus == 3) {
                 var relationBackReceiptDate = $('#relationBackReceiptDate').val();//仓库签收时间
                 if (relationBackReceiptDate == null || relationBackReceiptDate == '') {
                     layer.msg("仓库签收时间不能为空",{icon: 5,time:1000});
                     relation_flag = false;
                     return relation_flag;
                 }
-            }
+            }*/
         }else if(type == 2){
             var relationIsTransfer = $('input[name="relationIsTransfer"]:checked').val();
             /*var relationBackPostage = $('#relationBackPostage').val().trim();//寄回邮费

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -194,7 +194,7 @@
                             待翻新入库
                         </#if>
                         <#if detect.detectState == 21>
-                            已翻新入库
+                        <span class="c-success">已翻新入库</span>
                         </#if>
                         <#if detect.detectState == 22>
                             不能翻新，待报废

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -150,7 +150,7 @@
             </div>-->
 
                 <div class="row cl">
-                    <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件人信息：</label>
+                    <label class="form-label col-3 col-sm-3">寄件人信息：</label>
                     <div class="formControls col-2 col-sm-2 skin-minimal">
                         <input type="text"  class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
                     </div>
@@ -158,7 +158,7 @@
                         <input type="text" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                     </div>
                 </div>
-            <div class="row cl address_info" style="position: relative;">
+            <#--<div class="row cl address_info" style="position: relative;">
                 <label class="form-label col-3 col-sm-3"></label>
                 <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
@@ -178,10 +178,42 @@
                         </select>
 				    </span>
                 </div>
+
+            </div>-->
+
+            <div class="row cl recipientAddress address_info" code="returnCode" msg="resultMsg" data="returnMsg" urlPrefix="${path}">
+                <input type="hidden" id="addressInfo">
+                <label class="form-label col-3 col-sm-3"></label>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                    <span class="select-box">
+                        <select name="provinceNumber" class="select" id="provinces"
+                                ulcValName="province" ulcValId="provinceId"  ulcURL="/address/list_province" ulcMsg="" ulcList="provinceList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择省份">
+                        </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                        <select name="cityNumber" class="select" id="city"
+                                ulcValName="city" ulcValId="cityId"  ulcURL="/address/list_city?provinceId=" ulcMsg="" ulcList="cityList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择市">
+                        </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2" style="position: relative;">
+                    <span class="select-box">
+                        <select name="areaNumber" class="select" id="area"
+                                ulcValName="district" ulcValId="districtId"  ulcURL="/address/list_district?cityId=" ulcMsg="" ulcList="districtList"
+                                ulcIsFristSelect="true" ulcFristSelectMsg="请选择区/县">
+                        </select>
+                    </span>
+                </div>
+                <input type="hidden" name="relationSendMergeAddress" id="relationSendMergeAddress">
                 <input type="hidden" name="signclosedAddrProvinces" id="signclosedAddrProvinces" >
                 <input type="hidden" name="signclosedAddrCity" id="signclosedAddrCity" >
                 <input type="hidden" name="signclosedAddrArea" id="signclosedAddrArea" >
             </div>
+
             <div class="row cl">
                 <label class="form-label col-xs-3 col-sm-3"><span class="c-red">*</span>签收图片：</label>
                 <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;">
@@ -269,9 +301,9 @@
 
     /*初始化省市区*/
     /*$(".address_info").initAddress();*/
-    var ulc = initAddress($(".address_info"));
-    var sc = initSalesChannel($(".sales_channel"));
-
+   /* var ulc = initAddress($(".address_info"));
+    var sc = initSalesChannel($(".sales_channel"));*/
+    var ulcRelationAddress = init_address($(".address_info"));
 
 
     //动态回显产品js end
@@ -328,7 +360,7 @@
             layer.msg('物流单号长度不得大于20个字符',{icon: 5,time:1000});
             return;
         }
-        var signclosedSendName = $("#signclosedSendName").val();
+        /*var signclosedSendName = $("#signclosedSendName").val();
         if( signclosedSendName == null || signclosedSendName == "" ){
             layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
             return;
@@ -345,7 +377,7 @@
         if( signclosedSendTel.length > 11 ){
             layer.msg('寄件人电话长度不得大于11个字符',{icon: 5,time:1000});
             return;
-        }
+        }*/
         /*var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
         if(!myreg.test(signclosedSendTel)){
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});