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

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

@@ -105,6 +105,7 @@
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
       </if>
     </where>
+    ORDER BY cd.signclosed_create_time DESC
   </select>
   <insert id="insert" parameterType="ComplaintDetectInfo" >
     insert into tb_rst_complaint_detect (detect_id, customer_id,signclosed_id,product_id,

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

@@ -125,6 +125,7 @@
         AND product_color_id = #{productColorId}
       </if>
     </where>
+    ORDER BY cm.maintenance_create_time DESC
   </select>
   <insert id="insert" parameterType="ComplaintMaintenanceInfo" >
     insert into tb_rst_complaint_maintenance (maintenance_id, detect_id, maintenance_equipment_number, 

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

@@ -146,7 +146,7 @@
         cs.signclosed_send_name = #{signclosedSendName}
       </if>
       <if test="signclosedSendTel != null and signclosedSendTel != ''" >
-        AND cs.signclosed_send_tel = #{signclosedSendTel}
+        AND cs.signclosed_send_tel like CONCAT('%',#{signclosedSendTel},'%')
       </if>
       <if test="signclosedLogisticsNumber != null and signclosedLogisticsNumber != ''" >
         AND cs.signclosed_logistics_number = #{signclosedLogisticsNumber}
@@ -167,6 +167,7 @@
         AND cs.signclosed_is_quality = #{signclosedIsQuality}
       </if>
     </where>
+    order by cs.signclosed_create_time DESC
   </select>
 
   <insert id="insert" parameterType="ComplaintSignclosedInfo" useGeneratedKeys="true" keyProperty="signclosedId" >

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

@@ -147,14 +147,19 @@ public class AdminSignclosedController {
             for (int i = 0;i<alreadyColorName.length;i++){
                 /**获取机器数量**/
                 String number = request.getParameter("alreadyColorId"+alreadyColorName[i]);
+                if(number == null || number.equals("")){
+                    msg.setResultCode(200);
+                    msg.setReturnCode(503);
+                    return msg;
+                }
                 alreadyColorMap.put(alreadyColorName[i],Integer.valueOf(number));
                 /**获取机器编号数组**/
                 String[] machineNumbers = request.getParameterValues("machineNumber"+alreadyColorName[i]);
-                /*if(machineNumbers.length != Integer.valueOf(number)){
+                if(machineNumbers.length != Integer.valueOf(number)){
                     msg.setResultCode(200);
                     msg.setReturnCode(501);
                     return msg;
-                }*/
+                }
                 machineNumberMap.put("machineNumber"+alreadyColorName[i],machineNumbers);
             }
         }

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

@@ -93,12 +93,12 @@
             </div>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">检测日期</span>
+            <span class="input-dic spanhidth">检测日期：</span>
             <input class="my-input-date" type="text" style="width: 76%;"  name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
+            <span class="input-dic" style="margin-top: 0">检测结果：</span>
             <label for="radio-3">
                 <input type="radio" id="radio-3" name="detectState" value="3" checked/>检测通过
             </label>
@@ -133,7 +133,7 @@
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否维修</span>
+            <span class="input-dic" style="margin-top: 0">是否维修：</span>
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>需要维修
             </label>
@@ -142,7 +142,7 @@
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否已转入</span>
+            <span class="input-dic" style="margin-top: 0">是否已转入：</span>
             <label for="radio-7">
                 <input type="radio" id="radio-7" name="detectRevolutionProduced" value="1" checked/>已转入维修
             </label>
@@ -152,10 +152,10 @@
         </div>
 
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
+            <span class="input-dic spanhidth">备注：</span>
             <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
         </div>
-        <div>
+        <div style="margin-left: 35%;">
            <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>

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

@@ -17,12 +17,13 @@
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
         .add-list>li{margin: 10px 0;}
-        .my-textarea{padding: 5px 10px;width: 80%;border:1px solid rgba(0,0,0,.1);}
+        .my-textarea{padding: 5px 10px;width: 70%;border:1px solid rgba(0,0,0,.1);}
         .my-btn-reset{padding: 10px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
         .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
         input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .spanWidth{width: 133px;float: left}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
@@ -31,7 +32,7 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
+            <span class="input-dic spanWidth" style="margin-top: 0">检测结果：</span>
             <label for="radio-3">
                 <input type="radio" id="radio-3" name="detectState" value="3" checked/>检测通过
             </label>
@@ -40,33 +41,33 @@
             </label>
         </div>
 
-        <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <div class="input-box" style="margin-left: 14.2%">
+            <span class="input-dic">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon"  class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification"  class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause"  class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectResults" id="detectResults"  class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectPoint" id="detectPoint"  class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
         </div>
-        <div class="input-box">
+        <div class="input-box" style="margin-left: 14.2%">
             <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis"  class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
         </div>
 
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否需要转入生产部门</span>
+            <span class="input-dic spanWidth" style="margin-top: 0">是否需要转入生产部门：</span>
             <label for="radio-5">
                 <input type="radio" id="radio-5" name="detectIsMaintenance" onclick="show()" value="1" checked/>需要转入生产部门
             </label>
@@ -75,30 +76,32 @@
             </label>
         </div>
         <div class="input-box" id="revolutionProducedId">
-            <span class="input-dic" style="margin-top: 0">立即转入生产部门</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
+            <span class="input-dic spanWidth" style="margin-top: 0">立即转入生产部门：</span>
+            <label for="radio-7" >
+                <input type="radio"  id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 17%;">
                 <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">QC检查状态</span>
+            <span class="input-dic spanWidth" style="margin-top: 0">QC检查状态：</span>
             <label for="radio-7">
                 <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
             </label>
-            <label for="radio-8" style="margin-left: 50px;">
+            <label for="radio-8" style="margin-left: 21.5%;">
                 <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
-        </div>
+            <span class="input-dic spanhidth spanWidth">备注：</span>
+            <div class="input-box">
+                <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+            </div>
+            </div>
         <div>
             <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
-           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+           <button type="button" style="margin-left: 35%;" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>

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

@@ -130,7 +130,7 @@
                         </#if>
                             <#if detect.detectRevolutionProduced == 1>
                                 <a style="text-decoration:none" href="javascript:;" title="转入生产"
-                                   onclick="update_info('转入生产','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','570','450');">
+                                   onclick="update_info('转入生产','${path}/admin/detect/to_detect_complete?detectId=${detect.detectId!''}&state=2','670','450');">
                                     <i class="Hui-iconfont">&#xe6e1;</i>
                                 </a>
                             </#if>
@@ -147,10 +147,14 @@
                                 <i class="Hui-iconfont">&#xe60c;</i>
                             </a>
                         </#if>
-                        <a style="text-decoration:none" href="javascript:;" title="查看仓储进度"
-                           onclick="add_remark('查看仓储进度','${path}/admin/detect/to_view_progress?signclosedId=${detect.signclosedId!''}','570','450');">
-                            <i class="Hui-iconfont">&#xe6cd;</i>
-                        </a>
+                        <#if detect.signclosedId??>
+                            <#if detect.detectState == 1>
+                                <a style="text-decoration:none" href="javascript:;" title="查看仓储进度"
+                                   onclick="add_remark('查看仓储进度','${path}/admin/detect/to_view_progress?signclosedId=${detect.signclosedId!''}','570','450');">
+                                    <i class="Hui-iconfont">&#xe6cd;</i>
+                                </a>
+                            </#if>
+                        </#if>
                     </td>
                 </tr>
                 </#list>

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

@@ -31,64 +31,48 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">检测结果</span>
-            <label for="radio-3">
-                <input type="radio" id="radio-3" name="detectState" value="3"
-                       <#if detectInfo.detectState == 3>checked</#if>
-                       />检测通过
-            </label>
-            <label for="radio-4" style="margin-left: 50px;">
-                <input type="radio" id="radio-4" name="detectState" value="4"
-                       <#if detectInfo.detectState == 4>checked</#if>
-                />检测未通过
-            </label>
+            <span class="input-dic" style="margin-top: 0">检测结果：</span>
+            <div style="margin-left: 15%">
+                <label for="radio-3">
+                    <input type="radio" id="radio-3" name="detectState" value="3"
+                           <#if detectInfo.detectState == 3>checked</#if>
+                           />检测通过
+                </label>
+                <label for="radio-4" style="margin-left: 50px;">
+                    <input type="radio" id="radio-4" name="detectState" value="4"
+                           <#if detectInfo.detectState == 4>checked</#if>
+                    />检测未通过
+                </label>
+            </div>
         </div>
 
         <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="input-dic" style="margin-left: 5%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectPhenomenon" id="detectPhenomenon"  class="my-textarea" placeholder="工厂检测现象">${detectInfo.detectPhenomenon!''}</textarea>
         </div>
         <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="input-dic" style="margin-left: 5%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectFailureClassification" id="detectFailureClassification"  class="my-textarea" placeholder="故障分类">${detectInfo.detectFailureClassification!''}</textarea>
         </div>
         <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="input-dic" style="margin-left: 5%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectFailureCause" id="detectFailureCause"  class="my-textarea" placeholder="故障原因">${detectInfo.detectFailureCause!''}</textarea>
         </div>
         <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="input-dic" style="margin-left: 5%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectResults" id="detectResults"  class="my-textarea" placeholder="判定结果">${detectInfo.detectResults!''}</textarea>
         </div>
         <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="input-dic" style="margin-left: 5%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectPoint" id="detectPoint"  class="my-textarea" placeholder="故障指向">${detectInfo.detectPoint!''}</textarea>
         </div>
         <div class="input-box">
-            <span class="input-dic ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+            <span class="input-dic" style="margin-left: 5%;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
             <textarea rows="3" cols="20" name="detectAnalysis" id="detectAnalysis"  class="my-textarea" placeholder="原因分析">${detectInfo.detectAnalysis!''}</textarea>
         </div>
 
-        <#--<div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否需要转入生产部门</span>
-            <label for="radio-5">
-                <input type="radio" id="radio-5" name="detectIsMaintenance" onclick="show()" value="1" checked/>需要转入生产部门
-            </label>
-            <label for="radio-6" style="margin-left: 50px;">
-                <input type="radio" id="radio-6" name="detectIsMaintenance" onclick="hide()" value="2"/>不需要转入生产部门
-            </label>
-        </div>
-        <div class="input-box" id="revolutionProducedId">
-            <span class="input-dic" style="margin-top: 0">立即转入生产部门</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
-            </label>
-        </div>-->
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">QC检查状态</span>
+            <span class="input-dic" style="margin-top: 0;margin-left: 0.5%;">QC检查状态：</span>
             <label for="radio-7">
                 <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
             </label>
@@ -97,12 +81,14 @@
             </label>
         </div>
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
-        </div>
+            <span class="input-dic spanhidth">备注：</span>
+            <div  style="margin-left: 15.5%;">
+                <textarea rows="3" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+            </div>
+            </div>
         <div>
             <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
-           <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
+           <button type="button" style="margin-left: 35%" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </article>

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

@@ -111,7 +111,9 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg('修改成功',{icon: 1,time:1000},function () {
-                        location.replace(location.href);
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index)
                     });
                 } else {
                     layer.msg('修改失败',{icon: 5,time:1000});

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

@@ -94,7 +94,7 @@
                         parent.layer.close(index)
                     });
                 } else {
-                    layer.msg('催促失败',{icon: 5,time:1000});
+                    layer.msg('催促失败,请检查是否是仓储转入',{icon: 5,time:1000});
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/add_maintenance.ftl

@@ -47,7 +47,7 @@
                         <#list productList as product>
                         <tr>
                             <td>
-                                <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                                <input type="radio" onclick="emptyingNumber();" id="radio-1${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
                             </td>
                             <td>
                                 <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/maintenance_list.ftl

@@ -27,7 +27,7 @@
     <div class="text-c">
         <form name="form1" action="${path}/admin/maintenance/select_maintenance_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_maintenance('添加维修记录','${path}/admin/maintenance/to_add_maintenance','670','450');">新建维修工单</button>
-            <input class="my-input" style="width: 70px;" type="text" name="customerIdDescribe" value="${customerIdDescribe!}" placeholder="客诉描述"/>
+            <input class="my-input" style="width: 100px;margin-top: -0.5%;" type="text" name="customerIdDescribe" value="${customerIdDescribe!}" placeholder="客诉描述"/>
             <select class="my-select" name="maintenanceResults" style="height: 30px;width: 150px">
                 <option value ="">QC检测结果</option>
                 <option value ="1" <#if maintenanceResults??><#if maintenanceResults == 1>selected="selected"</#if></#if>>通过</option>
@@ -56,7 +56,7 @@
                 <th width="100">是否入库</th>
                 <th width="150">备注</th>
                 <th width="150">返修日期</th>
-                <th width="50">操作</th>
+                <th width="80">操作</th>
             </tr>
             </thead>
             <tbody id="listid">

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

@@ -61,7 +61,8 @@
         <form action="" method="post" class="form form-horizontal" id="form-signclosed-add">
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收类型：</label>
-				<div class="radio-box">
+                <div class="formControls col-7 col-sm-7  skin-minimal" style="margin-left: -2.8%;">
+				    <div class="radio-box">
                         <input type="radio" id="tel-1" name="signclosedType" value="1" datatype="*"  checked nullmsg="请选择签收类型！">
                         <label for="tel-1">客诉寄回</label>
                     </div>
@@ -74,52 +75,8 @@
                         <label for="tel-3">其他</label>
                         <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="选择其他时有值" id="signclosedTypeName" name="signclosedTypeName">
                     </div>
-
-            </div>
-            <#--<div class="row cl">
-                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回产品：</label>
-                <div class="formControls col-8 col-sm-8 text-c" id="produceSelect">
-                    <table class="table table-border table-bg table-bordered">
-                        <thead>
-                        <tr class="text-c">
-                            <th style="text-align: center;" width="100">产品名称</th>
-                            <th style="text-align: center;" width="100">产品颜色</th>
-                            <th style="text-align: center;" width="100">产品配件</th>
-                        </tr>
-                        </thead>
-                        <tbody id="addProduct">
-                        <#if (productList?size > 0)>
-                            <#list productList as product>
-                            <tr >
-                                <td>${product.productName!''}</td>
-                                <td>
-                                    <#if (product.colorList?size > 0)>
-                                        <#list product.colorList as colorList>
-                                            <input type="checkbox" id="" value="${colorList.colorId!''}" name="colorName" datatype="*">${colorList.colorName!''}
-                                            <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="colorId${colorList.colorId!''}" name="colorId${colorList.colorId!''}"><br>
-                                        </#list>
-                                    <#else>
-                                        暂无颜色，请先添加产品颜色
-                                    </#if>
-                                </td>
-                                <td>
-                                    <#if (product.fittingsList?size > 0)>
-                                        <#list product.fittingsList as fittingsList>
-                                        <input type="checkbox" id="" value="${fittingsList.fittingsId!''}" name="fittingsName" datatype="*">${fittingsList.fittingsName!''}
-                                        <input type="text" style="width: 50px;margin-left: 10px;" class="input-text" value="" placeholder="数量" id="fittingsId${fittingsList.fittingsId!''}" name="fittingsId${fittingsList.fittingsId!''}"><br>
-                                        </#list>
-                                    <#else>
-                                        暂无配件，请先添加配件
-                                    </#if>
-                                </td>
-
-                            </tr>
-                            </#list>
-                        </#if>
-                        </tbody>
-                    </table>
                 </div>
-            </div>-->
+            </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回物流：</label>
                 <div class="formControls col-3 col-sm-3 skin-minimal">
@@ -150,8 +107,8 @@
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件人信息：</label>
                 <div class="formControls col-4 col-sm-4 skin-minimal">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                    <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
 
@@ -203,7 +160,7 @@
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少配件：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
                         <label for="tel-4">缺少配件</label>
@@ -216,14 +173,14 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -0.8%;">
                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否品检：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-6" name="signclosedIsQuality" value="1" datatype="*" checked  >
                         <label for="tel-6">需要品检</label>
@@ -236,7 +193,7 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否已转入：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-8" name="signclosedIsInto" value="1" datatype="*" checked  >
                         <label for="tel-8">已转入品检</label>
@@ -249,7 +206,7 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否已经签收：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-10" name="signclosedState" onclick="show();" value="1" datatype="*" checked  >
                         <label for="tel-8">已签收</label>
@@ -262,7 +219,7 @@
             </div>
             <div class="row cl" id="objectsStateId">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>物件状态：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.8%;">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
                         <label for="tel-8">正常签收</label>
@@ -463,6 +420,11 @@
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
         }
+        var signclosed_date = $("#signclosed_date").val();
+        if( signclosed_date == null || signclosed_date == "" ){
+            layer.msg('请选择签收日期',{icon: 5,time:1000});
+            return;
+        }
 
         var signclosedDesc = $("#signclosedDesc").val();
         if( signclosedDesc != null || signclosedDesc == "" ){
@@ -481,11 +443,14 @@
                 if (data.returnCode == 200) {
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
                         location.replace(location.href);
+                        window.location.href= "${path}/admin/signclosed/select_signclosed_list;
                     });
                 } else if(data.returnCode == 501) {
                     layer.msg('机器编号未填写',{icon: 5,time:1000});
                 } else if(data.returnCode == 502) {
                     layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
+                } else if(data.returnCode == 503) {
+                    layer.msg('请输入产品数量',{icon: 5,time:1000});
                 }else{
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }

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

@@ -60,26 +60,28 @@
     <div class="pd-20 cl">
         <form action="" method="post" class="form form-horizontal" id="form-signclosed-add">
             <div class="row cl">
-                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄送信息：</label>
-                <#if (signclosedList?size > 0)>
-                    <#list signclosedList as signclosed>
-                        <#if signclosed.signclosedProductType == 1>
-                            ${signclosed.productName!''}-${signclosed.colorName!''}*${signclosed.productNum!''}台
-                        <#else>
-                            ${signclosed.productName!''}*${signclosed.productNum!''}件
-                        </#if>
-                    </#list>
-                </#if>
+                <label class="form-label col-3 col-sm-3">寄送信息：</label>
+                <div class="formControls col-4 col-sm-4">
+                    <#if (signclosedList?size > 0)>
+                        <#list signclosedList as signclosed>
+                            <#if signclosed.signclosedProductType == 1>
+                                ${signclosed.productName!''}-${signclosed.colorName!''}*${signclosed.productNum!''}台
+                            <#else>
+                                ${signclosed.productName!''}*${signclosed.productNum!''}件
+                            </#if>
+                        </#list>
+                    </#if>
+                </div>
             </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>
                <#if ifcomplaintSignclosedInfo?? >${complaintSignclosedInfo.signclosedCustomerDesc!''}</#if>
             </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-8 col-sm-8 text-c" id="produceSelect">
                     <div>
-                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 826px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
+                        <input type="text" oninput="selectProduct();" onpropertychange="selectProduct();" class="input-text" style="width: 717px;" id="selectProcuct" name="selectProcuct" placeholder="请输入产品名称搜索">
                     </div>
                     <table class="table table-border table-bg table-bordered">
                         <thead>
@@ -96,7 +98,7 @@
                                 <#if signclosed.signclosedProductType == 1>
                                 <td>${signclosed.productName!''}</td>
                                 <td><table border="0">
-                                    <td id="tdColorId${signclosed.signclosedProductColor!''}"><input type="checkbox" value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
+                                    <td id="tdColorId${signclosed.signclosedProductColor!''}"><input type="checkbox" checked value="${signclosed.signclosedProductColor!''}" name="alreadyColorName" datatype="*">${signclosed.colorName!''}
                                     <input type="text" style="width: 50px;margin-left: 10px;" value="${signclosed.productNum!''}" class="input-text" oninput="generateInput( ${signclosed.signclosedProductColor!''})" onpropertychange="generateInput(${signclosed.signclosedProductColor!''})"  placeholder="数量" id="alreadyColorId${signclosed.signclosedProductColor!''}" name="alreadyColorId${signclosed.signclosedProductColor!''}"><br>
                                         <#list 1..signclosed.productNum as t>
                                             <input type="text" class="input-text" style="width: 110px;" placeholder="机器编号" name="machineNumber${signclosed.signclosedProductColor!''}" >
@@ -125,8 +127,8 @@
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件人信息：</label>
-                <div class="formControls col-4 col-sm-4 skin-minimal">
-                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+                <div class="formControls col-4 col-sm-4" style="margin-left: -0.9%">
+                    <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName" onkeyup="value=value.replace(/[A-Za-z\d]/g,'')" onbeforepaste="clipboardData.setData('text',clipboardData.getData('text').replace(/[A-Za-z\d]/g,''))">
                     <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
@@ -152,14 +154,14 @@
             </div>
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收日期：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -0.9%">
                     <input type="text" style="width: 150px;margin-left: 10px;" class="input-text my-input-date" placeholder="签收日期" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" id="signclosed_date" name="signclosed_date" readonly="readonly"/>
                 </div>
             </div>
 
             <div class="row cl">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>是否少配件：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.5%">
                     <div class="radio-box">
                         <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
                         <label for="tel-4">缺少配件</label>
@@ -173,7 +175,7 @@
 
             <div class="row cl" id="objectsStateId">
                 <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>物件状态：</label>
-                <div class="formControls col-5 col-sm-5 skin-minimal">
+                <div class="formControls col-5 col-sm-5 skin-minimal" style="margin-left: -2.5%">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
                         <label for="tel-8">正常签收</label>
@@ -333,6 +335,11 @@
             layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
             return;
         }
+        /*var reg=/^[\u2E80-\u9FFF]+$/;
+        if(!reg.text(signclosedSendName)){
+            layer.msg('寄件人姓名格式错误',{icon: 5,time:1000});
+            return;
+        }*/
         if( signclosedSendName.length > 10 ){
             layer.msg('寄件人姓名长度不得大于10个字符',{icon: 5,time:1000});
             return;
@@ -351,7 +358,11 @@
             layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
             return;
         }
-
+        var signclosed_date = $("#signclosed_date").val();
+        if( signclosed_date == null || signclosed_date == "" ){
+            layer.msg('签收日期不能为空',{icon: 5,time:1000});
+            return;
+        }
         var signclosedDesc = $("#signclosedDesc").val();
         if( signclosedDesc != null || signclosedDesc == "" ){
             if( signclosedDesc.length > 300 ){
@@ -368,7 +379,7 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
-                        location.replace(location.href);
+                        window.location.href= "${path}/admin/signclosed/select_signclosed_list";
                     });
                 } else if(data.returnCode == 501) {
                     layer.msg('机器编号未填写',{icon: 5,time:1000});

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

@@ -68,7 +68,6 @@
                         <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
                         <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
                         <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
-                       ,
                         ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
                         </#if>
                     </span>