品质管理模块

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintDetectInfo.java

@@ -40,8 +40,8 @@ public class ComplaintDetectInfo implements Serializable {
 
 
     private String questionTitle;//问题标题
-    private String detectIsMaintenance;//是否需要维修
-    private String productName;//是否需要维修
+    private Integer detectIsMaintenance;//是否需要维修 1 需要 2不需要
+    private String productName;//产品名称
 
 
     public Integer getDetectId() {
@@ -204,11 +204,11 @@ public class ComplaintDetectInfo implements Serializable {
         this.machineNo = machineNo;
     }
 
-    public String getDetectIsMaintenance() {
+    public Integer getDetectIsMaintenance() {
         return detectIsMaintenance;
     }
 
-    public void setDetectIsMaintenance(String detectIsMaintenance) {
+    public void setDetectIsMaintenance(Integer detectIsMaintenance) {
         this.detectIsMaintenance = detectIsMaintenance;
     }
 

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/ComplaintMaintenanceInfo.java

@@ -3,7 +3,7 @@ package com.iamberry.rst.core.cm;
 import java.io.Serializable;
 import java.util.Date;
 /**
- * 客诉-签收产品表
+ * 客诉-生产维修表
  * @author LJK
  * @company 深圳爱贝源科技有限公司
  * @date 2017/6/22 16:05
@@ -14,9 +14,9 @@ public class ComplaintMaintenanceInfo  implements Serializable {
 
     private Integer detectId;//品质检测ID
 
-    private Integer maintenanceEquipmentNumber;//设备编号
+    private String maintenanceEquipmentNumber;//设备编号
 
-    private Integer maintenanceProductType;//产品类型
+    private Integer productId;//产品id
 
     private String maintenanceProductNumber;//产品型号
 
@@ -54,20 +54,20 @@ public class ComplaintMaintenanceInfo  implements Serializable {
         this.detectId = detectId;
     }
 
-    public Integer getMaintenanceEquipmentNumber() {
+    public String getMaintenanceEquipmentNumber() {
         return maintenanceEquipmentNumber;
     }
 
-    public void setMaintenanceEquipmentNumber(Integer maintenanceEquipmentNumber) {
+    public void setMaintenanceEquipmentNumber(String maintenanceEquipmentNumber) {
         this.maintenanceEquipmentNumber = maintenanceEquipmentNumber;
     }
 
-    public Integer getMaintenanceProductType() {
-        return maintenanceProductType;
+    public Integer getProductId() {
+        return productId;
     }
 
-    public void setMaintenanceProductType(Integer maintenanceProductType) {
-        this.maintenanceProductType = maintenanceProductType;
+    public void setProductId(Integer productId) {
+        this.productId = productId;
     }
 
     public String getMaintenanceProductNumber() {

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

@@ -3,6 +3,7 @@ package com.iamberry.rst.service.cm;
 
 import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.cm.ComplaintDetectInfo;
+import com.iamberry.rst.core.cm.ComplaintMaintenanceInfo;
 import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
@@ -32,6 +33,15 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
 
     @Override
     public int updateComplaintDetectById(ComplaintDetectInfo record) {
+        if(record.getDetectRevolutionProduced() == 2){ //在生产表生成记录
+            ComplaintDetectInfo detectInfo = complaintDetectInfoMapper.getComplaintDetectById(record.getDetectId());
+            ComplaintMaintenanceInfo complaintMaintenanceInfo = new ComplaintMaintenanceInfo();
+            complaintMaintenanceInfo.setDetectId(detectInfo.getDetectId());
+            complaintMaintenanceInfo.setMaintenanceEquipmentNumber(detectInfo.getMachineNo() == null ? null:detectInfo.getMachineNo());
+            complaintMaintenanceInfo.setProductId(detectInfo.getProductId());
+            complaintMaintenanceInfo.setMaintenanceProductNumber(detectInfo.getDetectProductNumber() == null ? null:detectInfo.getDetectProductNumber());
+            /*complaintMaintenanceInfo.*/
+        }
         return complaintDetectInfoMapper.updateComplaintDetectById(record);
     }
     @Override

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

@@ -20,7 +20,7 @@
     <result column="signclosed_create_time" property="signclosedCreateTime" jdbcType="TIMESTAMP" />
     <result column="signclosed_update_time" property="signclosedUpdateTime" jdbcType="TIMESTAMP" />
     <result column="machine_no" property="machineNo" jdbcType="VARCHAR" />
-    <result column="detect_is_maintenance" property="detectIsMaintenance" jdbcType="VARCHAR" />
+    <result column="detect_is_maintenance" property="detectIsMaintenance" jdbcType="BIT" />
     <result column="detect_date" property="detectDate" jdbcType="DATE" />
 
   </resultMap>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintMaintenanceInfoMapper.xml

@@ -5,7 +5,7 @@
     <id column="maintenance_id" property="maintenanceId" jdbcType="INTEGER" />
     <result column="detect_id" property="detectId" jdbcType="INTEGER" />
     <result column="maintenance_equipment_number" property="maintenanceEquipmentNumber" jdbcType="INTEGER" />
-    <result column="maintenance_product_type" property="maintenanceProductType" jdbcType="BIT" />
+    <result column="product_id" property="productId" jdbcType="INTEGER" />
     <result column="maintenance_product_number" property="maintenanceProductNumber" jdbcType="VARCHAR" />
     <result column="maintenance_results" property="maintenanceResults" jdbcType="VARCHAR" />
     <result column="maintenance_state" property="maintenanceState" jdbcType="BIT" />
@@ -18,7 +18,7 @@
     <result column="maintenance_update_time" property="maintenanceUpdateTime" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    maintenance_id, detect_id, maintenance_equipment_number, maintenance_product_type, 
+    maintenance_id, detect_id, maintenance_equipment_number, product_id,
     maintenance_product_number, maintenance_results, maintenance_state, maintenance_analysis, 
     maintenance_customer_id, maintenance_id_repair, maintenance_content, maintenance_content_date, 
     maintenance_create_time, maintenance_update_time
@@ -31,14 +31,14 @@
   </select>
   <insert id="insert" parameterType="ComplaintMaintenanceInfo" >
     insert into tb_rst_complaint_maintenance (maintenance_id, detect_id, maintenance_equipment_number, 
-      maintenance_product_type, maintenance_product_number, 
+      product_id, maintenance_product_number,
       maintenance_results, maintenance_state, maintenance_analysis, 
       maintenance_customer_id, maintenance_id_repair, 
       maintenance_content, maintenance_content_date, 
       maintenance_create_time, maintenance_update_time
       )
     values (#{maintenanceId,jdbcType=INTEGER}, #{detectId,jdbcType=INTEGER}, #{maintenanceEquipmentNumber,jdbcType=INTEGER}, 
-      #{maintenanceProductType,jdbcType=BIT}, #{maintenanceProductNumber,jdbcType=VARCHAR}, 
+      #{productId,jdbcType=BIT}, #{maintenanceProductNumber,jdbcType=VARCHAR},
       #{maintenanceResults,jdbcType=VARCHAR}, #{maintenanceState,jdbcType=BIT}, #{maintenanceAnalysis,jdbcType=VARCHAR}, 
       #{maintenanceCustomerId,jdbcType=INTEGER}, #{maintenanceIdRepair,jdbcType=BIT}, 
       #{maintenanceContent,jdbcType=VARCHAR}, #{maintenanceContentDate,jdbcType=TIMESTAMP}, 
@@ -55,8 +55,8 @@
       <if test="maintenanceEquipmentNumber != null" >
         maintenance_equipment_number = #{maintenanceEquipmentNumber,jdbcType=INTEGER},
       </if>
-      <if test="maintenanceProductType != null" >
-        maintenance_product_type = #{maintenanceProductType,jdbcType=BIT},
+      <if test="productId != null" >
+        product_id = #{productId,jdbcType=BIT},
       </if>
       <if test="maintenanceProductNumber != null" >
         maintenance_product_number = #{maintenanceProductNumber,jdbcType=VARCHAR},

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

@@ -170,5 +170,80 @@ public class AdminDetectController {
         }
         return msg;
     }
+
+    /**
+     * 跳转到添加检测备注页面
+     *
+     * @return
+     */
+    @RequiresPermissions("info:update:info")
+    @RequestMapping(value = "/to_add_remark")
+    public ModelAndView toAddRemark(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/add_remark");
+        String detectId = request.getParameter("detectId");
+        if(detectId == null || detectId.equals("")){
+            return null;
+        }
+        ComplaintDetectInfo detectInfo = complaintDetectInfoService.getComplaintDetectById(Integer.valueOf(detectId));
+        mv.addObject("detectId",detectId);
+        mv.addObject("detectInfo",detectInfo);
+        return mv;
+    }
+
+    /**
+     * 跳转到添加修改转入信息页面
+     *
+     * @return
+     */
+    @RequiresPermissions("remark:add:remark")
+    @RequestMapping(value = "/to_produced_info")
+    public ModelAndView toProducedInfo(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/inspection/update_produced_info");
+        String detectId = request.getParameter("detectId");
+        String state = request.getParameter("state");
+        if(detectId == null || detectId.equals("")){
+            return null;
+        }
+        ComplaintDetectInfo detectInfo = complaintDetectInfoService.getComplaintDetectById(Integer.valueOf(detectId));
+        mv.addObject("detectId",detectId);
+        mv.addObject("detectInfo",detectInfo);
+        mv.addObject("state",state);
+        return mv;
+    }
+
+    /**
+     * 添加/修改检测信息
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("remark:add:remark")
+    @ResponseBody
+    @RequestMapping("/add_remark")
+    public ResponseJson addRemark(HttpServletRequest request, ComplaintDetectInfo detectInfo) throws Exception {
+        ResponseJson msg = new ResponseJson();
+        if(detectInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        if(detectInfo.getDetectId() == null || detectInfo.getDetectId().equals("")){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        if(detectInfo.getDetectIsMaintenance() == 2){ //选择不需要转入时 detect_revolution_produced 统一改为待转入
+            detectInfo.setDetectRevolutionProduced(1);
+        }
+        Integer num = complaintDetectInfoService.updateComplaintDetectById(detectInfo);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
 }
 

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

@@ -87,7 +87,7 @@ public class PtsCodeController {
             if(phones.get(i).length() != 11){
                 return "快递公司出错，请检查文档内的数据是否正常！";
             }
-            String text = MessageFormat.format(SEND_NOTICE_INFORM2, autograph);
+            String text = MessageFormat.format(SEND_NOTICE_INFORM, autograph);
             msg = smsService.sendOtherCMS(phones.get(i),text);
             if(msg.equals("SUCCESS")){
                 successNumber++;

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

@@ -0,0 +1,83 @@
+<!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>
+        .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;}
+    </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"   style="text-align:center;">
+            <span class="input-dic spanhidth">备注</span>
+            <textarea rows="5" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+
+        </div>
+        <div style="text-align:center;">
+            <span>如果转入生产，则生产部门同事可查看！</span>
+        </div>
+        <div style="text-align:center;">
+
+            <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
+           <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">
+
+
+    function  add() {
+        var detectDesc = $("#detectDesc").val();
+        if( detectDesc != null){
+            if( detectDesc.length > 200 ){
+                layer.msg('备注长度不得大于100个字符',{icon: 5,time:1000});
+                return;
+            }
+        }
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/detect/add_remark",
+            data:$('#form-admin-add').serialize(),// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('修改成功',{icon: 1,time:1000},function () {
+                        location.replace(location.href);
+                    });
+                } 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_list.ftl

@@ -96,24 +96,38 @@
                     <td class="text-c" width="100">${detect.detectAnalysis!}</td>
                     <td class="text-c" width="100">${detect.customerId!}</td>
                     <td class="text-c" width="100">
-                        <#if detect.detectRevolutionProduced == 1>
-                            待转入
-                        </#if>
-                        <#if detect.detectRevolutionProduced == 2>
-                            已转入
-                        </#if>
-                        <#if detect.detectRevolutionProduced == 3>
+                        <#if detect.detectIsMaintenance == 2>
                             不需要转入
+                        <#else >
+                            <#if detect.detectRevolutionProduced == 1>
+                                待转入
+                            </#if>
+                            <#if detect.detectRevolutionProduced == 2>
+                                已转入
+                            </#if>
                         </#if>
                     </td>
                     <td class="text-c" width="100">${detect.detectDesc!}</td>
                     <td class="text-c" width="100">${(detect.detectDate?string("yyyy-MM-dd"))!''}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c">
-                        <#--<a style="text-decoration:none" href="javascript:;" title="修改"
-                           onclick="edit_detail('${path}/admin/equipment/_update_device?deviceId=${device.deviceId!}');">
+                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
+                           onclick="add_remark('修改备注','${path}/admin/detect/to_add_remark?detectId=${detect.detectId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe6df;</i>
-                        </a>-->
+                        </a>
+                        <#if detect.detectIsMaintenance == 2>
+                            <a style="text-decoration:none" href="javascript:;" title="需要转入生产"
+                               onclick="update_info('需要转入生产','${path}/admin/detect/to_produced_info?detectId=${detect.detectId!''}&state=1','570','450');">
+                                <i class="Hui-iconfont">&#xe644;</i>
+                            </a>
+                        <#else >
+                            <#if detect.detectRevolutionProduced == 1>
+                                <a style="text-decoration:none" href="javascript:;" title="转入生产"
+                                   onclick="update_info('转入生产','${path}/admin/detect/to_produced_info?detectId=${detect.detectId!''}&state=2','570','450');">
+                                    <i class="Hui-iconfont">&#xe645;</i>
+                                </a>
+                            </#if>
+                        </#if>
                     </td>
                 </tr>
                 </#list>
@@ -132,6 +146,15 @@
     function add_detect(title,url,w,h){
         layer_show(title,url,w,h);
     }
+    /*修改备注*/
+    function add_remark(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+    /*转入生产*/
+    function update_info(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+
 </script>
 </body>
 </html>

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

@@ -0,0 +1,127 @@
+<!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>
+        .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;}
+    </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">
+            <span class="input-dic" style="margin-top: 0">当前状态为：</span>
+            <label for="radio-7">
+                <#if detectInfo.detectIsMaintenance == 1>
+                    需要转入生产部门
+                </#if>
+                <#if detectInfo.detectIsMaintenance == 2>
+                    不需要转入生产部门
+                </#if>
+            </label>
+        </div>
+
+        <div class="input-box">
+            <span class="input-dic" style="margin-top: 0">转入生产部门</span>
+            <label for="radio-7">
+                <input type="radio" id="radio-1" name="detectIsMaintenance" onclick="show();" value="1" checked/>需要转入生产部门
+            </label>
+            <label for="radio-8" style="margin-left: 50px;">
+                <input type="radio" id="radio-2" name="detectIsMaintenance" onclick="hide();" value="2"/>不需要转入生产部门
+            </label>
+        </div>
+        <div class="input-box" id="revolutionProducedId">
+            <span class="input-dic" style="margin-top: 0">已转入生产部门</span>
+            <label for="radio-7">
+                <input type="radio" id="radio-3" name="detectRevolutionProduced" value="2"
+                <#if state == '2'>
+                       checked
+                </#if>/>已转入生产部门
+            </label>
+            <label for="radio-8" style="margin-left: 50px;">
+                <input type="radio" id="radio-4" name="detectRevolutionProduced" value="1"
+                <#if state == '1'>
+                       checked
+                </#if>/>未转入生产部门
+            </label>
+        </div>
+
+        <div class="input-box"   style="text-align:center;">
+            <span class="input-dic spanhidth">备注</span>
+            <textarea rows="5" cols="20" name="detectDesc" id="detectDesc" class="my-textarea" placeholder="请详细备注签收的内容，便于以后复查。如果转入生产，则生产部门同事可查看！">${detectInfo.detectDesc!''}</textarea>
+
+        </div>
+        <div style="text-align:center;">
+            <span>如果转入生产，则生产部门同事可查看！</span>
+        </div>
+        <div style="text-align:center;">
+
+            <input type="hidden" value="${detectId!''}" id="detectId" name="detectId">
+           <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">
+
+    function hide() {
+        $("#revolutionProducedId").hide();
+    }
+    function show() {
+        $("#revolutionProducedId").show();
+    }
+
+    function  add() {
+        var detectDesc = $("#detectDesc").val();
+        if( detectDesc != null){
+            if( detectDesc.length > 200 ){
+                layer.msg('备注长度不得大于100个字符',{icon: 5,time:1000});
+                return;
+            }
+        }
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/detect/add_remark",
+            data:$('#form-admin-add').serialize(),// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg('修改成功',{icon: 1,time:1000},function () {
+                        location.replace(location.href);
+                    });
+                } else {
+                    layer.msg('修改失败',{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('修改错误',{icon: 5,time:1000});
+            }
+        });
+    }
+</script>
+</body>
+</html>