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

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -44,8 +44,6 @@ public class AdminDetectController {
     @Autowired
     private ProductService productService;
     @Autowired
-    private FittingsInfoService fittingsInfoService;
-    @Autowired
     private ComplaintSignclosedInfoMapper complaintSignclosedInfoMapper;
     @Autowired
     private ComplaintSignclosedProductInfoService signclosedProductInfoService;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/ComplaintMaintenanceController.java

@@ -6,10 +6,7 @@ import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsSalesCompany;
-import com.iamberry.rst.faces.cm.ComplaintMaintenanceInfoService;
-import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
-import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
-import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
+import com.iamberry.rst.faces.cm.*;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.pts.MachineService;
 import com.iamberry.rst.faces.pts.PtsSalesCompanyService;
@@ -46,7 +43,8 @@ public class ComplaintMaintenanceController {
     private ProductService productService;
     @Autowired
     private PtsSalesCompanyService ptsSalesCompanyService;
-
+    @Autowired
+    private ComplaintDetectInfoService complaintDetectInfoService;
 
     /**
      * 客诉 - 查询签收/仓储列表
@@ -326,4 +324,18 @@ public class ComplaintMaintenanceController {
         }
         return msg;
     }
+
+    /**
+     * 跳转到查看品检页面
+     *
+     * @return
+     */
+    @RequiresPermissions("maintenance:update:maintenance")
+    @RequestMapping(value = "/to_view_detect")
+    public ModelAndView toViewDetect(HttpServletRequest request,Integer detectId) {
+        ModelAndView mv = new ModelAndView("cm/maintenance/view_detect");
+        ComplaintDetectInfo complaintDetectInfo = complaintDetectInfoService.getComplaintDetectById(detectId);
+        mv.addObject("detectInfo",complaintDetectInfo);
+        return mv;
+    }
 }

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

@@ -53,25 +53,10 @@
 
             </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="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/> </div>
+        <div class="input-box">
+            <span class="input-dic spanhidth">检测日期</span>
+            <input class="my-input-date" type="text" style="width: 76%;"  name="detect_date" id="detectDate" 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>

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

@@ -32,8 +32,8 @@
 <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-10 col-sm-10 text-c huanhang">
+            <label class="form-label col-3 col-sm-3 huanhang">维修产品：</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang">
 
             <#if (productList?size > 0)>
                 <#list productList as product>

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

@@ -145,24 +145,12 @@
                            onclick="add_maintenance('完成返修','${path}/admin/maintenance/to_complete_reorder?maintenanceId=${maintenanceInfo.maintenanceId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe676;</i>
                         </a>
-                        <#--<#if signclosed.signclosedState == 2>
-                            <a style="text-decoration:none" href="javascript:;" title="签收"
-                               onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosed.signclosedId!''}');">
-                                <i class="Hui-iconfont">&#xe6df;</i>
-                            </a>
-                        </#if>
-                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
-                           onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
-                            <i class="Hui-iconfont">&#xe676;</i>
+                        <#if maintenanceInfo.detectId??>
+                        <a style="text-decoration:none" href="javascript:;" title="查看品检内容"
+                           onclick="add_maintenance('查看品检内容','${path}/admin/maintenance/to_view_detect?detectId=${maintenanceInfo.detectId!''}','570','450');">
+                            <i class="Hui-iconfont">&#xe709;</i>
                         </a>
-
-                        <#if signclosed.signclosedIsInto == 2>
-                            <a style="text-decoration:none" href="javascript:;" title="转入品检"
-                               onclick="into_complaint('${signclosed.signclosedId!''}');">
-                                <i class="Hui-iconfont">&#xe644;</i>
-                            </a>
                         </#if>
--->
                     </td>
                 </tr>
                 </#list>

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

@@ -0,0 +1,80 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/html">
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <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>查看品质检测内容</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;}
+        .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-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(/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;}
+        .buttoncolor{background-color: #A0A0A0;}
+        .huanhang{ float:left}
+    </style>
+    <meta name="keywords" content="${path}">
+    <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
+</head>
+<body>
+<article class="page-container">
+    <form class="form form-horizontal" id="form-admin-add">
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="font-weight: bold;margin-left: 40px;">检测现象</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -40px;">
+                <div style=" text-align: left; margin-top: 4px;">${detectInfo.detectPhenomenon!''}</div>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="font-weight: bold;margin-left: 40px;">故障分类</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -40px;">
+                <div style=" text-align: left; margin-top: 4px;">${detectInfo.detectFailureClassification!''}</div>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="font-weight: bold;margin-left: 40px;">故障原因</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -40px;">
+                <div style=" text-align: left; margin-top: 4px;">${detectInfo.detectFailureCause!''}</div>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="font-weight: bold;margin-left: 40px;">判断结果</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -40px;">
+                <div style=" text-align: left; margin-top: 4px;">${detectInfo.detectResults!''}</div>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="font-weight: bold;margin-left: 40px;">故障指向</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -40px;">
+                <div style=" text-align: left; margin-top: 4px;">${detectInfo.detectPoint!''}</div>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="font-weight: bold;margin-left: 40px;">故障原因</label>
+            <div class="formControls col-9 col-sm-9 text-c huanhang" style="margin-left: -40px;">
+                <div style=" text-align: left; margin-top: 4px;">${detectInfo.detectAnalysis!''}</div>
+            </div>
+        </div>
+        <div >
+            <label class="form-label col-5 col-sm-5 huanhang" style="margin-left: 40px;margin-top: 100px;">提示：<br>
+                此内容由QA同事填写。</label>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+
+</body>
+</html>