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

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -506,7 +506,7 @@
         and cs.signclosed_date = #{afterTime}
       </if>
       <if test="afterState != null and afterState == 4">
-        and cd.detect_state = 1
+        and cd.detect_state = 1 AND cc.procTypeId = 3
       </if>
       <if test="afterState != null and afterState == 5">
         and cd.detect_state in(30,34,38)
@@ -521,10 +521,10 @@
         and cd.detect_state in(32,36) and cd.detect_placeorder = 1 AND maintenance_results = 1
       </if>
       <if test="afterState != null and afterState == 9">
-        and cd.maintenance_cut_time &lt; now()
+        and cd.maintenance_cut_time &lt; now()  AND cc.procTypeId = 3 and cd.detect_placeorder = 1
       </if>
       <if test="afterState != null and afterState == 10">
-        and cd.complete_cut_time &lt; now()
+        and cd.complete_cut_time &lt; now()   AND cc.procTypeId = 3 and cd.detect_placeorder = 1
       </if>
       <if test="warehouseDate != null">
         and cs.signclosed_date = #{warehouseDate}

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -51,8 +51,10 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
     @Transactional
     public int updateDetectById(ComplaintDetectInfo record) {
             try {
-            //删除旧检测项
+                //删除旧检测项
                 complaintDetectInfoMapper.detectDetectionItem(record.getDetectId());
+                //删除旧维修配件项
+                complaintDetectInfoMapper.detectMaterialItem(record.getDetectId());
                 //封装检测信息
                 //检测现象
                 if(record.getConfigli1() != null) {
@@ -114,6 +116,19 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                 }else{
                     record.setDetectNalysis("");
                 }
+                //维修配件
+                if(record.getConfigli6() != null) {
+                    if (record.getConfigli6().length > 0) {
+                        for (String configid : record.getConfigli6()) {
+                            MaterialNumberInfo materialNumberInfo = complaintDetectInfoMapper.getMaterialNumber(Integer.valueOf(configid));
+                            MaterialItem materialItem = new MaterialItem();
+                            materialItem.setDetectId(record.getDetectId());
+                            materialItem.setMaterialId(Integer.valueOf(configid));
+                            materialItem.setMaterialName(materialNumberInfo.getMaterialName());
+                            complaintDetectInfoMapper.addMaterialItem(materialItem);
+                        }
+                    }
+                }
             }catch (Exception e){
                 throw new RuntimeException("修改检测失败");
             }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintSignclosedInfoServiceImpl.java

@@ -64,8 +64,20 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
         //查询是否已存在相同单号
         if(record.getSignclosedLogisticsNumber() != null){
             ComplaintSignclosedInfo info = new ComplaintSignclosedInfo();
-            info.setSignclosedLogisticsNumber(record.getSignclosedLogisticsNumber());
-            List<ComplaintSignclosedInfo> sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+            List<ComplaintSignclosedInfo> sinfoList = new ArrayList<>();
+            //判断是否是京东
+            if (record.getSignclosedLogisticsNumber().contains("-")){
+                //截取-前的内容搜索一次
+                info.setSignclosedLogisticsNumber(StringUtils.substringBefore(record.getSignclosedLogisticsNumber(), "-"));
+                sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+                if(sinfoList.size() <= 0){//如果没有搜索到数据，则用完整单号搜索
+                    info.setSignclosedLogisticsNumber(record.getSignclosedLogisticsNumber());
+                    sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+                }
+            }else{
+                info.setSignclosedLogisticsNumber(record.getSignclosedLogisticsNumber());
+                sinfoList = complaintSignclosedInfoMapper.listSignclosed(info);
+            }
             if(sinfoList.size() <= 0){
                 num = complaintSignclosedInfoMapper.insert(record);
                 msg = 1;//添加成功

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

@@ -285,6 +285,9 @@
       <if test="detectSalesId != null and detectSalesId != ''">
         and cd.detect_sales_id  = #{detectSalesId}
       </if>
+      <if test="procTypeId != null and procTypeId != ''">
+        and cpt.proc_type_id  = #{procTypeId}
+      </if>
     </where>
       GROUP BY cd.detect_id
       ORDER BY cd.detect_create_time DESC
@@ -618,16 +621,19 @@
 
     <select id="getCustomerDetectNum" parameterType="ComplaintDetectInfo" resultType="ComplaintAfterSalesNum">
       SELECT
-      sum(CASE WHEN detect_state = 1 then 1 else 0 end) AS beDetected,
+      sum(CASE WHEN (detect_state = 1 AND cpt.proc_type_id = 3) then 1 else 0 end) AS beDetected,
       sum(CASE WHEN detect_state in(30,34,38) then 1 else 0 end) AS beConfirmed,
       sum(CASE WHEN detect_state in(32,33,36,37) then 1 else 0 end) AS completeProcessing,
       sum(CASE WHEN (detect_state = 37 and detect_placeorder = 1) then 1 else 0 end) AS placeOrderNum,
       sum(CASE WHEN (detect_state in(32,36) and detect_placeorder = 1 AND maintenance_results = 1) then 1 else 0 end) AS detectplaceOrderNum,
-      sum(CASE WHEN (maintenance_cut_time &lt; now()) then 1 else 0 end) AS maintenanceCutTimeNum,
-      sum(CASE WHEN (complete_cut_time &lt; now()) then 1 else 0 end) AS completeCutTimeNum
+      sum(CASE WHEN (maintenance_cut_time &lt; now() AND cpt.proc_type_id = 3 and detect_placeorder = 1) then 1 else 0 end) AS maintenanceCutTimeNum,
+      sum(CASE WHEN (complete_cut_time &lt; now() AND cpt.proc_type_id = 3 and detect_placeorder = 1) then 1 else 0 end) AS completeCutTimeNum
       FROM
       tb_rst_complaint_detect cd
       LEFT JOIN tb_rst_cm_customer_info ci ON ci.customer_id = cd.customer_id
+      LEFT JOIN tb_rst_cm_relation cr on cr.customer_id = cd.customer_id
+      LEFT JOIN tb_rst_cm_proc_method cpm ON cpm.proc_method_id = cr.proc_method_id
+      LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
         <where>
             <if test="adminId != null and adminId != ''" >
                 AND ci.admin_id = #{adminId}

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

@@ -344,6 +344,7 @@ public class AdminDetectController {
         List<DetectionConfig> config3 = complaintDetectInfoService.listDetectionConfig(3);
         List<DetectionConfig> config4 = complaintDetectInfoService.listDetectionConfig(4);
         List<DetectionConfig> config5 = complaintDetectInfoService.listDetectionConfig(5);
+        List<MaterialNumberInfo> listMaterial = complaintDetectInfoService.listMaterialNumber();
         mv.addObject("config1",config1);
         mv.addObject("config2",config2);
         mv.addObject("config3",config3);
@@ -364,51 +365,15 @@ public class AdminDetectController {
         //查询原因分析
         detectionItem.setConfigType(5);
         mv.addObject("detectNalysisList",complaintDetectInfoService.listDetectionItem(detectionItem));
+        //查询维修配件
+        mv.addObject("listMaterialItem",complaintDetectInfoService.listMaterialItem(Integer.valueOf(detectId)));
 
 
+        mv.addObject("listMaterial",listMaterial);
         mv.addObject("detectInfo",detectinfo);
         mv.addObject("imgList",imgList);
         return mv;
     }
-    /**
-     * 跳转到添加修改转入信息页面
-     *
-     * @return
-     *//*
-    @RequiresPermissions("remark:add:remark")
-    @RequestMapping(value = "/to_produced_info")
-    public ModelAndView toProducedInfo(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("cm/inspection/update_produced_info");
-        String detectId = request.getParameter("detectId");
-        String state = request.getParameter("state");
-        if(detectId == null || detectId.equals("")){
-            return mv;
-        }
-        ComplaintDetectInfo detectInfo = complaintDetectInfoService.getComplaintDetectById(Integer.valueOf(detectId));
-        mv.addObject("detectId",detectId);
-        mv.addObject("detectInfo",detectInfo);
-        mv.addObject("state",state);
-        return mv;
-    }*/
-
-    /**
-     * 跳转到检测完成页面
-     *
-     * @return
-     */
-    /*@RequiresPermissions("complete:update:complete")
-    @RequestMapping(value = "/to_detect_complete")
-    public ModelAndView toDetectComplete(HttpServletRequest request) {
-        ModelAndView mv = new ModelAndView("cm/inspection/detect_complete");
-        String detectId = request.getParameter("detectId");
-        if(detectId == null || detectId.equals("")){
-            return mv;
-        }
-        ComplaintDetectInfo detectInfo = complaintDetectInfoService.getComplaintDetectById(Integer.valueOf(detectId));
-        mv.addObject("detectId",detectId);
-        mv.addObject("detectInfo",detectInfo);
-        return mv;
-    }*/
 
 
     /**
@@ -438,7 +403,7 @@ public class AdminDetectController {
         String[] configli3 = request.getParameterValues("configli3");
         String[] configli4 = request.getParameterValues("configli4");
         String[] configli5 = request.getParameterValues("configli5");
-        String[] configli6 = request.getParameterValues("configli6");
+        String[] configli6 = request.getParameterValues("configui6");
         detectInfo.setConfigli1(configli1);
         detectInfo.setConfigli2(configli2);
         detectInfo.setConfigli3(configli3);

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

@@ -2753,17 +2753,17 @@
                             break
                     }
                     var isMaintenanceName;
-                    if(detectInfo.isMaintenance === "1"){
+                    if(detectInfo.isMaintenance === 1){
                         isMaintenanceName = "有故障";
                     }
-                    if(detectInfo.isMaintenance === "2"){
+                    if(detectInfo.isMaintenance === 2){
                         isMaintenanceName = "无故障";
                     }
                     var detectRenovationName;
-                    if(detectInfo.detectRenovation === "1"){
+                    if(detectInfo.detectRenovation === 1){
                         detectRenovationName = "可翻新";
                     }
-                    if(detectInfo.detectRenovation === "2"){
+                    if(detectInfo.detectRenovation === 2){
                         detectRenovationName = "不可翻新";
                     }
                     var detectOfferName;
@@ -2827,7 +2827,7 @@
         if(detectState === "30"){
             $("#updateDetect_1").show();
             $("#updateDetect_2").hide();
-            $("#updateDetect_3").hide();
+            /*$("#updateDetect_3").hide();*/
             $("#updateDetect_1_1").hide();
         }
         if(detectState === "34"){
@@ -2919,7 +2919,7 @@
         var procMethodId = $("#procMethodId").val();
         if(detectState === "30"){
             detectProcessingResults = $('input[name="detectProcessingResults_1"]:checked').val();//处理结果
-            if(detectProcessingResults === "1" || detectProcessingResults === "5"){
+            if(detectProcessingResults === "1"/* || detectProcessingResults === "5"*/){
                 procMethodId = null;
             }
         }
@@ -2929,9 +2929,9 @@
         }
         if(detectState === "38"){
             detectProcessingResults = $('input[name="detectProcessingResults_1"]:checked').val();//处理结果
-            if(detectProcessingResults === "5"){
+            /*if(detectProcessingResults === "5"){
                 procMethodId = null;
-            }
+            }*/
         }
         var detectCustomerDesc = $("#detectCustomerDesc").val();
         var detectId = $("#detectId").val();
@@ -3025,7 +3025,7 @@
         $("#updateDetect_3").show();
     });
     $("#tel-005").click(function (){
-        $("#updateDetect_3").hide();
+        $("#updateDetect_3").show();
     });
 
 </script>

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

@@ -50,21 +50,21 @@
         <div class="row cl">
                 <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center">维修配件：</label>
                 <div class="formControls col-6 col-sm-6 huanhang" style="">
-                    <span class="select-box">
+
                         <#--<select class="select" id="materialId" name="materialId" >
                             <option value="1" >请选择（可多选）</option>
                             <#list listMaterial as material>
                                 <option value="${material.materialName}" >${material.materialName}</option>
                             </#list>
                         </select>-->
-                        <select id="configSelect6" name="configSelect6" class="select" style="width: 93%;">
+                        <select id="configSelect6" name="configSelect6" class="chosen" style="width: 43%;">
                             <#if (listMaterial?size > 0)>
                                     <#list listMaterial as material>
                                         <option value="${material.materialId!""}">${material.materialName!""}</option>
                                     </#list>
                             </#if>
                         </select>
-				    </span>
+
                 </div>
             </div>
             <div class="input-box">
@@ -154,6 +154,26 @@
             }
         });
     }
+    $('.chosen').chosen({
+        no_results_text: "没有找到结果！",//搜索无结果时显示的提示
+        search_contains:true,   //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许，选中选项会有一个x号可以删除选项
+        disable_search: false, //禁用搜索。设置为true，则无法搜索选项。
+        disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
+        inherit_select_classes: true, //是否继承原下拉框的样式类，此处设为继承
+        placeholder_text_single: '选择国家', //单选选择框的默认提示信息，当选项为空时会显示。如果原下拉框设置了data-placeholder，会覆盖这里的值。
+        width: '255px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
+        max_shown_results: 1000, //下拉框最大显示选项数量
+        display_disabled_options: false,
+        single_backstroke_delete: false, //false表示按两次删除键才能删除选项，true表示按一次删除键即可删除
+        case_sensitive_search: false, //搜索大小写敏感。此处设为不敏感
+        group_search: false, //选项组是否可搜。此处搜索不可搜
+        include_group_label_in_selected: true //选中选项是否显示选项分组。false不显示，true显示。默认false。
+    });
+    $('.chosen2').chosen({
+        search_contains:false,
+        enable_split_word_search: true //分词搜索，选项词可通过空格或'[]'分隔。search_contains为false时才能看出效果
+    });
 </script>
 </body>
 </html>

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

@@ -409,7 +409,7 @@
                 </span></td>
             </tr>
 
-            <tr>
+            <#--<tr>
                 <th width="10">维修配件：</th>
                 <td width="10" style="font-weight: normal;" colspan="5"><span>
                 <#if (listMaterialItem?size > 0)>
@@ -422,7 +422,7 @@
                     </#list>
                 </#if>
                 </span></td>
-            </tr>
+            </tr>-->
             </thead>
         </table>
         <div class="row cl">

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

@@ -120,6 +120,12 @@
                 <option value="8" <#if status??><#if status == 8>selected</#if></#if>>报废完成</option>
                 <option value="9" <#if status??><#if status == 9>selected</#if></#if>>原机退回</option>
             </select>
+            <select class="my-select" name="procTypeId" id="procTypeId" style="width: 120px;">
+                <option value="">维修类型</option>
+                <option value="2" <#if procTypeId??><#if procTypeId == 2>selected</#if></#if>>换货</option>
+                <option value="3" <#if procTypeId??><#if procTypeId == 3>selected</#if></#if>>维修</option>
+                <option value="4" <#if procTypeId??><#if procTypeId == 4>selected</#if></#if>>退货</option>
+            </select>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="customerId" id="customerId" value="${customerId!}" placeholder="客诉编号"/>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectNumber" id="detectNumber" value="${detectNumber!}" placeholder="维修编号"/>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="questionTitle" id="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
@@ -806,6 +812,7 @@
         var detectClassification = cufte($("#detectClassification").val());//故障分类
         var startTime = cufte($("#startTime").val());//开始时间
         var endTime = cufte($("#endTime").val());//结束时间
+        var procTypeId = cufte($("#procTypeId").val());//客诉类型
 
         $.ajax({
             type:'POST',
@@ -822,7 +829,8 @@
                 "detectNalysis" : detectNalysis,
                 "detectClassification" : detectClassification,
                 "startTime" : startTime,
-                "endTime" : endTime
+                "endTime" : endTime,
+                "procTypeId" : procTypeId
             },
             dataType: 'json',
             async: false,
@@ -843,6 +851,7 @@
                             +"&detectNalysis="+detectNalysis
                             +"&startTime="+startTime
                             +"&endTime="+endTime
+                            +"&procTypeId="+procTypeId
                             +"&detectClassification="+detectClassification;
                 }
             }

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

@@ -36,6 +36,7 @@
 <body>
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
+        <div class="row cl">
         <#--<div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否故障：</label>
             <div class=" col-xs-9 col-sm-9 huanhang" >
@@ -297,41 +298,38 @@
 
                 </div>
             </div>
-       <#--<div class="input-box" >
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测现象：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="请输入工厂的检测现象">${detectInfo.detectPhenomenon!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPhenomenon!''}" name="detectPhenomenon" id="detectPhenomenon"  placeholder="请输入检测现象"/>
-            </div>
-        </div>
-        <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">故障原因：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="请输入故障原因">${detectInfo.detectFailureCause!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectFailureCause!''}" name="detectFailureCause" id="detectFailureCause"  placeholder="请输入故障原因"/>
-            </div>
-        </div>
-        <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">判定结果：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="请输入判定结果">${detectInfo.detectResults!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectResults!''}" name="detectResults" id="detectResults"  placeholder="请输入判定结果"/>
-            </div>
-        </div>
-        <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">故障指向：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="请输入故障指向">${detectInfo.detectPoint!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPoint!''}" name="detectPoint" id="detectPoint"  placeholder="请输入故障指向"/>
+            <div class="input-box">
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;">维修配件：</label>
+                <div class="formControls col-9 col-sm-9 huanhang" style="margin: 10px 0px;">
+                    <select id="configSelect6" name="configSelect6" class="chosen" style="width: 93%;">
+                            <#if (listMaterial?size > 0)>
+                                    <#list listMaterial as material>
+                                        <option value="${material.materialId!""}">${material.materialName!""}</option>
+                                    </#list>
+                            </#if>
+                    </select>
+
+                </div>
             </div>
-        </div>
-        <div class="input-box">
-            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">原因分析：</label>
-            <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectNalysis" id="detectNalysis" class="my-textarea" placeholder="请输入原因分析">${detectInfo.detectNalysis!''}</textarea>&ndash;&gt;
-                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectNalysis!''}" name="detectNalysis" id="detectNalysis"  placeholder="请输入原因分析"/>
+            <div class="input-box">
+                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"></label>
+                <div class="formControls col-7 col-sm-7 huanhang" id="config6" style="margin: 10px 0px;">
+                    <div class="row">
+                        <ul class="close-box" id="configui6">
+                                <#if (listMaterialItem?size > 0)>
+                                    <#list listMaterialItem as materialItem>
+                                    <li class="b-close" id="configui6">
+                                        <input type="hidden" value="${materialItem.materialId!''}" name="configui6">
+                                        ${materialItem.materialName!''}
+                                        <span class="my-close" onclick="deleteli(this)"></span>
+                                    </li>
+                                    </#list>
+                                </#if>
+                        </ul>
+                    </div>
+
+                </div>
             </div>
-        </div>-->
             <div class="input-box">
                 <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">故障分类：</label>
                 <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
@@ -339,14 +337,14 @@
                     <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectClassification!''}" name="detectClassification" id="detectClassification"  placeholder="请输入故障分类"/>
                 </div>
             </div>
-    <#--    <div class="input-box">
+        <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">检测内容：</label>
             <div class="formControls col-xs-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
-                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectContent" id="detectContent" class="my-textarea" placeholder="请输入检测内容">${detectInfo.detectContent!''}</textarea>&ndash;&gt;
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectContent" id="detectContent" class="my-textarea" placeholder="请输入检测内容">${detectInfo.detectContent!''}</textarea>-->
                 <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectContent!''}" name="detectContent" id="detectContent"  placeholder="请输入检测内容"/>
 
             </div>
-        </div>-->
+        </div>
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">维修报价：</label>
             <div class="formControls col-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
@@ -366,7 +364,15 @@
                 <div class="radio-box" style="padding: 0px; width: 100%;">
                     <textarea style="height: 60px;margin: 10px 0px 10px 0px;width: 85%;" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请填写备注信息！">${detectInfo.detectDesc!''}</textarea>
                 </div>
+
+            </div>
+            <div class="col-xs-9 col-sm-9 skin-minimal">
+                <input type="hidden" value="${detectInfo.detectId!''}" id="detectId" name="detectId">
+                <input type="hidden" value="${detectInfo.customerId!''}" id="customerId" name="customerId">
+                <button type="button" class="my-btn-submit" onclick="add();">确认修改</button>
+
             </div>
+
         </div>
 
         <#--<div class="row cl">
@@ -388,11 +394,6 @@
                 </#if>
             </div>
         </div>-->
-
-        <div>
-            <input type="hidden" value="${detectInfo.detectId!''}" id="detectId" name="detectId">
-            <input type="hidden" value="${detectInfo.customerId!''}" id="customerId" name="customerId">
-           <button type="button" class="my-btn-submit" onclick="add();">确认修改</button>
         </div>
     </form>
 </article>
@@ -512,6 +513,24 @@
             }
         }
     });
+    $('#configSelect6').change(function() {
+        var name = $("#configSelect6 option:selected").text();
+        var id = $('#configSelect6').val();
+        var bl = true;
+        $("input[name='configui6']").each(function(j,item){
+            var s = $(item).val();
+            if(s === id){
+                bl = false;
+            }
+        });
+        if(bl){
+            $("#configui6").append('<li class="b-close" id="configDetele6">' +
+                    ' <input type="hidden" value="'+id+'" name="configui6">' +name+
+                    '<span class="my-close" onclick="deleteli(this)"></span>' +
+                    '</li>');
+        }
+
+    });
 
     /***
      * 删除图片

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

@@ -383,7 +383,7 @@
             layer.msg('请输入寄件人电话',{icon: 5,time:1000});
             return;
         }
-        if( signclosedSendTel.length > 11 ){
+        if( signclosedSendTel.length > 15 ){
             layer.msg('寄件人电话长度不得大于11个字符',{icon: 5,time:1000});
             return;
         }

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

@@ -145,7 +145,7 @@
             layer.msg('请输入寄件人电话',{icon: 5,time:1000});
             return;
         }
-        if( signclosedSendTel.length > 11 ){
+        if( signclosedSendTel.length > 15 ){
             layer.msg('寄件人电话长度不得大于11个字符',{icon: 5,time:1000});
             return;
         }

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

@@ -269,11 +269,13 @@
                         </a>
                         <#if order.procTypeId??>
                             <#if order.procTypeId != '3'>
-                                <#if order.isDevelop == 1>
-                                    <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
-                                       onclick="getAfterrulesInfo(${order.salesId!''});">
-                                        <i class="Hui-iconfont">&#xe63c;</i>
-                                    </a>
+                                <#if order.isDevelop??>
+                                    <#if order.isDevelop == 1>
+                                        <a style="text-decoration:none" href="javascript:;" title="查看售后信息"
+                                           onclick="getAfterrulesInfo(${order.salesId!''});">
+                                            <i class="Hui-iconfont">&#xe63c;</i>
+                                        </a>
+                                    </#if>
                                 </#if>
                             </#if>
                         <#else>