浏览代码

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

liuzhiwei 7 年之前
父节点
当前提交
25532edf12

+ 292 - 0
watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerCommon.java

@@ -0,0 +1,292 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * wxm 客诉处理公共类
+ */
+public class CustomerCommon implements Serializable {
+
+    private static final long serialVersionUID = -4259088710780733418L;
+    //换新/维修、主键
+    private Integer relationId;
+    //客诉基本信息主键 
+    private Integer customerId;
+    //订单id 
+    private Integer orderId;
+    //仓储任务(签收id) 
+    private Integer signclosedId;
+    //发出Efast订单号 
+    private String relationBackEfastOrderId;
+    //寄回状态  1:未寄回  2:已寄回  3:已收货 
+    private Integer relationBackStatus;
+    //寄回人姓名 
+    private String relationBackName;
+    //寄回人电话 
+    private String relationBackTel;
+    //寄回物流公司 
+    private String relationBackLogisticsCompany;
+    //寄回物流单号 
+    private String relationBackLogisticsNo;
+    //寄回邮费 单位为分 
+    private Integer relationBackPostage;
+    //寄回机器编号 
+    private String relationBackMachineNo;
+    //寄送状态  1:未寄送  2:已寄送  3:已收货 
+    private Integer relationSendStatus;
+    //寄送人姓名 
+    private String relationSendName;
+    //寄送人电话 
+    private String relationSendTel;
+    //寄送地址-省 
+    private Integer provinceNumber;
+    //寄送地址-市 
+    private Integer cityNumber;
+    //寄送地址-区 
+    private Integer areaNumber;
+    //寄送地址-省市区 
+    private String relationSendMergeAddress;
+    //寄送地址-详细地址 
+    private String relationSendAddress;
+    //寄送物流公司 
+    private String relationSendLogisticsCompany;
+    //寄送物流单号 
+    private String relationSendLogisticsNo;
+    //备注 
+    private String relationDesc;
+    //状态    1:使用中  2:停用中 
+    private Integer relationState;
+    //转账账户 
+    private String relationAlipay;
+    //是否已转账邮费  0:不需要 1:已转  2:待转 
+    private Integer relationIsTransfer;
+    //创建时间 
+    private Date relationCreateTime;
+    // 修改时间,
+    private Date relationUpdateTime;
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public Integer getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Integer customerId) {
+        this.customerId = customerId;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getSignclosedId() {
+        return signclosedId;
+    }
+
+    public void setSignclosedId(Integer signclosedId) {
+        this.signclosedId = signclosedId;
+    }
+
+    public String getRelationBackEfastOrderId() {
+        return relationBackEfastOrderId;
+    }
+
+    public void setRelationBackEfastOrderId(String relationBackEfastOrderId) {
+        this.relationBackEfastOrderId = relationBackEfastOrderId;
+    }
+
+    public Integer getRelationBackStatus() {
+        return relationBackStatus;
+    }
+
+    public void setRelationBackStatus(Integer relationBackStatus) {
+        this.relationBackStatus = relationBackStatus;
+    }
+
+    public String getRelationBackName() {
+        return relationBackName;
+    }
+
+    public void setRelationBackName(String relationBackName) {
+        this.relationBackName = relationBackName;
+    }
+
+    public String getRelationBackTel() {
+        return relationBackTel;
+    }
+
+    public void setRelationBackTel(String relationBackTel) {
+        this.relationBackTel = relationBackTel;
+    }
+
+    public String getRelationBackLogisticsCompany() {
+        return relationBackLogisticsCompany;
+    }
+
+    public void setRelationBackLogisticsCompany(String relationBackLogisticsCompany) {
+        this.relationBackLogisticsCompany = relationBackLogisticsCompany;
+    }
+
+    public String getRelationBackLogisticsNo() {
+        return relationBackLogisticsNo;
+    }
+
+    public void setRelationBackLogisticsNo(String relationBackLogisticsNo) {
+        this.relationBackLogisticsNo = relationBackLogisticsNo;
+    }
+
+    public Integer getRelationBackPostage() {
+        return relationBackPostage;
+    }
+
+    public void setRelationBackPostage(Integer relationBackPostage) {
+        this.relationBackPostage = relationBackPostage;
+    }
+
+    public String getRelationBackMachineNo() {
+        return relationBackMachineNo;
+    }
+
+    public void setRelationBackMachineNo(String relationBackMachineNo) {
+        this.relationBackMachineNo = relationBackMachineNo;
+    }
+
+    public Integer getRelationSendStatus() {
+        return relationSendStatus;
+    }
+
+    public void setRelationSendStatus(Integer relationSendStatus) {
+        this.relationSendStatus = relationSendStatus;
+    }
+
+    public String getRelationSendName() {
+        return relationSendName;
+    }
+
+    public void setRelationSendName(String relationSendName) {
+        this.relationSendName = relationSendName;
+    }
+
+    public String getRelationSendTel() {
+        return relationSendTel;
+    }
+
+    public void setRelationSendTel(String relationSendTel) {
+        this.relationSendTel = relationSendTel;
+    }
+
+    public Integer getProvinceNumber() {
+        return provinceNumber;
+    }
+
+    public void setProvinceNumber(Integer provinceNumber) {
+        this.provinceNumber = provinceNumber;
+    }
+
+    public Integer getCityNumber() {
+        return cityNumber;
+    }
+
+    public void setCityNumber(Integer cityNumber) {
+        this.cityNumber = cityNumber;
+    }
+
+    public Integer getAreaNumber() {
+        return areaNumber;
+    }
+
+    public void setAreaNumber(Integer areaNumber) {
+        this.areaNumber = areaNumber;
+    }
+
+    public String getRelationSendMergeAddress() {
+        return relationSendMergeAddress;
+    }
+
+    public void setRelationSendMergeAddress(String relationSendMergeAddress) {
+        this.relationSendMergeAddress = relationSendMergeAddress;
+    }
+
+    public String getRelationSendAddress() {
+        return relationSendAddress;
+    }
+
+    public void setRelationSendAddress(String relationSendAddress) {
+        this.relationSendAddress = relationSendAddress;
+    }
+
+    public String getRelationSendLogisticsCompany() {
+        return relationSendLogisticsCompany;
+    }
+
+    public void setRelationSendLogisticsCompany(String relationSendLogisticsCompany) {
+        this.relationSendLogisticsCompany = relationSendLogisticsCompany;
+    }
+
+    public String getRelationSendLogisticsNo() {
+        return relationSendLogisticsNo;
+    }
+
+    public void setRelationSendLogisticsNo(String relationSendLogisticsNo) {
+        this.relationSendLogisticsNo = relationSendLogisticsNo;
+    }
+
+    public String getRelationDesc() {
+        return relationDesc;
+    }
+
+    public void setRelationDesc(String relationDesc) {
+        this.relationDesc = relationDesc;
+    }
+
+    public Integer getRelationState() {
+        return relationState;
+    }
+
+    public void setRelationState(Integer relationState) {
+        this.relationState = relationState;
+    }
+
+    public String getRelationAlipay() {
+        return relationAlipay;
+    }
+
+    public void setRelationAlipay(String relationAlipay) {
+        this.relationAlipay = relationAlipay;
+    }
+
+    public Integer getRelationIsTransfer() {
+        return relationIsTransfer;
+    }
+
+    public void setRelationIsTransfer(Integer relationIsTransfer) {
+        this.relationIsTransfer = relationIsTransfer;
+    }
+
+    public Date getRelationCreateTime() {
+        return relationCreateTime;
+    }
+
+    public void setRelationCreateTime(Date relationCreateTime) {
+        this.relationCreateTime = relationCreateTime;
+    }
+
+    public Date getRelationUpdateTime() {
+        return relationUpdateTime;
+    }
+
+    public void setRelationUpdateTime(Date relationUpdateTime) {
+        this.relationUpdateTime = relationUpdateTime;
+    }
+}

+ 20 - 0
watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -384,6 +384,26 @@ public class AdminCustomerController {
         }
     }
 
+    /**
+     * 添加客诉
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:add:customer")
+    @RequestMapping("/save_customer")
+    public ResponseJson addCustomer(HttpServletRequest request,CustomerInfo customerInfo) {
+
+
+
+//        if (produceFittingsList != null && produceFittingsList.size()> 0) {
+//
+//        } else {
+//        }
+        return new ResponseJson(500, "查询失败!", 500);
+    }
+
+
 
 
     /**

+ 80 - 17
watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -60,7 +60,7 @@
 </nav>
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">
-        <form action="" method="post" class="form form-horizontal" id="form-customer-add">
+        <form action="${path}/admin/customer/save_customer" method="post" class="form form-horizontal" id="form-customer-add">
             <div class="row cl">
 
                 <label class="form-label col-3">
@@ -82,17 +82,17 @@
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>来源入口:</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
-                        <input type="radio" id="tel-1" name="sex" datatype="*"  checked nullmsg="请选择来源入口!">
+                        <input type="radio" id="tel-1" name="customerSourceType" value="1" datatype="*"  checked nullmsg="请选择来源入口!">
                         <label for="tel-1">400电话</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-2" name="sex">
+                        <input type="radio" id="tel-2" name="customerSourceType" value="2">
                         <label for="tel-2">微信公众号</label>
                     </div>
                     <div class="radio-box">
-                        <input type="radio" id="tel-3" name="sex">
+                        <input type="radio" id="tel-3" name="customerSourceType" value="3">
                         <label for="tel-3">其他</label>
-                        <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" value="" placeholder="" id="" name="">
+                        <input type="text" style="width: 150px;margin-left: 10px;" class="input-text" value="" placeholder="" id="customerSource" name="customerSource">
                     </div>
                 </div>
             </div>
@@ -161,7 +161,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>问题内容:</label>
                 <div class="formControls col-5 col-sm-5">
-                    <textarea name="" cols="" rows="2" class="textarea" placeholder="说点什么..." id="answer-textarea"></textarea>
+                    <script id="describeContent" type="text/plain" style="width:650px;height:250px;"></script>
                 </div>
             </div>
             <div class="row cl">
@@ -304,7 +304,7 @@
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>换新产品:</label>
                 <div class="formControls col-9 col-sm-9 text-c" id="produceSelect">
 
-                    <table class="table table-border table-bg table-bordered">
+                    <#--<table class="table table-border table-bg table-bordered">
                         <thead>
                             <tr class="text-c">
                                 <th style="text-align: center;" width="60">产品名称</th>
@@ -338,7 +338,7 @@
                             </tr>
                         </tbody>
                     </table>
-
+-->
                 </div>
             </div>
 
@@ -392,7 +392,7 @@
                 <label class="form-label col-1 col-sm-1">更换产品:</label>
                 <div class="formControls col-7 col-sm-7" id="back-product">
 
-                    <table class="table table-border table-bg table-bordered">
+                   <#-- <table class="table table-border table-bg table-bordered">
                         <thead>
                         <tr class="text-c">
                             <th style="text-align: center;" width="60">产品名称</th>
@@ -425,7 +425,7 @@
                             </td>
                         </tr>
                         </tbody>
-                    </table>
+                    </table>-->
 
                 </div>
 
@@ -433,7 +433,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>处理描述:</label>
                 <div class="formControls col-5 col-sm-5">
-                    <textarea name="" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
+                    <script id="describeHandleDesc" type="text/plain" style="width:1024px;height:300px;"></script>
                 </div>
             </div>
             <div class="row cl">
@@ -500,7 +500,7 @@
             </div>
             <div class="row cl">
                 <div class="col-2 col-sm-2 col-offset-3">
-                    <button onClick="save_submit();" class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
+                    <button class="btn btn-block btn-primary size-XL" type="submit">确认录入</button>
                 </div>
             </div>
         </form>
@@ -515,6 +515,12 @@
 <script type="text/javascript" src="${path}/common/lib/cm.lib/airCity.js"></script>
 <#--<script type="text/javascript" src="${path}/common/lib/cm.lib/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
+
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.config.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.all.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/ueditor.parse.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/lib/ueditor/1.4.3/lang/zh-cn/zh-cn.js"></script>
+
 <script type="text/javascript">
     $(function(){
         $("#province").ProvinceCity();
@@ -533,11 +539,20 @@
     });
 
     $(document).on('click', '.dalog-ask .answer', function() {
-        $("#answer-textarea").text($(this).find("span").text());
+        var msg = $(this).find("span").text();
+        UE.getEditor('describeContent').setContent(msg,false);
+
+        //$("#answer-textarea").text();
         //$(".dalog-ask").hide(); 隐藏qa
     });
 
 </script>
+<script>
+    /*问题描述*/
+    var describeContent = UE.getEditor('describeContent');
+    /*处理描述*/
+    var describeHandleDesc = UE.getEditor('describeHandleDesc');
+</script>
 <script type="text/javascript">
 
     /*处理结果的执行状态*/
@@ -1391,18 +1406,66 @@
         $("#back-product").html(html);
     }
 
-    /* 添加客诉 */
-    function addCustomer(){
+</script>
+<script>
+    $(function(){
+        $("#form-bom-add").Validform({
+            tiptype: function (msg, o, cssctl) {
+                if (o.type == 3) {//失败
+                    layer.msg(msg, {icon: 5, time: 3000});
+                    $(window).scrollTop(o.obj.offset().top - 40);
+                }
+            },
+            datatype: {//自定义验证类型
+                "select": function (gets, obj, curform, regxp) {
+                    if (gets == "") {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+            },
+            ignoreHidden: true,
+            tipSweep: true, //若为true,则只在表单提交时验证
+            ajaxPost: true, //异步提交
+            beforeCheck: function (curform) {  //验证通过之前执行的函数
+            },
+            beforeSubmit: function (curform) {  //验证通过之后执行的函数
+
+            },
+            callback: function (data) {//异步回调函数
+                if (data) {
+                    var index = layer.alert(data.resultMsg, function () {
+                        if (data.resultCode == 200) {
+                            location.href = "${path}/admin/bom/_bom_list";
+                        } else {
+                            layer.close(index);
+                        }
+                    });
+                }
+            }
+        });
+    })
 
 
+    /* 添加客诉 */
+    function save_submit(){
+        var customerSourceType = $("input[name='customerSourceType']:checked").val();
+        if(customerSourceType == 3){
+            var customerSource = $("#customerSource").val();
+            if(customerSource == null || customerSource ==""){
+                showErrorMsg($("#customerSource"),"请输入来源入口!");
+            }
+        }
     }
 
     /*提示错误信息*/
     function showErrorMsg(node,msg){
-
+        node.select();
+        layer.msg(msg, {icon: 2, time: 2000});
     }
-    
 </script>
+
 <!--/请在上方写此页面业务相关的脚本-->
 </body>
 </html>