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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSmallClassInfoService.java
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintTypeInfoService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintSmallClassInfoServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintTypeInfoServiceImpl.java

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

@@ -1,6 +1,9 @@
 package com.iamberry.rst.faces.cm;
 
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
+
+import java.util.List;
 
 /**
  * 客诉-客诉问题Service
@@ -21,4 +24,10 @@ public interface ComplaintQuestionInfoService {
      * @return
      */
     int updateQuestionById(ComplaintQuestionInfo record);
+
+    /**
+     * 查询所有客诉类型
+     * @return
+     */
+    List<ComplaintQuestionInfo> listComplaintQuestionInfo(ComplaintQuestionInfo complaintQuestionInfo);
 }

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

@@ -10,6 +10,8 @@ import com.iamberry.rst.service.cm.mapper.ComplaintQuestionInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ComplaintQuestionInfoServiceImpl implements ComplaintQuestionInfoService {
     @Autowired
@@ -29,4 +31,11 @@ public class ComplaintQuestionInfoServiceImpl implements ComplaintQuestionInfoSe
     public int updateQuestionById(ComplaintQuestionInfo record) {
         return complaintDetectInfoMapper.updateQuestionById(record);
     }
+
+    @Override
+    public List<ComplaintQuestionInfo> listComplaintQuestionInfo(ComplaintQuestionInfo complaintQuestionInfo) {
+        return complaintDetectInfoMapper.listComplaintQuestionInfo(complaintQuestionInfo);
+    }
+
+
 }

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

@@ -1,6 +1,9 @@
 package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
+
+import java.util.List;
+
 /**
  * 客诉-客诉问题mapper
  */
@@ -20,4 +23,10 @@ public interface ComplaintQuestionInfoMapper {
      * @return
      */
     int updateQuestionById(ComplaintQuestionInfo record);
+
+    /**
+     * 查询所有客诉类型
+     * @return
+     */
+    List<ComplaintQuestionInfo> listComplaintQuestionInfo(ComplaintQuestionInfo complaintQuestionInfo);
 }

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

@@ -28,6 +28,25 @@
     from tb_rst_complaint_question
     where question_id = #{questionId,jdbcType=INTEGER}
   </select>
+
+  <select id="listComplaintQuestionInfo" resultMap="BaseResultMap" parameterType="ComplaintQuestionInfo" >
+    select
+    question_id, small_class_id, question_name, question_state, question_is_qc_detect,question_profile,
+    question_create_time, question_update_time
+    from tb_rst_complaint_question
+    <where>
+      <if test="smallClassId !=null">
+        AND small_class_id = #{smallClassId}
+      </if>
+      <if test="questionName !=null and questionName !=''">
+        AND question_name like CONCAT('%',#{questionName},'%')
+      </if>
+      AND question_state = 1
+    </where>
+    ORDER BY question_create_time DESC
+    limit 0,3
+  </select>
+
   <insert id="insert" parameterType="ComplaintQuestionInfo" >
     insert into tb_rst_complaint_question (question_id, small_class_id, question_name, 
       question_state, question_is_qc_detect, question_create_time, 

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

@@ -26,6 +26,12 @@
     select
     <include refid="Base_Column_List" />
     from tb_rst_complaint_small_class
+    <where>
+      <if test="complaintId !=null">
+        AND complaint_id = #{complaintId}
+      </if>
+      AND small_class_state = 1
+    </where>
   </select>
 
   <insert id="insert" parameterType="ComplaintSmallClassInfo" >

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

@@ -25,6 +25,12 @@
     select
     <include refid="Base_Column_List" />
     from tb_rst_complaint_type
+    <where>
+      <if test="complaintConsultingType !=null">
+        AND complaint_consulting_type = #{complaintConsultingType}
+      </if>
+      AND complaint_class_state = 1
+    </where>
   </select>
 
 

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

@@ -60,6 +60,19 @@ public class AdminCustomerController {
         return mv;
     }
 
+    /**
+     * 客诉搜索订单列表
+     *
+     * @return
+     */
+    @RequiresPermissions("customer:add:customer")
+    @RequestMapping(value = "/select_order")
+    public ModelAndView selectOrder(HttpServletRequest request) {
+        ModelAndView mv = new ModelAndView("cm/customer/order_list");
+
+
+        return mv;
+    }
 
 
 

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

@@ -1,7 +1,9 @@
 package com.iamberry.rst.controllers.cm;
 
+import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
 import com.iamberry.rst.core.cm.ComplaintSmallClassInfo;
 import com.iamberry.rst.core.cm.ComplaintTypeInfo;
+import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
 import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -24,27 +26,37 @@ public class ComplaintQuestionInfoController {
     @Autowired
     private ComplaintTypeInfoService complaintTypeInfoService;
 
-//    @Autowired
-//    private ComplaintSmallClassInfoService complaintSmallClassInfoService;
-
     @Autowired
     private ComplaintSmallClassInfoService complaintSmallClassInfoService;
 
+    @Autowired
+    private ComplaintQuestionInfoService complaintQuestionInfoService;
+
     /**
      * 查询所有问题类型
      *
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/list_complaintTypeInfo")
+    @RequestMapping(value = "/list_complaintType")
     public ResponseJson listComplaintTypeInfo(HttpServletRequest request) {
+        ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
+        String complaintConsultingTypeOther =  request.getParameter("complaintConsultingType");
 
-        List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(new ComplaintTypeInfo());
+        //咨询类型
+        if (complaintConsultingTypeOther != null && !"".equals(complaintConsultingTypeOther)) {
+            Integer complaintConsultingType = Integer.valueOf(complaintConsultingTypeOther);
+            complaintTypeInfo.setComplaintConsultingType(complaintConsultingType);
+        }
+
+        List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(complaintTypeInfo);
 
         if (complaintTypeInfoList == null || complaintTypeInfoList.size() < 1) {
-            return new ResponseJson(500, "添加失败", 500);
+            return new ResponseJson(500, "查询失败", 500);
         } else {
-            return new ResponseJson(200, "添加成功", 200);
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("complaintTypeInfoList", complaintTypeInfoList);
+            return rj;
         }
     }
 
@@ -54,13 +66,15 @@ public class ComplaintQuestionInfoController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/list_complaintSmallClassInfo")
+    @RequestMapping(value = "/list_complaintSmallClass")
     public ResponseJson listComplaintSmallClassInfo(HttpServletRequest request,ComplaintSmallClassInfo complaintSmallClassInfo) {
         List<ComplaintSmallClassInfo> complaintSmallClassInfoList = complaintSmallClassInfoService.listComplaintSmallClassInfo(complaintSmallClassInfo);
         if (complaintSmallClassInfoList == null || complaintSmallClassInfoList.size() < 1) {
-            return new ResponseJson(500, "添加失败", 500);
+            return new ResponseJson(500, "查询失败", 500);
         } else {
-            return new ResponseJson(200, "添加成功", 200);
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("complaintSmallClassInfoList", complaintSmallClassInfoList);
+            return rj;
         }
     }
 
@@ -71,16 +85,18 @@ public class ComplaintQuestionInfoController {
      */
     @ResponseBody
     @RequestMapping(value = "/list_complaintQuestion")
-    public ResponseJson listComplaintQuestion(HttpServletRequest request,ComplaintTypeInfo complaintTypeInfo) {
-
-        List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintTypeInfo(complaintTypeInfo);
-
-        if (complaintTypeInfoList == null || complaintTypeInfoList.size() < 1) {
-            return new ResponseJson(500, "添加失败", 500);
+    public ResponseJson listComplaintQuestion(HttpServletRequest request,ComplaintQuestionInfo complaintQuestionInfo) {
+        List<ComplaintQuestionInfo> complaintQuestionInfoList = complaintQuestionInfoService.listComplaintQuestionInfo(complaintQuestionInfo);
+        if (complaintQuestionInfoList == null || complaintQuestionInfoList.size() < 1) {
+            return new ResponseJson(500, "查询失败", 500);
         } else {
-            return new ResponseJson(200, "添加成功", 200);
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("complaintQuestionInfoList", complaintQuestionInfoList);
+            return rj;
         }
     }
 
 
+
+
 }

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

@@ -102,7 +102,7 @@
                 <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-3" name="tel" datatype="*" nullmsg="请选择来源入口！">
+                        <input type="radio" id="tel-3" name="customerCounselType" datatype="*" nullmsg="请选择咨询类型！">
                         <label for="tel-3">售前咨询</label>
                     </div>
                     <div class="radio-box">
@@ -114,22 +114,22 @@
             <div class="row cl" style="position: relative;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>客诉问题：</label>
                 <div class="formControls col-2 col-sm-2"> <span class="select-box">
-				<select name="" class="select">
-					<option value="0">使用操作</option>
-					<option value="1">使用操作</option>
+				<select name="complaintId" class="select">
+					<#--<option value="0">使用操作</option>-->
+					<#--<option value="1">使用操作</option>-->
 				</select>
 				</span>
                 </div>
                 <div class="formControls col-2 col-sm-2"> <span class="select-box">
-				<select name="" class="select">
-					<option value="0">使用操作制水出水</option>
-					<option value="1">使用操作制水出水</option>
+				<select name="smallClassId" class="select">
+					<#--<option value="0">使用操作制水出水</option>
+					<option value="1">使用操作制水出水</option>-->
 				</select>
 				</span>
                 </div>
                 <div class="formControls col-2 col-sm-2">
                     <div class="clearfix">
-                        <input type="text" placeholder="搜索关键词" class="input-text  ac_input" name="search_text" value="" id="search_text" autocomplete="off" style="width:60%"><button type="button" class="btn btn-primary" id="search_button">搜索</button>
+                        <input type="text" placeholder="搜索关键词" class="input-text  ac_input" name="questionId" value="" id="search_text" autocomplete="off" style="width:60%"><button type="button" class="btn btn-primary" id="search_button">搜索</button>
                     </div>
                 </div>
 
@@ -137,8 +137,8 @@
                     <div class="tag">
                         <em></em>
                         <strong>相关QA</strong>
-                        <ul>
-                            <li class="ask">1、净水机面板操作不灵敏，是怎么回事？</li>
+                        <ul id="question">
+                            <#--<li class="ask">1、净水机面板操作不灵敏，是怎么回事？</li>
                             <li class="answer">答：<span>1净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
                             <li class="ask">2、净水机面板操作不灵敏，是怎么回事？</li>
                             <li class="answer">答：<span>2净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
@@ -146,7 +146,7 @@
                             <li class="answer">答：<span>3净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
                             <li class="ask">4、净水机面板操作不灵敏，是怎么回事？</li>
                             <li class="answer">答：<span>4净水机面板操作不灵敏，是怎么回事。1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？1、净水机面板操作不灵敏，是怎么回事？</span></li>
-                        </ul>
+-->                        </ul>
                     </div>
                 </div>
 
@@ -224,7 +224,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>订单信息：</label>
                 <div class="formControls col-1 col-sm-1">
-                    <button type="button" class="btn btn-primary">搜索订单</button>
+                    <button type="button" class="btn btn-primary" id="selectOrder">搜索订单</button>
                 </div>
             </div>
             <div class="row cl">
@@ -437,13 +437,11 @@
 
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/webuploader/0.1.5/webuploader.min.js"></script>
-
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>
-
 <script type="text/javascript" src="${path}/common/lib/cm.lib/jquery.provincesCity.js"></script>
 <script type="text/javascript" src="${path}/common/lib/cm.lib/provincesData.js"></script>
 <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/dimensions.js"></script>-->
 <script type="text/javascript" src="${path}/common/lib/cm.lib/suggest.js"></script>
 <script type="text/javascript">
     $(function(){
@@ -466,9 +464,7 @@
         });
 //$("#city2").suggest(citys,{hot_list:commoncitys,attachObject:"#suggest2"})
     });
-    $(document).on('click', '#search_button', function() {
-        $(".dalog-ask").show();
-    });
+
     $(document).on('click', '.dalog-ask .answer', function() {
         $("#answer-textarea").text($(this).find("span").text());
     });
@@ -476,29 +472,142 @@
 </script>
 <script type="text/javascript">
 
+
+
     /*初始化页面参数*/
     $(function () {
+
         /*初始化问题分类*/
         initComplaintTypeInfo();
+
+        /*监听问题类型 选择事件*/
+        $("[name='complaintId']").change(function(){
+            initComplaintSmallClassInfo($(this).val());
+        })
+
+        /*监听问题关键字搜索*/
+        $(document).on('click', '#search_button', function() {
+            initComplaintQuestionInfo();
+        });
+
+        /*搜索订单事件*/
+        $(document).on('click', '#selectOrder', function() {
+            selectOrder();
+        });
     })
 
     /*初始化问题大类*/
     function initComplaintTypeInfo() {
+        //默认为售前咨询
+        var customerCounselTypeOverall = 1;
+        var html = "";
+        $.ajax({
+            type: "POST",
+            data: {
+                complaintConsultingType : customerCounselTypeOverall
+            },
+            url: "${path}/admin/complaintQuestion/list_complaintType",
+            async: false,
+            success: function(data){
+                var id;
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.complaintTypeInfoList.length;i++){
+                        var complaintTypeInfo = data.returnMsg.complaintTypeInfoList[i];
+                        if(i == 0 ){
+                            id = complaintTypeInfo.complaintId;
+                        }
+                        html += '<option value="'+ complaintTypeInfo.complaintId +'">'+ complaintTypeInfo.complaintClassName +'</option>';
+                    }
+                }else{
+                    html = '';
+                }
+                $("[name='complaintId']").html(html);
+                initComplaintSmallClassInfo(id)
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
+
+    /*显示小类*/
+    function initComplaintSmallClassInfo(complaintId){
+        var html = "";
         $.ajax({
             type: "POST",
-            data: {},
-            url: "${path}/admin/customer/select_complaintQuestion",
+            data: {
+                complaintId : complaintId
+            },
+            url: "${path}/admin/complaintQuestion/list_complaintSmallClass",
             async: false,
             success: function(data){
                 if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.complaintSmallClassInfoList.length;i++){
+                        var ComplaintSmallClassInfo = data.returnMsg.complaintSmallClassInfoList[i];
+                        html += '<option value="'+ ComplaintSmallClassInfo.smallClassId +'">'+ ComplaintSmallClassInfo.smallClassName +'</option>';
+                    }
+                }else{
+                    html = '';
+                }
+                $("[name='smallClassId']").html(html);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
 
+    /**
+     * 搜索QA 显示
+     */
+    function initComplaintQuestionInfo(){
+        var complaintId = $("[name='complaintId']").val();
+        var smallClassId = $("[name='smallClassId']").val();;
+        var questionName = $("[name='questionId']").val();;;
+        var html = "";
+        $.ajax({
+            type: "POST",
+            data: {
+                complaintId : complaintId,
+                smallClassId : smallClassId,
+                questionName : questionName
+            },
+            url: "${path}/admin/complaintQuestion/list_complaintQuestion",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.complaintQuestionInfoList.length;i++){
+                        var complaintQuestion= data.returnMsg.complaintQuestionInfoList[i];
+                        html += '<li class="ask">'+ complaintQuestion.questionName +'</li>' +
+                                '<li class="answer" style="height: 65px;overflow: hidden;">答：<span>'+ complaintQuestion.questionProfile +'</span></li>';
+                    }
+                }else{
+                    html = '';
                 }
+                $("#question").html(html);
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){
             }
         });
+        $(".dalog-ask").show();
     }
 
+    /**
+     * 发送短信
+     * @param phone  手机号码
+     * @param desc   发送内容
+     * @param node   返回结果显示节点
+     */
+    function sendPhone(phone,desc,node){
+
+    }
+
+    /*搜索订单框*/
+    function selectOrder(){
+        layer_show("搜索订单","${path}/admin/customer/select_order","800","350");
+    }
+
+
 </script>
 <!--/请在上方写此页面业务相关的脚本-->
 </body>

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

@@ -0,0 +1,140 @@
+<!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" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+<#include "/base/list_base.ftl">
+    <title>客诉列表</title>
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #e2f6ff;}
+        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>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 客诉管理
+    <span class="c-gray en">&gt;</span> 客诉列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <div class="text-c">
+        <form action="${path}/admin/customer/_customer_list" method="post">
+            <div class="row cl">
+                <div class="formControls col-4 col-sm-4" style="width: 150px;"> <span class="select-box">
+                    <select name="" class="select">
+                        <option value="0">薇薇</option>
+                        <option value="1">薇薇</option>
+                        <option value="11">薇薇</option>
+                        <option value="12">薇薇</option>
+                        <option value="13">薇薇</option>
+                    </select>
+                    </span>
+                </div>
+                <div class="formControls col-4 col-sm-4" style="width: 150px;"> <span class="select-box">
+                    <select name="" class="select">
+                        <option value="0">薇薇</option>
+                        <option value="1">薇薇</option>
+                        <option value="11">薇薇</option>
+                        <option value="12">薇薇</option>
+                        <option value="13">薇薇</option>
+                    </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <input type="text" class="input-text" value="" placeholder="请输入手机号" id="" name="">
+                </div>
+                <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+            </div>
+        </form>
+    </div>
+
+    <#--<div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+        <thead>
+        <tr class="text-c">
+            &lt;#&ndash;<th width="50">Customer编号</th>&ndash;&gt;
+            <th width="60">所属产品</th>
+            <th width="100">customer名称</th>
+            <th width="80">硬件版本</th>
+            <th width="80">零件总数量</th>
+            <th width="80">零件总成本(元)</th>
+            <th width="80">零件总重(g)</th>
+            <th width="100">备注</th>
+            <th width="80">最近修改时间</th>
+            <th width="80">添加时间</th>
+            <th width="80">操作</th>
+        </tr>
+        </thead>
+        <tbody>
+            <#if page.dataList?? &&  (page.dataList?size > 0) >
+                    <#list page.dataList as customer>
+                        <tr class="text-c">
+                            &lt;#&ndash;<td>${customer.customerId!''}</td>&ndash;&gt;
+                            <td>${customer.produceName!''}</td>
+                            <td>${customer.customerName!''}</td>
+                            <td>${customer.customerVersion!''}</td>
+                            <td>${customer.componentsQuantity!'0'}</td>
+                            <td><#if customer.allComponentsCost?? >${customer.allComponentsCost/100}</#if></td>
+                            <td><#if customer.allComponentsWeight?? >${customer.allComponentsWeight}</#if></td>
+                            <td>${customer.customerRemarks!''}</td>
+                            <td>${(customer.customerUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                            <td>${(customer.customerCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
+                            <td>
+                                <a style="text-decoration:none" href="javascript:void(0);" title="编辑" onclick="admin_update_customer(${customer.customerId!''})">
+                                    <i class="Hui-iconfont">&#xe6df;</i>
+                                </a>&nbsp;
+                                <a style="text-decoration:none" href="javascript:void(0);" title="查看customer单详情" onclick="admin_details_customer(${customer.customerId!''})">
+                                    <i class="Hui-iconfont">&#xe665;</i>
+                                </a>
+                            </td>
+                        </tr>
+                    </#list>
+            <#else>
+                <tr><td colspan="10" class="td-manage text-c" >暂时没有Customer，请添加！</td></tr>
+            </#if>
+        </tbody>
+    </table>
+    </div>-->
+</div>
+<tfoot>
+<#--<#include "/base/page_util.ftl">-->
+</tfoot>
+<script>
+    /**
+     * 跳转到添加customer页面
+     */
+    function toAddCustomer(){
+        window.location.href= "${path}/admin/customer/to_add_customer";
+    }
+
+    /**
+     *跳转到编辑页面
+     * @param employee
+     */
+    function admin_update_customer(customerId) {
+        window.location.href= "${path}/admin/customer/to_update_customer?customerId="+customerId;
+    }
+
+    /**
+     *跳转到详情页面
+     * @param employee
+     */
+    function admin_details_customer(customerId) {
+        window.location.href= "${path}/admin/customer/to_details_customer?customerId="+customerId;
+    }
+
+</script>
+</body>
+</html>