PTS列表添加导入导出功能

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSignclosedInfoService.java

@@ -35,6 +35,11 @@ public interface ComplaintSignclosedInfoService {
                              Map<String,Integer> alreadyFittingsMap);
 
     /**
+     * 修改单个签收记录
+     * @return
+     */
+    Integer updateSignclosedById(ComplaintSignclosedInfo record);
+    /**
      * 增加催促次数
      * @return
      */

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

@@ -197,6 +197,11 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     }
 
     @Override
+    public Integer updateSignclosedById(ComplaintSignclosedInfo record) {
+        return complaintSignclosedInfoMapper.updateSignclosedById(record);
+    }
+
+    @Override
     public int updateUrgedNumById(ComplaintSignclosedInfo complaintSignclosedInfo) {
         return complaintSignclosedInfoMapper.updateUrgedNumById(complaintSignclosedInfo);
     }

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

@@ -243,5 +243,60 @@ public class AdminSignclosedController {
         }
         return msg;
     }
+
+    /**
+     * 跳转到修改备注页面
+     *
+     * @return
+     */
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/to_update_remark")
+    public ModelAndView toUpdateRemark(HttpServletRequest request,Integer signclosedId) {
+        ModelAndView mv = new ModelAndView("cm/signclosed/update_remark");
+        ComplaintSignclosedInfo complaintSignclosedInfo = complaintSignclosedInfoService.getSignclosedById(signclosedId);
+        mv.addObject("signclosedId",signclosedId);
+        mv.addObject("complaintSignclosedInfo",complaintSignclosedInfo);
+        return mv;
+    }
+    /**
+     * 修改备注
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/update_remark")
+    public ResponseJson updateRemark(HttpServletRequest request,ComplaintSignclosedInfo signclosedInfo){
+        ResponseJson msg = new ResponseJson();
+        if(signclosedInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        Integer num = complaintSignclosedInfoService.updateSignclosedById(signclosedInfo);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
+
+    /**
+     * 跳转到修改寄件人信息页面
+     *
+     * @return
+     */
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/to_update_sender")
+    public ModelAndView toUpdateSender(HttpServletRequest request,Integer signclosedId) {
+        ModelAndView mv = new ModelAndView("cm/signclosed/update_sender");
+        ComplaintSignclosedInfo complaintSignclosedInfo = complaintSignclosedInfoService.getSignclosedById(signclosedId);
+        mv.addObject("signclosedId",signclosedId);
+        mv.addObject("complaintSignclosedInfo",complaintSignclosedInfo);
+        return mv;
+    }
 }
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -202,6 +202,14 @@
                            onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosedId!''}');">
                             <i class="Hui-iconfont">&#xe6df;</i>
                         </a>
+                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
+                           onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosedId!''}','570','450');">
+                            <i class="Hui-iconfont">&#xe692;</i>
+                        </a>
+                        <a style="text-decoration:none" href="javascript:;" title="修改寄件人信息"
+                           onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosedId!''}','570','450');">
+                            <i class="Hui-iconfont">&#xe60c;</i>
+                        </a>
                     </td>
                 </tr>
                 </#list>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/update_remark.ftl

@@ -0,0 +1,86 @@
+<!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: 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>
+            <#if complaintSignclosedInfo??>
+                <textarea rows="5" cols="20" name="signclosedDesc" id="signclosedDesc" class="my-textarea" placeholder="请详细备注">${complaintSignclosedInfo.signclosedDesc!''}</textarea>
+            <#else>
+                <textarea rows="5" cols="20" name="signclosedDesc" id="signclosedDesc" class="my-textarea" placeholder="请详细备注"></textarea>
+            </#if>
+        </div>
+        <div style="text-align:center;">
+        <#if signclosedId??>
+            <input type="hidden" value="${signclosedId!''}" id="signclosedId" name="signclosedId">
+        </#if>
+           <button type="button" class="my-btn-submit" onclick="update();">确认提交</button>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+
+
+    function  update() {
+        var signclosedDesc = $("#signclosedDesc").val();
+        if( signclosedDesc != null){
+            if( signclosedDesc.length > 200 ){
+                layer.msg('备注长度不得大于100个字符',{icon: 5,time:1000});
+                return;
+            }
+        }
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/signclosed/update_remark",
+            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/signclosed/update_sender.ftl

@@ -0,0 +1,185 @@
+<!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: 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;}
+        .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="row cl">
+            <label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>
+        </div>
+        <div class="row cl">
+            <label class=" col-3 col-sm-3 huanhang">寄件人姓名：</label>
+            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                    <span>
+                        ${complaintSignclosedInfo.signclosedSendName!''}
+                    </span>
+            </div>
+        </div>
+        <div class="row cl" style="position: relative;">
+            <label class="form-label col-3 col-sm-3 huanhang">寄件人电话：</label>
+            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                    <span>
+                    ${complaintSignclosedInfo.signclosedSendTel!''}
+                    </span>
+            </div>
+        </div>
+        <div class="row cl" style="position: relative;">
+            <label class="form-label col-3 col-sm-3 huanhang">物流公司：</label>
+            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                    <span>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "ems">邮政EMS</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "zto">中通快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "zjs">宅急送</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "yunda">韵达快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "pick">上门提货</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "htky">汇通快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
+                        <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>,
+                        ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
+                    </span>
+            </div>
+        </div>
+        <div class="row cl" style="position: relative;">
+            <label class="form-label col-3 col-sm-3" style="color: #0000cc;">现寄送信息</label>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-3 col-sm-3 huanhang"><span class="c-red">*</span>寄件人姓名：</label>
+            <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方姓名/公司名称" id="signclosedSendName" name="signclosedSendName">
+            </div>
+        </div>
+        <div class="row cl">
+            <label class="form-label col-3 col-sm-3 huanhang"><span class="c-red">*</span>寄件人电话：</label>
+            <div class="formControls col-4 col-sm-4 skin-minimal huanhang">
+                <input type="text" style="width: 150px;" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
+            </div>
+        </div>
+        <div class="row cl" style="position: relative;">
+            <label class="form-label col-3 col-sm-3 huanhang"><span class="c-red">*</span>物流信息：</label>
+            <div class="formControls col-3 col-sm-3 skin-minimal huanhang">
+                    <span class="select-box">
+                    <select name="signclosedLogistics" class="select">
+                        <option value="">请选择物流公司</option>
+                        <option value="sto">申通快递</option>
+                        <option value="yto">圆通快递</option>
+                        <option value="sf">顺丰快递</option>
+                        <option value="ems">邮政EMS</option>
+                        <option value="zto">中通快递</option>
+                        <option value="zjs">宅急送</option>
+                        <option value="yunda">韵达快递</option>
+                        <option value="cces">cces快递</option>
+                        <option value="pick">上门提货</option>
+                        <option value="htky">汇通快递</option>
+                        <option value="ttkdex">天天快递</option>
+                        <option value="stars">星晨急便</option>
+                        <option value="jd">京东快递</option>
+                        <option value="01">其他</option>
+                        <option value="02">上门送货</option>
+                    </select>
+                    </span>
+                <input type="text" style="width: 150px;" class="input-text" placeholder="物流单号" id="signclosedLogisticsNumber" name="signclosedLogisticsNumber">
+            </div>
+        </div>
+        <div style="text-align:center;">
+        <#if signclosedId??>
+            <input type="hidden" value="${signclosedId!''}" id="signclosedId" name="signclosedId">
+        </#if>
+            <button type="button" class="my-btn-submit" onclick="update();">确认提交</button>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+
+
+    function  update() {
+        var signclosedLogisticsNumber = $("#signclosedLogisticsNumber").val();
+        if( signclosedLogisticsNumber == null || signclosedLogisticsNumber == "" ){
+            layer.msg('物流单号不能为空',{icon: 5,time:1000});
+            return;
+        }
+        if( signclosedLogisticsNumber.length > 300 ){
+            layer.msg('物流单号长度不得大于20个字符',{icon: 5,time:1000});
+            return;
+        }
+        var signclosedSendName = $("#signclosedSendName").val();
+        if( signclosedSendName == null || signclosedSendName == "" ){
+            layer.msg('寄件人姓名不能为空',{icon: 5,time:1000});
+            return;
+        }
+        if( signclosedSendName.length > 10 ){
+            layer.msg('寄件人姓名长度不得大于10个字符',{icon: 5,time:1000});
+            return;
+        }
+        var signclosedSendTel = $("#signclosedSendTel").val();
+        if( signclosedSendTel == null || signclosedSendTel == "" ){
+            layer.msg('请输入寄件人电话',{icon: 5,time:1000});
+            return;
+        }
+        if( signclosedSendTel.length > 11 ){
+            layer.msg('寄件人电话长度不得大于11个字符',{icon: 5,time:1000});
+            return;
+        }
+        var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
+        if(!myreg.test(signclosedSendTel)){
+            layer.msg('寄件人电话格式不正确',{icon: 5,time:1000});
+            return;
+        }
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/signclosed/update_remark",
+            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/pts/machinePtras/parts_list.ftl

@@ -58,8 +58,9 @@
         </form>
         <form id="sourcefile" name="sourcefile" action=""  method="post" enctype="multipart/form-data" style="width: 42%;display: inline-block;">
             <input class="my-btn-search" data-loading-text="请勿重复提交" type="button" value="上传EXCEL" onClick="upPolicy()">
-            <input  id="source_file" name="sourceFile" type="file" value="" />
+            <input style="width: 125px;" id="source_file" name="sourceFile" type="file" value="" />
             <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="toExcel();">导出Excel</button>
+            <button type="button" style="cursor:pointer;" class="my-btn-search" onclick="downloadExcel();">下载模板</button>
         </form>
     </div>
 
@@ -203,6 +204,12 @@
     function toExcel(){
         window.location.href= "${path}/admin/machineParts/generation_excel";
     }
+    /**
+     * 下载模板
+     */
+    function downloadExcel(){
+        window.location.href= "${path}/common/images/uploadExcel/零件上传模板.xls";
+    }
 </script>
 </body>
 </html>