打印机页面修改

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintDetectInfoServiceImpl.java

@@ -57,6 +57,7 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                 complaintMaintenanceInfo.setMaintenanceIsRepair(1);//默认未评估
                 complaintMaintenanceInfo.setMaintenanceContentDate(new Date());
                 complaintMaintenanceInfo.setMaintenanceCreateTime(new Date());
+                complaintMaintenanceInfo.setMaintenanceIsWarehousing(2);//默认为已入库
                 complaintMaintenanceInfoMapper.insert(complaintMaintenanceInfo);
             }
         }

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

@@ -23,7 +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;}
-        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
     </style>
     <meta name="keywords" content="${path}">
     <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
@@ -40,11 +40,10 @@
             </#if>
         </div>
 
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1"></label>
-            <div class="formControls col-7 col-sm-7">
-                签收产品：
-                <div class="update-parts">
+        <div class="input-box">
+            <span>签收产品：</span>
+
+            <div class="update-parts">
             <#if signclosedProductInfo??>
                 <#if (signclosedProductInfo?size > 0)>
                     <#list signclosedProductInfo as info>
@@ -60,7 +59,6 @@
             <#else >
                 暂无数据！
             </#if>
-                </div>
             </div>
         </div>
         <div style="text-align:center;">