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

# Conflicts:
#	watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

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

@@ -202,6 +202,9 @@ public class CustomerInfo  implements Serializable {
     }
 
     private String salesOrderId;//订单号
+    private Integer customerTagId;//标记id
+    private String tagDesc;//标记内容
+    private Integer tagFlag;//标记旗帜1红、2黄、3绿、4蓝、5紫
     public Date getVisitDate() {
         return visitDate;
     }
@@ -1083,4 +1086,28 @@ public class CustomerInfo  implements Serializable {
     public void setSalesOrderId(String salesOrderId) {
         this.salesOrderId = salesOrderId;
     }
+
+    public Integer getCustomerTagId() {
+        return customerTagId;
+    }
+
+    public void setCustomerTagId(Integer customerTagId) {
+        this.customerTagId = customerTagId;
+    }
+
+    public String getTagDesc() {
+        return tagDesc;
+    }
+
+    public void setTagDesc(String tagDesc) {
+        this.tagDesc = tagDesc;
+    }
+
+    public Integer getTagFlag() {
+        return tagFlag;
+    }
+
+    public void setTagFlag(Integer tagFlag) {
+        this.tagFlag = tagFlag;
+    }
 }

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

@@ -0,0 +1,71 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class TagInfo implements Serializable {
+    private static final long serialVersionUID = 7809078241237330262L;
+    private Integer tagId;
+    private Integer tagAdminId;//标记人id
+    private Integer tagFlag;//标记旗帜1红、2黄、3绿、4蓝、5紫
+    private Integer tagCustomerId;//客诉id
+    private String tagDesc;//标记内容
+    private Date tagCreateTime;//
+    private String adminName;//标记人姓名
+
+    public Integer getTagId() {
+        return tagId;
+    }
+
+    public void setTagId(Integer tagId) {
+        this.tagId = tagId;
+    }
+
+    public Integer getTagAdminId() {
+        return tagAdminId;
+    }
+
+    public void setTagAdminId(Integer tagAdminId) {
+        this.tagAdminId = tagAdminId;
+    }
+
+    public Integer getTagFlag() {
+        return tagFlag;
+    }
+
+    public void setTagFlag(Integer tagFlag) {
+        this.tagFlag = tagFlag;
+    }
+
+    public Integer getTagCustomerId() {
+        return tagCustomerId;
+    }
+
+    public void setTagCustomerId(Integer tagCustomerId) {
+        this.tagCustomerId = tagCustomerId;
+    }
+
+    public String getTagDesc() {
+        return tagDesc;
+    }
+
+    public void setTagDesc(String tagDesc) {
+        this.tagDesc = tagDesc;
+    }
+
+    public Date getTagCreateTime() {
+        return tagCreateTime;
+    }
+
+    public void setTagCreateTime(Date tagCreateTime) {
+        this.tagCreateTime = tagCreateTime;
+    }
+
+    public String getAdminName() {
+        return adminName;
+    }
+
+    public void setAdminName(String adminName) {
+        this.adminName = adminName;
+    }
+}

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

@@ -372,4 +372,20 @@ public interface CustomerService {
      * @return
      */
     List<CustomerStatistics> selectCustomerStatistics(String month);
+    /**
+     * 添加标记旗帜记录
+     * @return
+     */
+    Integer addTag(TagInfo tagInfo);
+
+    /**
+     * 查询标记旗帜记录
+     * @return
+     */
+    List<TagInfo> listTag(TagInfo tagInfo);
+    /**
+     * 修改客诉绑定标记id
+     * @return
+     */
+    Integer updateCustomerTag(TagInfo tagInfo);
 }

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

@@ -1737,4 +1737,24 @@ public class CustomerServiceImpl implements CustomerService {
     public List<CustomerStatistics> selectCustomerStatistics(String month) {
         return customerInfoMapper.selectCustomerStatistics(month);
     }
+
+    @Transactional
+    @Override
+    public Integer addTag(TagInfo tagInfo) {
+        int s = customerInfoMapper.addTag(tagInfo);
+        if(s > 0){
+            customerService.updateCustomerTag(tagInfo);
+        }
+        return s;
+    }
+
+    @Override
+    public List<TagInfo> listTag(TagInfo tagInfo) {
+        return customerInfoMapper.listTag(tagInfo);
+    }
+
+    @Override
+    public Integer updateCustomerTag(TagInfo tagInfo) {
+        return customerInfoMapper.updateCustomerTag(tagInfo);
+    }
 }

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

@@ -258,4 +258,22 @@ public interface CustomerInfoMapper {
      * @return
      */
     List<CustomerStatistics> selectCustomerStatistics(String month);
+
+    /**
+     * 添加标记旗帜记录
+     * @return
+     */
+    Integer addTag(TagInfo tagInfo);
+
+    /**
+     * 查询标记旗帜记录
+     * @return
+     */
+    List<TagInfo> listTag(TagInfo tagInfo);
+
+    /**
+     * 修改客诉绑定标记id
+     * @return
+     */
+    Integer updateCustomerTag(TagInfo tagInfo);
 }

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

@@ -310,7 +310,9 @@
       cs.beContact as beContact,
       cs.completeMaintenanceNum as completeMaintenanceNum,
       cs.beenScrappedNum as beenScrappedNum,
-      cs.beenRenovatedNum as beenRenovatedNum
+      cs.beenRenovatedNum as beenRenovatedNum,
+      ti.tag_desc as tagDesc,
+      ti.tag_flag as tagFlag
       FROM
       tb_rst_cm_customer_info c
       LEFT JOIN (
@@ -418,6 +420,7 @@
       LEFT JOIN tb_rst_sales_order_info soi ON soi.sales_customer_id = c.customer_id
       LEFT JOIN tb_rst_complaint_signclosed cs ON cs.signclosed_customer_id = c.customer_id
       LEFT JOIN tb_rst_complaint_detect cd ON c.customer_id = cd.customer_id
+      LEFT JOIN tb_rst_cm_tag_info ti ON ti.tag_id = c.customer_tag_id
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
@@ -1695,4 +1698,55 @@ LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
         WHERE ci.customer_create_time &gt;= CONCAT(#{month},'-01') and ci.customer_create_time &lt;= CONCAT(#{month},'-31')
         group by rpt.type_name,pt.proc_type_name,pm.proc_method_name,	date_format(oi.sales_pay_time,'%Y-%m'),cq.question_name
     </select>
+
+    <!-- 标记表sql state -->
+    <insert id="addTag" parameterType="TagInfo" keyProperty="tagId" useGeneratedKeys="true">
+        INSERT into tb_rst_cm_tag_info
+        (
+        tag_admin_id,
+        tag_flag,
+        tag_customer_id,
+        tag_desc,
+        tag_create_time
+        )
+        VALUES
+        (
+        #{tagAdminId},
+        #{tagFlag},
+        #{tagCustomerId},
+        #{tagDesc},
+        NOW()
+        )
+    </insert>
+
+    <select id="listTag" parameterType="TagInfo" resultType="TagInfo">
+        select *,tb_rst_sys_admin.admin_name AS adminName from tb_rst_cm_tag_info
+        LEFT JOIN tb_rst_sys_admin on tb_rst_cm_tag_info.tag_admin_id  = tb_rst_sys_admin.admin_id
+        <where>
+            <if test="tagId != null and tagId != ''">
+                tag_id = #{tagId}
+            </if>
+            <if test="tagAdminId != null and tagAdminId != ''">
+                and tag_admin_id = #{tagAdminId}
+            </if>
+            <if test="tagFlag != null and tagFlag != ''">
+                and tag_flag = #{tagFlag}
+            </if>
+            <if test="tagCustomerId != null and tagCustomerId != ''">
+                and tag_customer_id = #{tagCustomerId}
+            </if>
+        </where>
+    </select>
+
+    <update id="updateCustomerTag" parameterType="TagInfo">
+        UPDATE tb_rst_cm_customer_info
+        <set>
+            <if test="tagId != null and tagId != ''" >
+                customer_tag_id = #{tagId}
+            </if>
+        </set>
+        WHERE
+        customer_id = #{tagCustomerId}
+    </update>
+    <!-- 标记表sql end -->
 </mapper>

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

@@ -22,7 +22,6 @@ import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.faces.sys.SysService;
-import com.iamberry.rst.util.CustomerCommonUtil;
 import com.iamberry.rst.util.SmsConfig;
 import com.iamberry.rst.utils.*;
 import com.iamberry.wechat.tools.NameUtils;
@@ -40,6 +39,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -2624,11 +2624,11 @@ public class AdminCustomerController {
     public ResponseJson getInformationInfo(HttpServletRequest request,Integer feeId){
         ResponseJson rj = new ResponseJson(200, "查询成功", 200);
         if(feeId == null){
-            return new ResponseJson(500, "查询成功，请检查参数!", 500);
+            return new ResponseJson(500, "查询失败，请检查参数!", 500);
         }
         InformationInfo informationInfo = customerService.getInformationInfo(feeId);
         if(informationInfo == null){
-            return new ResponseJson(500, "查询成功", 500);
+            return new ResponseJson(500, "查询失败", 500);
         }
         rj.addResponseKeyValue("informationInfo",informationInfo);
         return rj;
@@ -3242,5 +3242,60 @@ public class AdminCustomerController {
             //下载导出订单Excel
             downloadCustomerExcel(wb, downloadProgressInfo,path,"统计报表");
         }
+
+    /**
+     * 客诉标识列表
+     * @param request
+     * @param customerId
+     * @return
+     */
+    @RequestMapping("/to_tag_list")
+    public ModelAndView listTag(HttpServletRequest request,Integer customerId){
+        ModelAndView mv = new ModelAndView("cm/customer/tag_list");
+        if(customerId != null){
+            TagInfo tag = new TagInfo();
+            tag.setTagCustomerId(customerId);
+            List<TagInfo> listTag = customerService.listTag(tag);
+            mv.addObject("listTag",listTag);
+        }
+        return mv;
+    }
+    /**
+     * 进入添加客诉标识
+     * @param request
+     * @param customerId
+     * @return
+     */
+    @RequestMapping("/to_add_Tag")
+    public ModelAndView toAddTag(HttpServletRequest request,Integer customerId){
+        ModelAndView mv = new ModelAndView("cm/customer/add_tag");
+        TagInfo tag = new TagInfo();
+        tag.setTagCustomerId(customerId);
+        List<TagInfo> listTag = customerService.listTag(tag);
+        mv.addObject("listTag",listTag);
+        mv.addObject("customerId",customerId);
+        return mv;
+    }
+    /**
+     * 添加客诉标识
+     * @param request
+     * @param tagInfo
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/add_Tag")
+    public ResponseJson addTag(HttpServletRequest request,TagInfo tagInfo){
+        if(tagInfo == null || tagInfo.getTagCustomerId() == null){
+            return new ResponseJson(500, "查询失败，请检查参数!", 500);
+        }
+        //获取登录人id
+        Integer loginAdminId = AdminUtils.getLoginAdminId();
+        tagInfo.setTagAdminId(loginAdminId);
+        if(customerService.addTag(tagInfo) > 0){
+            return new ResponseJson(200, "添加成功", 200);
+        }else{
+            return new ResponseJson(500, "查询失败，请检查参数!", 500);
+        }
+    }
 }
 

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

@@ -231,6 +231,8 @@
 		<!--订单新增-->
 		<typeAlias type="com.iamberry.rst.core.order.CargoInfo" alias="CargoInfo"/>
 		<typeAlias type="com.iamberry.rst.core.order.OrderStatisticsInfo" alias="OrderStatisticsInfo"/>
+		<!-- 客诉新增-->
+		<typeAlias type="com.iamberry.rst.core.cm.TagInfo" alias="TagInfo"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_tag.ftl

@@ -0,0 +1,162 @@
+<!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;height: 34px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-11.png) right center no-repeat;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;}
+        .radio-box{display: inline-block;
+            box-sizing: border-box;
+            cursor: pointer;
+            position: relative;
+            padding-left: 20px;
+            padding-right: 20px;}
+    </style>
+    <meta name="keywords" content="${path}">
+    <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
+</head>
+<body>
+<article class="page-container">
+    <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+        <thead>
+        <tr class="text-c">
+            <th width="40">标记人</th>
+            <th width="80">标记时间</th>
+            <th width="40">标记旗帜</th>
+            <th width="80">标记内容</th>
+        </tr>
+        </thead>
+        <tbody>
+                <#if listTag?? &&  (listTag?size > 0) >
+                        <#list listTag as list>
+                        <tr>
+                            <td>${list.adminName!''}</td>
+                            <td>${(list.tagCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                            <td>
+                            <#if list.tagFlag??>
+                            <#if list.tagFlag == 1>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/hong.png">
+                            </#if>
+                            <#if list.tagFlag == 2>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/huang.png">
+                            </#if>
+                            <#if list.tagFlag == 3>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/lv.png">
+                            </#if>
+                            <#if list.tagFlag == 4>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/lan.png">
+                            </#if>
+                            <#if list.tagFlag == 5>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/zi.png">
+                            </#if>
+                            </#if>
+                            </td>
+                            <td>${list.tagDesc!''}</td>
+                        <tr>
+                        </#list>
+                <#else>
+                    <td colspan="4" class="td-manage text-c" >暂时没有标记信息，请添加！</td></tr>
+                </#if>
+        </tbody>
+    </table>
+    <form class="form form-horizontal" id="form-admin-add">
+        <div   style="text-align:center;">
+            <div class="row cl">
+                <label class="form-label col-2 col-sm-2"><span class="c-red">*</span>旗帜：</label>
+                <div class="formControls col-9 col-sm-9">
+                    <div class="radio-box">
+                        <input type="radio" value="1" id="tel-1" checked="checked" name="tagFlag">
+                        <label for="tel-1"><img style="width: 20px;height: 20px;" src="/common/images/cm/hong.png"></label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="2" id="tel-2" name="tagFlag">
+                        <label for="tel-2"><img style="width: 20px;height: 20px;" src="/common/images/cm/huang.png"></label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="3" id="tel-3" name="tagFlag">
+                        <label for="tel-3"><img style="width: 20px;height: 20px;" src="/common/images/cm/lv.png"></label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="4" id="tel-4" name="tagFlag">
+                        <label for="tel-4"><img style="width: 20px;height: 20px;" src="/common/images/cm/lan.png"></label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" value="5" id="tel-5" name="tagFlag">
+                        <label for="tel-5"><img style="width: 20px;height: 20px;" src="/common/images/cm/zi.png"></label>
+                    </div>
+                </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-2 col-sm-2"><span class="c-red">*</span>标记内容：</label>
+                <div class="formControls col-9 col-sm-9">
+                    <textarea rows="5" cols="20" name="tagDesc" id="tagDesc" class="my-textarea" placeholder="请填写标记内容"></textarea>
+                </div>
+            </div>
+        </div>
+        <div class="row cl">
+            <div class="col-4 col-sm-4 col-offset-3">
+                <button onClick="add();" class="btn btn-block btn-primary size-XL" type="button">确认添加</button>
+            </div>
+        </div>
+
+                <input type="hidden" value="${customerId!''}" id="tagCustomerId" name="tagCustomerId">
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+
+
+    function  add() {
+        var tagDesc = $("#tagDesc").val();
+        if( tagDesc != null){
+            if( tagDesc.length > 200 ){
+                layer.msg('标记内容不得大于200个字符',{icon: 5,time:1000});
+                return;
+            }
+        }else{
+            layer.msg('标记内容不能为空',{icon: 5,time:1000});
+            return;
+        }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/customer/add_Tag",
+            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/customer/custome_list.ftl

@@ -184,7 +184,26 @@
             <#if page.dataList?? &&  (page.dataList?size > 0) >
                     <#list page.dataList as customer>
                         <tr class="text-c">
-                            <td>${customer.customerId!''}</td>
+                            <td>
+                                <#if customer.tagFlag??>
+                                    <#if customer.tagFlag == 1>
+                                        <img style="width: 20px;height: 20px;" title="${customer.tagDesc!''}" onclick="openLogistics('查看标记记录','${path}/admin/customer/to_tag_list?customerId=${customer.customerId!''}','570','450');" src="/common/images/cm/hong.png"><br />
+                                    </#if>
+                                    <#if customer.tagFlag == 2>
+                                        <img style="width: 20px;height: 20px;" title="${customer.tagDesc!''}" onclick="openLogistics('查看标记记录','${path}/admin/customer/to_tag_list?customerId=${customer.customerId!''}','570','450');" src="/common/images/cm/huang.png"><br />
+                                    </#if>
+                                    <#if customer.tagFlag == 3>
+                                        <img style="width: 20px;height: 20px;" title="${customer.tagDesc!''}" onclick="openLogistics('查看标记记录','${path}/admin/customer/to_tag_list?customerId=${customer.customerId!''}','570','450');" src="/common/images/cm/lv.png"><br />
+                                    </#if>
+                                    <#if customer.tagFlag == 4>
+                                        <img style="width: 20px;height: 20px;" title="${customer.tagDesc!''}" onclick="openLogistics('查看标记记录','${path}/admin/customer/to_tag_list?customerId=${customer.customerId!''}','570','450');" src="/common/images/cm/lan.png"><br />
+                                    </#if>
+                                    <#if customer.tagFlag == 5>
+                                        <img style="width: 20px;height: 20px;" title="${customer.tagDesc!''}" onclick="openLogistics('查看标记记录','${path}/admin/customer/to_tag_list?customerId=${customer.customerId!''}','570','450');" src="/common/images/cm/zi.png"><br />
+                                    </#if>
+                                </#if>
+
+                                ${customer.customerId!''}</td>
                             <td>${customer.adminName!''}</td>
                             <td>${customer.customerName!''}
                                 <#if customer.customerWechatName?? >
@@ -386,6 +405,9 @@
                                 <a style="text-decoration:none" href="javascript:void(0)" title="查询品检信息" onclick="toDetect(${customer.customerId!''})">
                                     <font color=#06c>品检信息</font>
                                 </a><br/>-->
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="添加标记" onclick="openLogistics('查看标记记录','${path}/admin/customer/to_add_Tag?customerId=${customer.customerId!''}','770','550');">
+                                        <font color=#06c>添加标记</font>
+                                    </a><br/>
                             </td>
                         </tr>
                     </#list>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/tag_list.ftl

@@ -0,0 +1,117 @@
+<!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;height: 34px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-11.png) right center no-repeat;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   style="text-align:center;">
+            <table class="table table-border table-bg table-bordered">
+                <thead>
+                <tr class="text-c">
+                    <th width="40">标记人</th>
+                    <th width="80">标记时间</th>
+                    <th width="40">标记旗帜</th>
+                    <th width="80">标记内容</th>
+                </tr>
+                </thead>
+                <tbody>
+
+                    <#if listTag?? &&  (listTag?size > 0) >
+                        <#list listTag as list>
+                        <tr>
+                        <td>${list.adminName!''}</td>
+                        <td>${(list.tagCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                        <td>
+                        <#if list.tagFlag??>
+                            <#if list.tagFlag == 1>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/hong.png">
+                            </#if>
+                            <#if list.tagFlag == 2>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/huang.png">
+                            </#if>
+                            <#if list.tagFlag == 3>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/lv.png">
+                            </#if>
+                            <#if list.tagFlag == 4>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/lan.png">
+                            </#if>
+                            <#if list.tagFlag == 5>
+                                        <img style="width: 20px;height: 20px;"   src="/common/images/cm/zi.png">
+                            </#if>
+                        </#if>
+                        </td>
+                        <td>${list.tagDesc!''}</td>
+                        <tr>
+                        </#list>
+                    <#else>
+                        <td colspan="4" class="td-manage text-c" >暂时没有标记信息，请添加！</td></tr>
+                    </#if>
+                </tbody>
+            </table>
+        </div>
+    </form>
+</article>
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript">
+
+
+    function  update() {
+        var salesAdminRemark = $("#salesAdminRemark").val();
+        if( salesAdminRemark != null){
+            if( salesAdminRemark.length > 200 ){
+                layer.msg('备注长度不得大于100个字符',{icon: 5,time:1000});
+                return;
+            }
+        }
+
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/salesOrder/update_order_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/customer/update_relation.ftl

@@ -183,8 +183,8 @@
             </div>
 
                 <div class="row cl">
-                    <div class="formControls col-12 col-sm-12">
-                        <div class="formControls col-2 col-sm-2 text-r">
+                    <div class="formControls col-6 col-sm-6">
+                        <div class="formControls col-4 col-sm-4 text-r">
                             <strong>通知售前客服</strong>
                         </div>
                         <div class="radio-box">
@@ -196,8 +196,26 @@
                             <label for="tel-Notice2">否</label>
                         </div>
                     </div>
+
+
+                    <div id="sendbackPresaleAdminDiv">
+                        <div class="formControls col-4 col-sm-4">
+                            <div style="width: 100%;display: inline-block;margin-right: 10px;">
+                        <span class="select-box">
+                                <select name="sendbackPresaleAdminId" id="sendbackPresaleAdminId" class="select" seleType="send">
+                                    <#if adminlist?? &&  (adminlist?size > 0) >
+                                        <#list adminlist as admin>
+                                            <option value="${admin.adminId!''}" >${admin.adminName!''}</option>
+                                        </#list>
+                                    </#if>
+                                </select>
+                        </span>
+                            </div>
+                        </div>
+                    </div>
+
                 </div>
-                <div class="row cl" id="sendbackPresaleAdminDiv" <#--style="display: none;"-->>
+                <#--<div class="row cl" id="sendbackPresaleAdminDiv" &lt;#&ndash;style="display: none;"&ndash;&gt;>
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>售前客服</strong>
                     </div>
@@ -214,7 +232,7 @@
                         </span>
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="row cl" style="position: relative;" id="backUserInfo">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄回产品</strong>