فهرست منبع

生成二维码

liujiankang 7 سال پیش
والد
کامیت
bd95fabcad

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

@@ -49,7 +49,8 @@
 
                         <td>
                             <div class="formControls col-xs-12 col-sm-12 skin-minimal">
-                            <input type="radio"  id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>&nbsp;&nbsp;${product.productName!''}
+                                <input type="radio"  id="radio-1${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>
+                                <label for="radio-1${product.productId!''}">&nbsp;&nbsp;${product.productName!''}</label>
                             </div>
                         </td>
                         <td>
@@ -86,11 +87,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>
@@ -118,11 +119,11 @@
             <div class="formControls col-xs-7 col-sm-7 skin-minimal">
                 <div class="radio-box">
                     <input type="radio" id="radio-5" name="detectIsMaintenance" value="1" checked/>
-                    <label for="tel-5">需要维修</label>
+                    <label for="radio-5">需要维修</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="radio-6" name="detectIsMaintenance" value="2"/>
-                    <label for="tel-6">不需要维修</label>
+                    <label for="radio-6">不需要维修</label>
                 </div>
             </div>
         </div>
@@ -131,11 +132,11 @@
             <div class="formControls 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/>
-                    <label for="tel-7">已转入维修</label>
+                    <label for="radio-7">已转入维修</label>
                 </div>
                  <div class="radio-box" style="margin-left: -4.1%;">
                     <input type="radio" id="radio-8" name="detectRevolutionProduced" value="1"/>
-                     <label for="tel-8">未转入维修</label>
+                     <label for="radio-8">未转入维修</label>
                 </div>
             </div>
         </div>
@@ -157,17 +158,18 @@
 <script type="text/javascript">
     /*初始化单选框样式*/
         $(function(){
+            $('.skin-minimal input').iCheck({
+                checkboxClass: 'icheckbox-blue',
+                radioClass: 'iradio-blue',
+                increaseArea: '20%'
+            });
             $('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%'
-            });
+
         });
 
 

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

@@ -7,14 +7,14 @@
     <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
     <meta http-equiv="Cache-Control" content="no-siteapp" />
 <#include "/base/add_base.ftl">
-    <title>修改备注 - H-ui.filter v2.4</title>
+    <title>修改转入信息</title>
     <style>
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
         .my-input{padding: 8px 5px;width: 80%;border:1px solid rgba(0,0,0,.1);}
         .my-input-date{padding: 8px 10px;border:1px solid rgba(0,0,0,.1);width: 80%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 50%;}
         .input-box{margin: 18px 0;}
-        .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
+        .input-dic{float: left;margin:5px 10px 0 0;font-size: 14px;}
         .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);}
@@ -23,6 +23,7 @@
         .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(/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(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .huanhang{ float:left}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0,是一款由国人开发的轻量级扁平化网站后台模板,完全免费开源的网站后台管理系统模版,适合中小型CMS后台系统。">
@@ -32,18 +33,22 @@
     <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-7">
-                <#if detectInfo.detectIsMaintenance == 1>
-                    需要转入生产部门
-                </#if>
-                <#if detectInfo.detectIsMaintenance == 2>
-                    不需要转入生产部门
-                </#if>
-            </label>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">当前状态为:</label>
+            <div class="formControls col-xs-7 col-sm-7 skin-minimal" style="margin: 10px 0px;margin-left: -30px;">
+                <div class="radio-box">
+                    <label for="tel-1">
+                        <#if detectInfo.detectIsMaintenance == 1>
+                            需要转入生产部门
+                        </#if>
+                        <#if detectInfo.detectIsMaintenance == 2>
+                            不需要转入生产部门
+                        </#if>
+                    </label>
+                </div>
+            </div>
         </div>
 
-        <div class="input-box">
+        <#--<div class="input-box">
             <span class="input-dic" style="margin-top: 0">转入生产部门</span>
             <label for="radio-7">
                 <input type="radio" id="radio-1" name="detectIsMaintenance" onclick="show();" value="1" checked/>需要转入生产部门
@@ -52,29 +57,52 @@
                 <input type="radio" id="radio-2" 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-3" name="detectRevolutionProduced" value="2"
-                <#if state == '2'>
-                       checked
-                </#if>/>已转入生产部门
-            </label>
-            <label for="radio-8" style="margin-left: 50px;">
-                <input type="radio" id="radio-4" name="detectRevolutionProduced" value="1"
-                <#if state == '1'>
-                       checked
-                </#if>/>未转入生产部门
-            </label>
+-->
+        <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-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>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-2" name="detectIsMaintenance" onclick="hide();" value="2"/>
+                    <label for="tel-4">不需要转入生产</label>
+                </div>
+            </div>
         </div>
 
-        <div class="input-box"   style="text-align:center;">
-            <span class="input-dic spanhidth">备注</span>
-            <textarea rows="5" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容,便于以后复查。如果转入生产,则生产部门同事可查看!">${detectInfo.detectDesc!''}</textarea>
-
+        <div class="input-box" id="revolutionProducedId">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">已转入生产:</label>
+            <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="detectRevolutionProduced" value="2"
+                    <#if state == '2'>
+                           checked
+                    </#if>/>已转入生产
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="detectRevolutionProduced" value="1"
+                    <#if state == '1'>
+                           checked
+                    </#if>/>未转入生产
+                </div>
+            </div>
+        </div>
+        <div class="input-box" >
+            <label class="form-label col-3 col-sm-3 huanhang"  style="text-align: right;">备注:</label>
+            <div class="formControls col-xs-9 col-sm-9 huanhang">
+                <div class="radio-box">
+                    <textarea rows="3" style="width: 180%;margin-left: -15%;margin-top: 5%;" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容,便于以后复查。如果转入生产,则生产部门同事可查看!"></textarea>
+                </div>
+            </div>
         </div>
         <div style="text-align:center;">
-            <span>如果转入生产,则生产部门同事可查看!</span>
+            <div class="formControls col-xs-9 col-sm-9">
+                <div class="radio-box">
+                    <span>如果转入生产,则生产部门同事可查看!</span>
+                </div>
+            </div>
         </div>
         <div style="text-align:center;">
 
@@ -86,6 +114,21 @@
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
 
+    /*初始化单选框样式*/
+    $(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 hide() {
         $("#revolutionProducedId").hide();
     }

+ 75 - 76
watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/add_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,8 +31,9 @@
 <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;">
+            <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">
@@ -47,7 +47,10 @@
                         <#list productList as product>
                         <tr>
                             <td>
-                                <input type="radio" onclick="emptyingNumber();" id="radio-1${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>checked</#if>/>${product.productName!''}
+                                <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_index == 0>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">
@@ -69,101 +72,97 @@
                     </#if>
                     </tbody>
                 </table>
-
-
-
-            <#--<#if (productList?size > 0)>
-                <#list productList as product>
-                    <input type="radio" id="radio-${product.productId!''}" name="productId" value="${product.productId!''}" <#if product_index == 0>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>
-                            </#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>-->
-
+                </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" 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" checked/>正在维修
-            </label>
-            <label for="radio-4" style="margin-left: 9%;">
-                <input type="radio" id="radio-4" name="maintenanceState" value="2"/>已完成
+            <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"  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" checked/>
+                    <label for="radio-3">正在维修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="maintenanceState" value="2"/>
+                    <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" checked/>不可返修
-            </label>
-            <label for="radio-6" style="margin-left: 9.3%;">
-                <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2"/>可返修
-            </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" checked/>
+                    <label for="radio-5">不可返修</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-6" name="maintenanceIsRepair" value="2"/>
+                    <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" checked/>已入库
-            </label>
-            <label for="radio-8" style="margin-left: 11.6%;">
-                <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1"/>未入库
-            </label>
-            <label for="radio-9" style="margin-left: 50px;">
-                <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3"/>无法入库
-            </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" checked/>
+                    <label for="radio-7">已入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-8" name="maintenanceIsWarehousing" value="1"/>
+                    <label for="radio-8">未入库</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-9" name="maintenanceIsWarehousing" value="3"/>
+                    <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="请详细备注签收的内容,便于以后复查。如果转入生产,则生产部门同事可查看!"></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="请详细备注签收的内容,便于以后复查。如果转入生产,则生产部门同事可查看!"></textarea>
+                </div>
+            </div>
         </div>
-        <div>
+        <div style="margin-left: 35%;">
             <button type="button" class="my-btn-submit" onclick="add();">确认提交</button>
         </div>
     </form>
 </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() {
         var maintenanceContentDate = $("#maintenanceContentDate").val();
         if( maintenanceContentDate == null || maintenanceContentDate == "" ){
-            layer.msg('请选择检测日期',{icon: 5,time:1000});
+            layer.msg('请选择维修日期',{icon: 5,time:1000});
             return;
         }
 

+ 57 - 30
watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/complete_reorder.ftl

@@ -32,54 +32,81 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box"   style="text-align:center;">
-            <span class="input-dic spanhidth" style=" margin-top: 10px;">机器编码</span>
-            <input class="my-input" style="width: 80%;" value="${maintenanceInfo.maintenanceEquipmentNumber!''}" type="text" id="maintenanceEquipmentNumber" name="maintenanceEquipmentNumber" placeholder="请输入机器编码"/>
-        </div>
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;">机器编码:</label>
+            <div class="col-9 col-sm-9 text-c skin-minimal" >
+                <input class="my-input" style="width: 60%;" value="${maintenanceInfo.maintenanceEquipmentNumber!''}" type="text" id="maintenanceEquipmentNumber" name="maintenanceEquipmentNumber" placeholder="请输入机器编码"/>
+            </div>
+            </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>
+            <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%;">
-                <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="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">
             <textarea rows="3" cols="20" name="maintenanceAnalysis" id="maintenanceAnalysis" class="my-textarea" placeholder="请详细描述维修记录">${maintenanceInfo.maintenanceAnalysis!''}</textarea>
         </div>
         <div  style="text-align:center; width:100%;height:100%;margin:0px; " >
-            <input type="hidden" value="${maintenanceInfo.maintenanceId!''}" name="maintenanceId" id="maintenanceId">
-            <button type="button" class="my-btn-submit" onclick="add();">提交</button>
+            <div class="col-10 col-sm-10 text-c skin-minimal" >
+                <input type="hidden" value="${maintenanceInfo.maintenanceId!''}" name="maintenanceId" id="maintenanceId">
+                <button type="button" class="my-btn-submit" onclick="add();">提交</button>
+            </div>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
 
+
+    /*初始化单选框样式*/
+    $(function(){
+
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
+
     function  add() {
         var maintenanceEquipmentNumber = $("#maintenanceEquipmentNumber").val();
         if( maintenanceEquipmentNumber != null){