售后流程修改

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/MaterialNumberInfo.java

@@ -0,0 +1,43 @@
+package com.iamberry.rst.core.fm;
+
+import java.io.Serializable;
+
+public class MaterialNumberInfo implements Serializable{
+    private static final long serialVersionUID = -2059209076296364587L;
+    private Integer materialId;
+    private Integer materialNumber;
+    private String materialName;
+    private Integer materialType;
+
+    public Integer getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(Integer materialId) {
+        this.materialId = materialId;
+    }
+
+    public Integer getMaterialNumber() {
+        return materialNumber;
+    }
+
+    public void setMaterialNumber(Integer materialNumber) {
+        this.materialNumber = materialNumber;
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    public Integer getMaterialType() {
+        return materialType;
+    }
+
+    public void setMaterialType(Integer materialType) {
+        this.materialType = materialType;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/fm/ComplaintDetectInfoService.java

@@ -1,9 +1,6 @@
 package com.iamberry.rst.faces.fm;
 
-import com.iamberry.rst.core.fm.ComplaintDetectImg;
-import com.iamberry.rst.core.fm.ComplaintDetectInfo;
-import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.fm.DetectionBasis;
+import com.iamberry.rst.core.fm.*;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 
@@ -82,4 +79,9 @@ public interface ComplaintDetectInfoService {
      * @return
      */
     Integer getDetectNum();
+    /**
+     * 查询物料代码
+     * @return
+     */
+    List<MaterialNumberInfo> listMaterialNumber();
 }

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

@@ -4,10 +4,7 @@ package com.iamberry.rst.service.fm;
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.cm.CmRelation;
 import com.iamberry.rst.core.cm.ProcMethod;
-import com.iamberry.rst.core.fm.ComplaintDetectImg;
-import com.iamberry.rst.core.fm.ComplaintDetectInfo;
-import com.iamberry.rst.core.fm.ComplaintSignclosedInfo;
-import com.iamberry.rst.core.fm.DetectionBasis;
+import com.iamberry.rst.core.fm.*;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
@@ -200,5 +197,10 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
         return complaintDetectInfoMapper.getDetectNum();
     }
 
+    @Override
+    public List<MaterialNumberInfo> listMaterialNumber() {
+        return complaintDetectInfoMapper.listMaterialNumber();
+    }
+
 
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/ComplaintDetectInfoMapper.java

@@ -3,6 +3,7 @@ package com.iamberry.rst.service.fm.mapper;
 import com.iamberry.rst.core.fm.ComplaintDetectImg;
 import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import com.iamberry.rst.core.fm.DetectionBasis;
+import com.iamberry.rst.core.fm.MaterialNumberInfo;
 
 import java.util.List;
 
@@ -63,4 +64,10 @@ public interface ComplaintDetectInfoMapper {
      * @return
      */
     Integer getDetectNum();
+
+    /**
+     * 查询物料代码
+     * @return
+     */
+    List<MaterialNumberInfo> listMaterialNumber();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -340,4 +340,11 @@
     WHERE
         date_format(detect_create_time, '%Y-%m') = date_format(now(), '%Y-%m')
   </select>
+
+  <select id="listMaterialNumber" resultType="MaterialNumberInfo">
+    SELECT
+        *
+    FROM
+        tb_rst_fm_material_number
+  </select>
 </mapper>

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

@@ -221,6 +221,30 @@ public class AdminDetectController {
         mv.addObject("detectinfo",detectinfo);
         return mv;
     }
+    /**
+     * 跳转到完成维修页面
+     *
+     * @return
+     */
+    @RequiresPermissions("info:update:info")
+    @RequestMapping(value = "/to_complete")
+    public ModelAndView toComplete(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/complete_maintenance");
+        String detectId = request.getParameter("detectId");
+        String detectState = request.getParameter("detectState");
+        if(detectId == null || detectId.equals("")){
+            return mv;
+        }if(detectState == null || detectState.equals("")){
+            return mv;
+        }
+        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        List<MaterialNumberInfo> listMaterial = complaintDetectInfoService.listMaterialNumber();
+        mv.addObject("detectId",detectId);
+        mv.addObject("detectState",detectState);
+        mv.addObject("detectinfo",detectinfo);
+        mv.addObject("listMaterial",listMaterial);
+        return mv;
+    }
 
     /**
      * 跳转到检测详情页面
@@ -236,7 +260,29 @@ public class AdminDetectController {
             return mv;
         }
         ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        List<ComplaintDetectImg> imgList = complaintDetectInfoService.listDetectImg(Integer.valueOf(detectId));
         mv.addObject("detectinfo",detectinfo);
+        mv.addObject("imgList",imgList);
+        return mv;
+    }
+
+    /**
+     * 跳转到修改检测页面
+     *
+     * @return
+     */
+    @RequiresPermissions("info:update:info")
+    @RequestMapping(value = "/to_update")
+    public ModelAndView toupdate(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/update_detect");
+        String detectId = request.getParameter("detectId");
+        if(detectId == null || detectId.equals("")){
+            return mv;
+        }
+        ComplaintDetectInfo detectinfo = complaintDetectInfoService.getDetectById(Integer.valueOf(detectId));
+        List<ComplaintDetectImg> imgList = complaintDetectInfoService.listDetectImg(Integer.valueOf(detectId));
+        mv.addObject("detectInfo",detectinfo);
+        mv.addObject("imgList",imgList);
         return mv;
     }
     /**
@@ -301,7 +347,9 @@ public class AdminDetectController {
             msg.setReturnCode(500);
             return msg;
         }
+        /*String[] componentsImgs = request.getParameterValues("componentsImg");*/
         Integer num = complaintDetectInfoService.updateDetectById(detectInfo);
+
         if (num < 1) {
             msg.setResultCode(500);
             msg.setReturnCode(500);

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/InventoryController.java

@@ -257,7 +257,7 @@ public class InventoryController {
             inventoryInfo.setInventoryRemainingNum(10000);
             inventoryInfo.setInventoryState(1);
             inventoryInfo.setInventoryProductColorId(productColor.getColorId());
-            inventoryInfo.setInventoryGoodProductNum(0);
+            inventoryInfo.setInventoryGoodProductNum(10000);
             inventoryInfo.setInventoryDefectiveProductNum(0);
             inventoryService.insert(inventoryInfo);
         }

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -110,6 +110,7 @@
 		<typeAlias type="com.iamberry.rst.core.fm.FactoryInfo" alias="FactoryInfo"/>
 		<typeAlias type="com.iamberry.rst.core.fm.ComplaintSignclosedImg" alias="ComplaintSignclosedImg"/>
 		<typeAlias type="com.iamberry.rst.core.fm.ComplaintDetectImg" alias="ComplaintDetectImg"/>
+		<typeAlias type="com.iamberry.rst.core.fm.MaterialNumberInfo" alias="MaterialNumberInfo"/>
 
 		<typeAlias type="com.iamberry.rst.core.sys.SysConfig" alias="SysConfig"/>
 		<typeAlias type="com.iamberry.rst.core.sys.SystemLogs" alias="SystemLogs"/>

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

@@ -0,0 +1,116 @@
+<!DOCTYPE HTML>
+<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>完成维修 - H-ui.filter v2.4</title>
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 45%;height: 6px;width: 6px;border-radius: 6px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_results li a span {float:right}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .col-sm-1{width: 150px;}
+        .huanhang{ float:left}
+        .my-btn-submit{padding: 10px 20px;width: 130px; background-color: #50a2ea;color: #fff;border: 1px solid #50a2ea;cursor:pointer;margin: 10px auto 0 auto;display: block;}
+    </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="row cl">
+                <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center">维修配件：</label>
+                <div class="formControls col-6 col-sm-6 huanhang" style="">
+                    <span class="select-box">
+                        <select class="select" id="materialId" name="materialId" >
+                            <option value="1" >请选择（可多选）</option>
+                            <#list listMaterial as material>
+                                <option value="${material.materialName}" >${material.materialName}</option>
+                            </#list>
+                        </select>
+				    </span>
+                </div>
+            </div>
+            <div class="row cl" id="" style="">
+                <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center">维修内容：</label>
+                <div class="formControls col-6 col-sm-6 huanhang">
+                    <textarea name="detectContent" id="detectContent" cols="" rows="2"  class="textarea" onKeyUp="$.Huitextarealength(this,100)"></textarea>
+                <#--<span id="addrssMsg"></span>-->
+                </div>
+            </div>
+        <div class="row cl">
+            <label class="form-label col-1 col-sm-1 huanhang" style="text-align: center"></label>
+            <div class="col-6 col-sm-6 col-offset-3">
+                <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
+                <input type="hidden" value="${detectState!''}" id="detectState" name="detectState">
+                <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">
+    $("#materialId").change(function(){
+        $("#detectContent").html($("#detectContent").val()+$(this).val()+";");
+    });
+
+
+    function  add() {
+        /*var detectItemDesc = $("#detectItemDesc").val();
+        if( detectItemDesc != null){
+            if( detectItemDesc.length > 200 ){
+                layer.msg('备注长度不得大于100个字符',{icon: 5,time:1000});
+                return;
+            }
+        }*/
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/detect/update",
+            data:$('#form-admin-add').serialize(),// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('操作成功',{icon: 1,time:1000},function () {
+                        window.parent.location.reload();
+                        var index = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(index)
+                    });
+                } else {
+                    layer.msg('操作失败',{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('操作错误',{icon: 5,time:1000});
+            }
+        });
+    }
+</script>
+</body>
+</html>

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

@@ -277,6 +277,20 @@
                 <th width="10">备注：</th>
                 <td width="10" style="font-weight: normal;"><span>${detectinfo.detectDesc!''}</span></td>
             </tr>
+            <tr>
+                <th width="10">维修图片：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if (imgList?size > 0)>
+                    <#list imgList as img>
+                        <img  src="${img.detectImgUrl!''}"  width="90" height="80">
+                    </div>
+                    </#list>
+                </#if>
+                </span></td>
+                <td width="10"></td>
+                <th width="10"></th>
+                <td width="10" style="font-weight: normal;"><span></span></td>
+            </tr>
             </thead>
         </table>
 

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

@@ -98,6 +98,7 @@
 
             </select>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="customerId" value="${customerId!}" placeholder="客诉编号"/>
+            <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectNumber" value="${detectNumber!}" placeholder="维修编号"/>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="questionTitle" value="${questionTitle!}" placeholder="客诉问题"/>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectPhenomenon" value="${detectPhenomenon!}" placeholder="工厂检测现象"/>
             <input class="my-input" style="width: 70px;height: 29px;" type="text" name="detectFailureCause" value="${detectFailureCause!}" placeholder="故障原因"/>
@@ -243,14 +244,20 @@
                            onclick="add_remark('维修记录','${path}/admin/detect/to_add_content?detectId=${detect.detectId!''}','570','450');">
                             <i class="Hui-iconfont">维修记录</i>
                         </a><br>
-                        <a style="text-decoration:none" href="javascript:;" title="QC检测"
-                           onclick="add_remark('QC检测','${path}/admin/detect/to_add_QC?detectId=${detect.detectId!''}','570','450');">
-                            <i class="Hui-iconfont">QC检测</i>
-                        </a><br>
+                        <#if detect.detectState == 32 || detect.detectState == 36>
+                            <a style="text-decoration:none" href="javascript:;" title="QC检测"
+                               onclick="add_remark('QC检测','${path}/admin/detect/to_add_QC?detectId=${detect.detectId!''}','570','450');">
+                                <i class="Hui-iconfont">QC检测</i>
+                            </a><br>
+                        </#if>
                         <a style="text-decoration:none" href="javascript:;" title="详情"
                            onclick="detail('${path}/admin/detect/to_detail?detectId=${detect.detectId!''}');">
                             <i class="Hui-iconfont">详情</i>
                         </a><br>
+                        <a style="text-decoration:none" href="javascript:;" title="修改"
+                           onclick="detail('${path}/admin/detect/to_update?detectId=${detect.detectId!''}');">
+                            <i class="Hui-iconfont">修改</i>
+                        </a><br>
                         <#--<a style="text-decoration:none" href="javascript:;" title="删除"
                            onclick="detele(${detect.detectId!''});">
                             <i class="Hui-iconfont">&#xe609;</i>
@@ -283,13 +290,14 @@
                             </#if>
                             <#if detect.detectState == 31>
                                 <a style="text-decoration:none" href="javascript:;" title="维修完成"
-                                   onclick="updateState('${detect.detectId!''}','32');">
+                                   onclick="add_remark('维修完成','${path}/admin/detect/to_complete?detectId=${detect.detectId!''}&detectState=32','570','450');">
+
                                     <i class="Hui-iconfont">维修完成</i><br>
                                 </a>
                             </#if>
                             <#if detect.detectState == 35>
                                 <a style="text-decoration:none" href="javascript:;" title="维修完成"
-                                   onclick="updateState('${detect.detectId!''}','36');">
+                                   onclick="add_remark('维修完成','${path}/admin/detect/to_complete?detectId=${detect.detectId!''}&detectState=36','570','450');">
                                     <i class="Hui-iconfont">维修完成</i><br>
                                 </a>
                             </#if>

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

@@ -0,0 +1,294 @@
+<!DOCTYPE HTML>
+<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: 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: 130px; background-color: #50a2ea;color: #fff;border: 1px solid #50a2ea;cursor:pointer;margin: 10px auto 0 auto;display: block;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-11.png) right center no-repeat;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}
+        .check-box, .radio-box{padding-left: 0;}
+    </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="col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>是否故障：</label>
+            <div class=" col-xs-9 col-sm-9 huanhang" >
+                <div class="radio-box">
+                    <input type="radio" id="radio-3" name="isMaintenance" value="2" checked
+                          <#if detectInfo.isMaintenance??><#if detectInfo.isMaintenance == 2>checked</#if></#if>/><label for="radio-3">无故障</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-4" name="isMaintenance" value="1"
+                    <#if detectInfo.isMaintenance??><#if detectInfo.isMaintenance == 1>checked</#if></#if>/><label for="radio-4">有故障</label>
+                </div>
+            </div>
+        </div>-->
+        <div class="input-box" style="margin-top: 20px;">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>是否可翻新：</label>
+            <div class=" col-xs-9 col-sm-9  huanhang" >
+                <div class="radio-box" style="margin: 10px 0px;">
+                    <input type="radio" id="radio-7" name="detectRenovation" value="1"  checked
+                          <#if detectInfo.detectRenovation??><#if detectInfo.detectRenovation == 1>checked</#if></#if>/><label for="radio-7">可翻新</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-8" name="detectRenovation" value="2"
+                    <#if detectInfo.detectRenovation??><#if detectInfo.detectRenovation == 2>checked</#if></#if>/><label for="radio-8">不可翻新</label>
+                </div>
+            </div>
+        </div>
+        <div class="input-box" style="margin-top: 20px;">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">厚膜类型：</label>
+            <div class=" col-xs-9 col-sm-9  huanhang" >
+                <div class="radio-box" style="margin: 10px 0px;">
+                    <input type="radio" id="radio-9" name="detectFilmType" value="1"  checked
+                          <#if detectInfo.detectFilmType??><#if detectInfo.detectFilmType == 1>checked</#if></#if>/><label for="radio-9">圆</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-10" name="detectFilmType" value="2"
+                    <#if detectInfo.detectFilmType??><#if detectInfo.detectFilmType == 2>checked</#if></#if>/><label for="radio-10">扁</label>
+                </div>
+            </div>
+        </div>
+        <div class="input-box" style="margin-top: 20px;">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">浮子类型：</label>
+            <div class=" col-xs-9 col-sm-9  huanhang" >
+                <div class="radio-box" style="margin: 10px 0px;">
+                    <input type="radio" id="radio-11" name="detectFloatType" value="1"  checked
+                          <#if detectInfo.detectFloatType??><#if detectInfo.detectFloatType == 1>checked</#if></#if>/><label for="radio-11">长</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-12" name="detectFloatType" value="2"
+                    <#if detectInfo.detectFloatType??><#if detectInfo.detectFloatType == 2>checked</#if></#if>/><label for="radio-12">短</label>
+                </div>
+            </div>
+        </div>
+        <div class="input-box" style="margin-top: 20px;">
+            <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">是否翻新机：</label>
+            <div class=" col-xs-9 col-sm-9  huanhang" >
+                <div class="radio-box" style="margin: 10px 0px;">
+                    <input type="radio" id="radio-13" name="detectIsRefurbishing" value="1"  checked
+                          <#if detectInfo.detectIsRefurbishing??><#if detectInfo.detectIsRefurbishing == 1>checked</#if></#if>/><label for="radio-13">是</label>
+                </div>
+                <div class="radio-box">
+                    <input type="radio" id="radio-14" name="detectIsRefurbishing" value="2"
+                    <#if detectInfo.detectIsRefurbishing??><#if detectInfo.detectIsRefurbishing == 2>checked</#if></#if>/><label for="radio-14">否</label>
+                </div>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">生产月份：</label>
+            <div class="formControls col-9 col-sm-9  skin-minimal huanhang" style="margin: 10px 0px">
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectProduction!''}" name="detectProduction" id="detectProduction" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M',dateFmt: 'yyyy-MM'})" placeholder="请选择月份" readonly="readonly"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectFuselageBarcode!''}" name="detectFuselageBarcode" id="detectFuselageBarcode"  placeholder="请输入机身条码"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectVersionNumber!''}" name="detectVersionNumber" id="detectVersionNumber"  placeholder="请输入版本号"/>
+            </div>
+        </div>
+       <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPhenomenon" id="detectPhenomenon" class="my-textarea" placeholder="请输入工厂的检测现象">${detectInfo.detectPhenomenon!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPhenomenon!''}" name="detectPhenomenon" id="detectPhenomenon"  placeholder="请输入检测现象"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectClassification" id="detectClassification" class="my-textarea" placeholder="请输入故障分类">${detectInfo.detectClassification!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectClassification!''}" name="detectClassification" id="detectClassification"  placeholder="请输入故障分类"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectFailureCause" id="detectFailureCause" class="my-textarea" placeholder="请输入故障原因">${detectInfo.detectFailureCause!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectFailureCause!''}" name="detectFailureCause" id="detectFailureCause"  placeholder="请输入故障原因"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectResults" id="detectResults" class="my-textarea" placeholder="请输入判定结果">${detectInfo.detectResults!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectResults!''}" name="detectResults" id="detectResults"  placeholder="请输入判定结果"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectPoint" id="detectPoint" class="my-textarea" placeholder="请输入故障指向">${detectInfo.detectPoint!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectPoint!''}" name="detectPoint" id="detectPoint"  placeholder="请输入故障指向"/>
+            </div>
+        </div>
+        <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <#--<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectNalysis" id="detectNalysis" class="my-textarea" placeholder="请输入原因分析">${detectInfo.detectNalysis!''}</textarea>-->
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectNalysis!''}" name="detectNalysis" id="detectNalysis"  placeholder="请输入原因分析"/>
+            </div>
+        </div>
+    <#--    <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-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                &lt;#&ndash;<textarea style="margin-left: 0%;width: 83%;" rows="2" cols="20" name="detectContent" id="detectContent" class="my-textarea" placeholder="请输入检测内容">${detectInfo.detectContent!''}</textarea>&ndash;&gt;
+                <input class="my-input" style="width: 90%;" type="text" value="${detectInfo.detectContent!''}" name="detectContent" id="detectContent"  placeholder="请输入检测内容"/>
+
+            </div>
+        </div>-->
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;">维修报价：</label>
+            <div class="formControls col-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <input class="my-input" style="width: 90%;" type="text" value="<#if detectInfo.detectOffer??>${detectInfo.detectOffer/100}</#if>" name="detect_Offer" id="detect_Offer"  placeholder="请输入维修报价" oninput = "value=value.replace(/[^\d]/g,'')"/>
+                <input type="hidden" name="detectOffer" id="detectOffer" value="">
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测日期：</label>
+            <div class="formControls col-9 col-sm-9 skin-minimal huanhang" style="margin: 10px 0px;">
+                <input class="my-input" style="width: 90%;" type="text" value="<#if detectInfo.detectDate??>${detectInfo.detectDate?string("yyyy-MM-dd")!''}</#if>" name="detect_date" id="detectDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            </div>
+        </div>
+        <div class="input-box">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">备注信息：</label>
+            <div class="col-xs-9 col-sm-9 skin-minimal">
+                <div class="radio-box" style="padding: 0px; width: 100%;">
+                    <textarea style="height: 60px;margin: 10px 0px 10px 0px;width: 85%;" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请填写寄出订单备注信息！">${detectInfo.detectDesc!''}</textarea>
+                </div>
+            </div>
+        </div>
+
+        <#--<div class="row cl">
+            <label class="form-label col-xs-3 col-sm-3 huanhang" style="text-align: right;">添加附件：</label>
+            <div class="formControls col-xs-2 col-sm-2" id="fileDiv" style="width: 17%;width: 100px;height: 100px;margin-left: 8px;">
+                <input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 80px;height: 80px;">
+                <img alt="介绍图" src="${path}/common/images/pts/addparts.jpg"  id="partsImg" width="80" height="80">
+            &lt;#&ndash;<input type="hidden" id="componentsImg" name="componentsImg" value=""/>&ndash;&gt;
+            &lt;#&ndash;<button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="uploadSubmit"><i class="Hui-iconfont">&#xe665;</i> 上传</button>&ndash;&gt;
+            </div>
+            <div id="imgDiv">
+                <#if (imgList?size > 0)>
+                    <#list imgList as img>
+                <div class="col-xs-8 col-sm-8" onclick="deleteImg(this);" style="width: 17%;width: 100px;height: 100px;">
+                    <img  src="${img.detectImgUrl!''}"  width="90" height="80">
+                    <input type="hidden"  name="componentsImg" value="${img.detectImgUrl!''}"/>
+                    </div>
+                    </#list>
+                </#if>
+            </div>
+        </div>-->
+
+        <div>
+            <input type="hidden" value="${detectInfo.detectId!''}" id="detectId" name="detectId">
+            <input type="hidden" value="${detectInfo.customerId!''}" id="customerId" name="customerId">
+           <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" src="${path}/common/lib/jquery/1.9.1/ajaxfileupload.js"></script>
+<script type="text/javascript">
+    /*初始化单选框样式*/
+    $(function(){
+        $('.skin-minimal input').iCheck({
+            checkboxClass: 'icheckbox-blue',
+            radioClass: 'iradio-blue',
+            increaseArea: '20%'
+        });
+    });
+    /***
+     * 删除图片
+     */
+    function deleteImg(obj){
+        layer.confirm("确认要删除该图片吗", { title: "确认" }, function (index) {
+            layer.close(index);
+            obj.remove();
+        });
+    }
+
+    $('#fileid').change(function() {
+        fileUpload();
+    });
+
+    function fileUpload() {
+        $.ajaxFileUpload({
+            url:"${path}/admin/machineParts/fileUpload",
+            secureuri:false,
+            fileElementId:"fileid",//文件选择框的id属性
+            dataType: 'json',   //json
+            success: function (data) {
+                if(data.returnCode == 200){
+                    /*<input type="file" name="file" id="fileid" style="opacity: 0; position: absolute; width: 90px;height: 80px;">*/
+                    $("#imgDiv").append('<div class="col-xs-8 col-sm-8" onclick="deleteImg(this);" style="width: 17%;width: 100px;height: 100px;">'
+                            +'<img  src="'+root_path+data.returnMsg.imgUrl+'"  width="90" height="80">'
+                            +'<input type="hidden"  name="componentsImg" value="'+data.returnMsg.imgUrl+'"/>'
+                            +'</div>');
+                }else{
+                    layer.msg('上传失败，请重试!',{icon: 5,time:2000});
+                }
+            }
+        });
+        $('#fileid').change(function() {
+            fileUpload();
+        });
+    }
+
+    function  add() {
+
+
+        var detect_Offer = $("#detect_Offer").val();
+        if(detect_Offer != null && detect_Offer != ""){
+            $("#detectOffer").val(detect_Offer * 100)
+        }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/detect/update",
+            data:$('#form-admin-add').serialize(),// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('操作成功',{icon: 1,time:1000},function () {
+                        history.back(-1);
+                    });
+                } else {
+                    layer.msg('操作失败',{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('操作错误',{icon: 5,time:1000});
+            }
+        });
+    }
+</script>
+</body>
+</html>