Explorar el Código

打印机页面修改

liujiankang hace 7 años
padre
commit
34329e93c5

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

@@ -43,14 +43,14 @@
         <div class="input-box">
             <span>签收产品:</span>
 
-            <div class="update-parts">
+            <div style="margin-left: 13%;margin-top: -4%;">
             <#if signclosedProductInfo??>
                 <#if (signclosedProductInfo?size > 0)>
                     <#list signclosedProductInfo as info>
                         <#if info.signclosedProductType == 1 >
-                            <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                            <span class="label label-success radius">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                         <#else >
-                            <span>${info.productName!''} x ${info.productNum!''}件</span><br>
+                            <span class="label label-success radius">${info.productName!''} x ${info.productNum!''}件</span><br>
                         </#if>
                     </#list>
                 <#else >

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/perfecting_machine.ftl

@@ -19,7 +19,7 @@
         .add-list>li{margin: 10px 0;}
         .my-textarea{padding: 5px 10px;width: 80%;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-btn-submit{padding: 10px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid;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(/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;}