Página inicial Explorar Ajuda
Entrar
hexiugang
/
iamberry-common-parent
Observar 3
Favorito 3
Fork 1
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

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

liuzhiwei 7 anos atrás
pai
e9345b4c64 34329e93c5
commit
d37c7d93f4
3 arquivos alterados com 17 adições e 10 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/view_progress.ftl
  2. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/maintenance/perfecting_machine.ftl
  3. 13 6
      watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

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

@@ -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
Ver arquivo 

@@ -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;}

+ 13 - 6
watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl
Ver arquivo 

@@ -15,6 +15,13 @@
 
         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;}
 
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
 
+        .txt{
 
+            width:60px;
 
+            border:1px solid #ddd;
 
+            overflow: hidden;
 
+            white-space: nowrap;
 
+            text-overflow: ellipsis;
 
+        }
 
     </style>
 
 </head>
 
 <body>
 
@@ -124,14 +131,14 @@
 
                     <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
 
                     <td class="text-c" width="100">${signclosed.signclosedSendTel!}</td>
 
                     <td class="text-c" width="100">
 
-                        <div class="update-parts">
 
+                        <div>
 
                         <#if signclosed.awaitingSignclosedProductInfoList??>
 
                             <#if (signclosed.awaitingSignclosedProductInfoList?size > 0)>
 
                                 <#list signclosed.awaitingSignclosedProductInfoList as info>
 
                                     <#if info.signclosedProductType == 1 >
 
-                                        <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
 
+                                        <span class="label label-success radius txt" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${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 txt" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件</span><br>
 
                                     </#if>
 
                                 </#list>
 
                             <#else >
 
@@ -143,14 +150,14 @@
 
                         </div>
 
                     </td>
 
                     <td class="text-c" width="100">
 
-                        <div class="update-parts">
 
+                        <div>
 
                         <#if signclosed.signclosedProductInfoList??>
 
                             <#if (signclosed.signclosedProductInfoList?size > 0)>
 
                                 <#list signclosed.signclosedProductInfoList as info>
 
                                     <#if info.signclosedProductType == 1 >
 
-                                        <span>${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
 
+                                        <span class="label label-success radius txt" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${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 txt" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
 
                                     </#if>
 
                                 </#list>
 
                             <#else >