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

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -56,7 +56,10 @@
       cd.detect_completion_time detectCompletionTime,
       cd.maintenance_completion_time maintenanceCompletionTime,
       cd.renovation_completion_time renovationCompletionTime,
-      cd.scrap_completion_time scrapCompletionTime
+      cd.scrap_completion_time scrapCompletionTime,
+      qd.describe_content describeContent,
+      qd.describe_handle_desc describeHandleDesc,
+      sa.admin_name adminName
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id

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

@@ -33,13 +33,12 @@
             <input type="text" class="my-input trim_input"  style="width:120px;margin-bottom: 10px;" value="" placeholder="手机号码" id="customerTel" name="customerTel">
             <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">处理结果</option>
-                <option value="1" >已解决</option>
-                <option value="2" >未解决</option>
-                <option value="3" >换新</option>
-                <option value="4" >维修</option>
+                <option value="1" >操作指导</option>
+                <option value="2" >换货</option>
+                <option value="3" >维修</option>
+                <option value="4" >退货</option>
                 <option value="5" >补发</option>
-                <option value="6" >退货</option>
-                <option value="7" >无理由退货</option>
+                <option value="6" >其他</option>
             </select>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;height: 35px;margin-bottom: 10px;"name="" onclick="searchOrder()"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
         </form>

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

@@ -1093,9 +1093,9 @@
                     <div class="formControls col-12 col-sm-12">
                             <div class="row cl" >
                                 <div class="formControls col-2 col-sm-2 text-r">
-                                    <strong>检测ID：</strong>
+                                    <strong>维修编号：</strong>
                                 </div>
-                                <div class="formControls col-4 col-sm-4" id="detectIdDiv">
+                                <div class="formControls col-4 col-sm-4" id="detectNumberDiv">
 
                                 </div>
                                 <div class="formControls col-2 col-sm-2 text-r">
@@ -2773,7 +2773,7 @@
                     }else{
                         detectOfferName = "0元";
                     }
-                    $("#detectIdDiv").html("");
+                    $("#detectNumberDiv").html("");
                     $("#detectStateDIV").html("");
                     $("#productTypeNameDIV").html("");
                     $("#detectOfferDIV").html("");
@@ -2788,7 +2788,7 @@
                     $("#imgDiv").html();
 
 
-                    $("#detectIdDiv").html(detectInfo.detectId);
+                    $("#detectNumberDiv").html(detectInfo.detectNumber);
                     $("#detectStateDIV").html(detectStateName);
                     $("#productTypeNameDIV").html(detectInfo.productName+"("+detectInfo.colorName+")");
                     $("#detectOfferDIV").html(detectOfferName);

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

@@ -50,13 +50,13 @@
                 <#--<label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>-->
             <#--</div>-->
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人姓名：</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人姓名：</label>
                 <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                     <input type="text" style="" value="${complaintSignclosedInfo.signclosedSendName!''}" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
                 </div>
             </div>
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>寄件人电话：</label>
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人电话：</label>
                 <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
                     <input type="text" style="" value="${complaintSignclosedInfo.signclosedSendTel!''}" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
@@ -132,7 +132,7 @@
 
     function  update() {
         var signclosedSendName = $("#signclosedSendName").val();
-        if( signclosedSendName == null || signclosedSendName == "" ){
+        /*if( signclosedSendName == null || signclosedSendName == "" ){
             layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
             return;
         }
@@ -153,7 +153,7 @@
         if(!myreg.test(signclosedSendTel)){
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
-        }
+        }*/
         var signclosedLogisticsNumber = $("#signclosedLogisticsNumber").val();
         if( signclosedLogisticsNumber == null || signclosedLogisticsNumber == "" ){
             layer.msg('物流单号不能为空',{icon: 5,time:1000});

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

@@ -98,6 +98,7 @@
                             <tbody id="detect_product">
                             </tbody>
                         </table>
+                        <input type="hidden" value="" id="isdetectId">
                     </div>
                 </div>
             </div>

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

@@ -87,6 +87,13 @@ $(function(){
                 vailErrorMsg($(".add-order-button"),"必须要有一个产品");
                 return false;
             }
+            if($("#isdetectId").val() != ""){
+                if (!$("[name='detectId']").get(0).checked) {
+                    vailErrorMsg($(".add-order-button"),"维修类型的售后订单，如果有需要寄给用户的机器，请勾选维修记录");
+                    return false;
+                }
+            }
+
 
             $("#orderItemString").val(JSON.stringify(orderItemArray));
 
@@ -170,6 +177,7 @@ function setSelectCustomer(customerId){
                 //回显售后数据
                 var listDetet = data.returnMsg.listDetet;
                 if(listDetet.length > 0){
+                    $("#isdetectId").val(listDetet.length);
                     var html = "";
                     $("#all_detect_product").show();
                     for(var i=0;i<listDetet.length;i++){