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

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

@@ -37,11 +37,11 @@
             <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="detectState" value="3" checked/>
-                    <label for="tel-3">检测通过</label>
+                    <label for="radio-3">检测通过</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-4" name="detectState" value="4"/>
-                    <label for="tel-4">检测未通过</label>
+                    <label for="radio-4">检测未通过</label>
                 </div>
             </div>
         </div>
@@ -93,10 +93,12 @@
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否转入生产：</label>
             <div class=" col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
                 <div class="radio-box">
-                    <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>需要转入
+                    <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>
+                    <label for="radio-5">需要转入</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>不需要转入
+                    <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>
+                    <label for="radio-6">不需要转入</label>
                 </div>
             </div>
         </div>
@@ -104,10 +106,12 @@
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">立即转入生产：</label>
             <div class="col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
                 <div class="radio-box">
-                    <input type="radio"  id="radio-7" name="detectRevolutionProduced" value="2" checked/>立即转入
+                    <input type="radio"  id="radio-7" name="detectRevolutionProduced" value="2" checked/>
+                    <label for="radio-7">立即转入</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>以后转入
+                    <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>
+                    <label for="radio-8">以后转入</label>
                 </div>
             </div>
         </div>
@@ -115,10 +119,12 @@
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">QC检查状态：</label>
             <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;">
                 <div class="radio-box">
-                    <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>通过
+                    <input type="radio" id="radio-9" name="maintenanceResults" value="1" checked/>
+                    <label for="radio-9">通过</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>不通过
+                    <input type="radio" id="radio-10" name="maintenanceResults" value="2"/>
+                    <label for="radio-10">不通过</label>
                 </div>
             </div>
         </div>

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

@@ -37,12 +37,12 @@
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="detectState" value="3"
                            <#if detectInfo.detectState == 3>checked</#if>
-                           />检测通过
+                    /><label for="radio-3">检测通过</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-4" name="detectState" value="4"
                            <#if detectInfo.detectState == 4>checked</#if>
-                    />检测未通过
+                    /><label for="radio-4">检测未通过</label>
                 </div>
             </div>
         </div>
@@ -71,11 +71,11 @@
             <div class="col-xs-7 col-sm-7 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-9" name="maintenanceResults" value="1" <#if detectInfo.maintenanceResults??><#if detectInfo.maintenanceResults == 1>checked</#if></#if>/>
-                    <label for="tel-7">通过</label>
+                    <label for="radio-9">通过</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-10" name="maintenanceResults" value="2" <#if detectInfo.maintenanceResults??><#if detectInfo.maintenanceResults == 2>checked</#if></#if>/>
-                    <label for="tel-7">不通过</label>
+                    <label for="radio-10">不通过</label>
                 </div>
             </div>
         </div>

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

@@ -63,11 +63,11 @@
             <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-1" name="detectIsMaintenance" onclick="show();" value="1" checked/>
-                    <label for="tel-1">需要转入生产</label>
+                    <label for="radio-1">需要转入生产</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-2" name="detectIsMaintenance" onclick="hide();" value="2"/>
-                    <label for="tel-4">不需要转入生产</label>
+                    <label for="radio-2">不需要转入生产</label>
                 </div>
             </div>
         </div>
@@ -79,13 +79,13 @@
                     <input type="radio" id="radio-3" name="detectRevolutionProduced" value="2"
                     <#if state == '2'>
                            checked
-                    </#if>/>已转入生产
+                    </#if>/><label for="radio-3">已转入生产</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-4" name="detectRevolutionProduced" value="1"
                     <#if state == '1'>
                            checked
-                    </#if>/>未转入生产
+                    </#if>/><label for="radio-4">未转入生产</label>
                 </div>
             </div>
         </div>

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

@@ -132,7 +132,7 @@
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">备注：</label>
             <div class="formControls col-xs-9 col-sm-9" style="padding-left: 3px;">
                 <div class="radio-box">
-                    <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！"></textarea>
+                    <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注维修的内容！"></textarea>
                 </div>
             </div>
         </div>

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

@@ -17,10 +17,9 @@
         .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: 65%;border:1px solid rgba(0,0,0,.1);margin-left: 12.5%;}
         .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;}
         .huanhang{ float:left}
@@ -32,121 +31,111 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <label class="form-label col-2 col-sm-2 huanhang">维修产品：</label>
-            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-bottom: 15px;">
-
-                <table class="table table-border table-bg table-bordered" style="width: 420px;">
-                    <thead>
-                    <tr class="text-c">
-                        <th style="text-align: center;" width="100">产品名称</th>
-                        <th style="text-align: center;" width="50">产品颜色</th>
-                        <th style="text-align: center;" width="50">产品编号</th>
-                    </tr>
-                    </thead>
-                    <tbody id="addProduct">
-                    <#if (productList?size > 0)>
-                        <#list productList as product>
-                        <tr>
-                            <td>
-                                <input type="radio" onclick="emptyingNumber();" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product.productId == maintenanceInfo.productId>checked</#if>/>${product.productName!''}
-                            </td>
-                            <td>
-                                <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%;" class="my-select">
-                                    <#if (product.colorList?size > 0)>
-                                    <#list product.colorList as colorList>
-                                        <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
-                                    </#list>
-                                <#else>
-                                    <option value ="">暂无颜色</option>
-                                </#if>
-                                </select>
-                            </td>
-                            <td>
-                                <input class="input-text" <#if product.productId == maintenanceInfo.productId>value="${maintenanceInfo.maintenanceEquipmentNumber!''}"</#if> type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 100%;" placeholder="机器编号" /><br>
-                            </td>
-
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">维修产品：</label>
+            <div class="col-9 col-sm-9 text-c">
+                <div class="radio-box"  style="margin-right: -40%;">
+                    <table class="table table-border table-bg table-bordered" style="width: 420px;">
+                        <thead>
+                        <tr class="text-c">
+                            <th style="text-align: center;" width="100">产品名称</th>
+                            <th style="text-align: center;" width="50">产品颜色</th>
+                            <th style="text-align: center;" width="50">产品编号</th>
                         </tr>
-                        </#list>
-                    </#if>
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody id="addProduct">
+                        <#if (productList?size > 0)>
+                            <#list productList as product>
+                            <tr>
+                                <td>
+                                    <div class="col-xs-12 col-sm-12 skin-minimal">
+                                        <input type="radio" id="radio-X${product.productId!''}" name="productId" value="${product.productId!''}" <#if product.productId == maintenanceInfo.productId>checked</#if>/>
+                                        <label for="radio-X${product.productId!''}">&nbsp;&nbsp;${product.productName!''}</label>
+                                    </div>
+                                </td>
+                                <td>
+                                    <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:90%" class="my-select">
+                                        <#if (product.colorList?size > 0)>
+                                            <#list product.colorList as colorList>
+                                                <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
+                                            </#list>
+                                        <#else>
+                                            <option value ="">暂无颜色</option>
+                                        </#if>
+                                    </select>
+                                </td>
+                                <td>
+                                    <input class="input-text" type="text" <#if product.productId == maintenanceInfo.productId>value="${maintenanceInfo.maintenanceEquipmentNumber!''}"</#if> id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 100%;" placeholder="机器编号" /><br>
+                                </td>
 
-            <#--<#if (productList?size > 0)>
-                <#list productList as product>
-                    <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product.productId == maintenanceInfo.productId>checked</#if>/>${product.productName!''}
-                    <select name="colorId${product.productId!''}" id="colorId${product.productId!''}" style="width:60px" class="select">
-                        <#if (product.colorList?size > 0)>
-                            <#list product.colorList as colorList>
-                                <option value ="${colorList.colorId!''}">${colorList.colorName!''}</option>
+                            </tr>
                             </#list>
-                        <#else>
-                            <option value ="">暂无颜色</option>
                         </#if>
-                    </select>
-                    <input class="input-text" type="text" id="maintenanceEquipmentNumber${product.productId!''}" name="maintenanceEquipmentNumber${product.productId!''}" style="width: 20%;" placeholder="机器编号" /><br>
-                </#list>
-            </#if>
--->
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </div>
-
-    <#--<div class="input-box">
-        <span class="input-dic" style="margin-top: 0">&nbsp;</span>
-
-        <label for="radio-2" style="margin-left: 50px;">
-            <input type="radio" id="radio-2" name="detectProductType" value="2"/>配件
-            <select name="productId2" class="select" style="width:100px">
-            <#if (listFittings ?size > 0)>
-                <#list listFittings as list>
-                    <option value ="${list.fittingsId}">${list.fittingsName}</option>
-                </#list>
-            <#else >
-                <option value ="">暂无配件，请先添加配件</option>
-            </#if>
-            </select>
-        </label>
-    </div>-->
-
-        <div class="input-box"><span class="input-dic spanhidth">维修日期</span><input class="my-input-date" value="${(maintenanceInfo.maintenanceContentDate)?string("yyyy-MM-dd")!''}" type="text" style="width: 76%;"  name="maintenanceContent_Date" id="maintenanceContentDate" 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>
-            <label for="radio-3" style="margin-left: 2.3%;">
-                <input type="radio" id="radio-3" name="maintenanceState" value="1"  <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>正在维修
-            </label>
-            <label for="radio-4" style="margin-left: 9%;">
-                <input type="radio" id="radio-4" name="maintenanceState" value="2"  <#if maintenanceInfo.maintenanceState == 2>checked</#if>/>已完成
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修日期：</label>
+            <div class="formControls col-7 col-sm-7 text-c huanhang" style="margin-left: -4.5%;">
+                <input class="my-input-date" type="text" value="${(maintenanceInfo.maintenanceContentDate)?string("yyyy-MM-dd")!''}"  name="maintenanceContent_Date" id="maintenanceContentDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择维修日期" readonly="readonly"/>
+            </div>
+        </div>
 
-            </label>
+        <div class="input-box">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">维修结果：</label>
+            <div class="col-8 col-sm-8 text-c skin-minimal" >
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="maintenanceState" value="1" <#if maintenanceInfo.maintenanceState == 1>checked</#if>/>
+                    <label for="radio-3">正在维修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="maintenanceState" value="2" <#if maintenanceInfo.maintenanceState == 2>checked</#if>/>
+                    <label for="radio-4">已完成</label>
+                </div>
+            </div>
         </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="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>不可返修
-            </label>
-            <label for="radio-6" style="margin-left: 9.3%;">
-                <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2" <#if maintenanceInfo.maintenanceIsRepair == 2>checked</#if> />可返修
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可返修：</label>
+            <div class=" col-8 col-sm-8 text-c skin-minimal">
+                <div class="radio-box">
+                    <input type="radio" id="radio-5" name="maintenanceIsRepair" value="1" <#if maintenanceInfo.maintenanceIsRepair == 1>checked</#if>/>
+                    <label for="radio-5">不可返修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2" <#if maintenanceInfo.maintenanceIsRepair == 2>checked</#if>/>
+                    <label for="radio-6">可返修</label>
+                </div>
+            </div>
         </div>
         <div class="input-box">
-            <span class="input-dic" style="margin-top: 0">是否可入库</span>
-            <label for="radio-7">
-                <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>已入库
-            </label>
-            <label for="radio-8" style="margin-left: 11.6%;">
-                <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1" <#if maintenanceInfo.maintenanceIsWarehousing == 1>checked</#if> />未入库
-            </label>
-            <label for="radio-9" style="margin-left: 50px;">
-                <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3" <#if maintenanceInfo.maintenanceIsWarehousing == 3>checked</#if> />无法入库
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">是否可入库：</label>
+            <div class="formControls col-10 col-sm-10 text-c skin-minimal">
+                <div class="radio-box">
+                    <input type="radio" id="radio-7" name="maintenanceIsWarehousing" value="2" <#if maintenanceInfo.maintenanceIsWarehousing == 2>checked</#if>/>
+                    <label for="radio-7">已入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1" <#if maintenanceInfo.maintenanceIsWarehousing == 1>checked</#if>/>
+                    <label for="radio-8">未入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3" <#if maintenanceInfo.maintenanceIsWarehousing == 3>checked</#if>/>
+                    <label for="radio-9">无法入库</label>
+                </div>
+            </div>
         </div>
 
         <div class="input-box">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="3" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${maintenanceInfo.maintenanceDesc!''}</textarea>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">备注：</label>
+            <div class="formControls col-xs-9 col-sm-9">
+                <div class="radio-box">
+                    <textarea rows="3" style="width: 200%;margin-left: -15%;margin-top: 5%;" cols="20" name="maintenanceDesc" id="maintenanceDesc" class="my-textarea" placeholder="请详细备注维修的内容！">${maintenanceInfo.maintenanceDesc!''}</textarea>
+                </div>
+            </div>
         </div>
-        <div>
+        <div style="margin-left: 35%;">
             <input type="hidden" value="${maintenanceInfo.maintenanceId!''}" name="maintenanceId" id="maintenanceId">
             <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
@@ -154,11 +143,20 @@
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
-    function emptyingNumber() {
-        $("input[name='productId']").each(function () {
-            $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+    /*初始化单选框样式*/
+    $(function(){
+        $('input[name="productId"]').on('ifChecked', function(event){
+            $("input[name='productId']").each(function () {
+                $("#maintenanceEquipmentNumber"+$(this).val()).val("");
+            });
         });
-    }
+
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
 
 
     function  add() {

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

@@ -61,7 +61,7 @@
         <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="formControls col-7 col-sm-7  skin-minimal" style="margin-left: -2.8%;">
+                <div class="formControls col-7 col-sm-7  skin-minimal">
 				    <div class="radio-box">
                         <input type="radio" id="tel-1" name="signclosedType" value="1" datatype="*"  checked nullmsg="请选择签收类型！">
                         <label for="tel-1">客诉寄回</label>
@@ -160,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" style="margin-left: -2.8%;">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
                         <label for="tel-4">缺少配件</label>
@@ -173,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" style="margin-left: -0.8%;">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                    <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" style="margin-left: -2.8%;">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-6" name="signclosedIsQuality" value="1" datatype="*" checked  >
                         <label for="tel-6">需要品检</label>
@@ -193,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" style="margin-left: -2.8%;">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-8" name="signclosedIsInto" value="1" datatype="*" checked  >
                         <label for="tel-8">已转入品检</label>
@@ -206,27 +206,27 @@
             </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" style="margin-left: -2.8%;">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-10" name="signclosedState" onclick="show();" value="1" datatype="*" checked  >
-                        <label for="tel-8">已签收</label>
+                        <label for="tel-10">已签收</label>
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-11" name="signclosedState" onclick="hide();" value="2" datatype="*">
-                        <label for="tel-9">未签收</label>
+                        <label for="tel-11">未签收</label>
                     </div>
                 </div>
             </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" style="margin-left: -2.8%;">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
-                        <label for="tel-8">正常签收</label>
+                        <label for="tel-12">正常签收</label>
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-13" name="signclosedObjectsState" value="2" datatype="*">
-                        <label for="tel-9">物件不对</label>
+                        <label for="tel-13">物件不对</label>
                     </div>
                 </div>
             </div>
@@ -254,6 +254,15 @@
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
 <script type="text/javascript">
+
+    /*初始化单选框样式*/
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
     function hide() {
         $("#objectsStateId").hide();
     }

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

@@ -162,7 +162,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" style="margin-left: -2.5%">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-4" name="signclosedIsFittings" value="1" datatype="*" checked  >
                         <label for="tel-4">缺少配件</label>
@@ -176,7 +176,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" style="margin-left: -2.5%">
+                <div class="formControls col-5 col-sm-5 skin-minimal">
                     <div class="radio-box">
                         <input type="radio" id="tel-12" name="signclosedObjectsState" value="1" datatype="*" checked  >
                         <label for="tel-12">正常签收</label>
@@ -212,6 +212,16 @@
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
 <script type="text/javascript">
+
+    /*初始化单选框样式*/
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
+
     //动态回显产品js state
     function selectProduct(){
         var productName = $("#selectProcuct").val();