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

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

@@ -97,6 +97,7 @@ public class SalesOrder implements Serializable {
     private String styleColor;//上传订单结果颜色
 
     private String salesBatchId;    //批次编号
+    private Date batchCreateTime;    //批次创建时间
 
     private Integer salesAddType;   //增加订单方式 1：手动增加 2：Excel导入
     private Integer salesAdminId;   //录入人id
@@ -588,4 +589,12 @@ public class SalesOrder implements Serializable {
     public void setSalesAdminId(Integer salesAdminId) {
         this.salesAdminId = salesAdminId;
     }
+
+    public Date getBatchCreateTime() {
+        return batchCreateTime;
+    }
+
+    public void setBatchCreateTime(Date batchCreateTime) {
+        this.batchCreateTime = batchCreateTime;
+    }
 }

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

@@ -673,6 +673,9 @@
         <if test="endTime!=null and endTime!=''">
            and customer_create_time &lt;= #{endTime}
         </if>
+        <if test="typeId!=null and typeId!=''">
+           and type_id = #{typeId}
+        </if>
       </where>
    </select>
 

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

@@ -59,10 +59,12 @@
     select
     tb_rst_sales_order_info.*,
     trsc.company_name companyName,
-    trsi.store_name  storeName
+    trsi.store_name  storeName,
+    od.batch_create_time  batchCreateTime
     from tb_rst_sales_order_info
     LEFT JOIN tb_rst_sales_company trsc ON tb_rst_sales_order_info.sales_company_id = trsc.company_id
     LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
+    LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
     <where>
       <if test="salesIsDownload !=null and salesIsDownload !=''">
         AND sales_is_download = #{salesIsDownload}

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

@@ -570,11 +570,12 @@ public class AdminCustomerController {
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
         ModelAndView mv = new ModelAndView("cm/customer/custome_list");
-        if (customerInfo.getAdminId() == null && isFirst == 1) {
+        /*if (customerInfo.getAdminId() == null && isFirst == 1) {
             //获取登录员工id
+
             Integer adminId = AdminUtils.getLoginAdminId();
             customerInfo.setAdminId(adminId);
-        }
+        }*/
         PagedResult<CustomerInfo> pagedResult = customerService.listCustomer(pageNO, pageSize, customerInfo, totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);

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

@@ -1,9 +1,11 @@
 package com.iamberry.rst.controllers.cm;
 
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.order.ProductType;
 import com.iamberry.rst.faces.cm.ComplaintSmallClassInfoService;
 import com.iamberry.rst.faces.cm.ComplaintTypeInfoService;
 import com.iamberry.rst.faces.cm.CustomerService;
+import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
@@ -35,7 +37,7 @@ public class AdminCustomerReportController {
     @Autowired
     private CustomerService customerService;
     @Autowired
-    private ComplaintSmallClassInfoService complaintSmallClassInfoService;
+    private ProductService productService;
 
     /**
      * 客诉问题统计
@@ -95,6 +97,10 @@ public class AdminCustomerReportController {
     @RequestMapping(value = "/to_statistics")
     public ModelAndView selectOrder(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("/cm/report/customer_report");
+        ProductType productType = new ProductType();
+        //查询产品类型集合
+        List<ProductType> typeList = productService.listProductType(productType);
+        mv.addObject("typeList", typeList);
         return mv;
     }
 

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

@@ -371,7 +371,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row cl">
+            <div class="row cl" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-10 col-sm-10">
                     <ul class="time-line-list" id="processResultStatus">
@@ -642,7 +642,7 @@
 
             </div>
 
-            <div class="row cl">
+            <div class="row cl" style="display: none;">
                 <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">

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

@@ -47,6 +47,7 @@
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         .my-search-input{padding-left: 30px;background: url(${path}/common/images/cm/search.png) 6px center no-repeat;background-size: auto 60%; }
         .txt-red{color:red}
+        .thString {font-weight: normal;}
     </style>
     <title>客诉基本信息</title>
 </head>
@@ -60,113 +61,169 @@
             <div class="formControls col-9">
             </div>
         </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">跟进客服：</th>
+                <th width="10" style="font-weight: normal;"><span id="adminName"></span></th>
+                <th width="10"></th>
+                <th width="10">来源入口：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerSourceType"></span></th>
+            </tr>
+            <tr>
+                <th width="10">咨询类型：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerCounselType"></span></th>
+                <th width="10"></th>
+                <th width="10">产品类别：</th>
+                <th width="10" style="font-weight: normal;"><span id="typeName"></span></th>
+            </tr>
+            </thead>
+        </table>
+
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">跟进客服：</label>
-            <div class="formControls col-4 col-sm-4">
-				<label id="adminName"></label>
-            </div>
-            <label class="form-label col-1 col-sm-1">来源入口：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="customerSourceType"></label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">咨询类型：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="customerCounselType"></label>
-            </div>
-            <label class="form-label col-1 col-sm-1">产品类别：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="typeName"></label>
-            </div>
-        </div>
-        <div class="row cl" style="position: relative;">
-            <label class="form-label col-1 col-sm-1">客诉问题：</label>
-            <div class="formControls col-4 col-sm-4">
-                <label id="describeTitle"></label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">问题描述：</label>
-            <div class="formControls col-5 col-sm-5">
-                <label id="questionProfile"></label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">问题回复：</label>
-            <div class="formControls col-5 col-sm-5">
-                <label id="describeContent"></label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">备注信息：</label>
-            <div class="formControls col-5 col-sm-5">
-                <label id="customerDesc"></label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-1 col-sm-1">用户信息：</label>
-            <div class="formControls col-5 col-sm-5" style="margin-top: 2px;">
-                <label id="customerName"></label>
-                <label id="customerTel"></label>
+            <label class="form-label col-3">
+                <div class="tit-2">客户信息</div>
+            </label>
+            <div class="formControls col-9">
             </div>
         </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">销售公司：</th>
+                <th width="10" style="font-weight: normal;"><span id="companyName"></span></th>
+                <th width="10"></th>
+                <th width="10">店铺：</th>
+                <th width="10" style="font-weight: normal;"><span id="storeName"></span></th>
+            </tr>
+            <tr>
+                <th width="10">微信昵称：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerWechatName"></span></th>
+                <th width="10"></th>
+                <th width="10">用户姓名：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerName"></span></th>
+            </tr>
+            <tr>
+                <th width="10">用户电话：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerTel"></span></th>
+                <th width="10"></th>
+                <th width="10"></th>
+                <th width="10" style="font-weight: normal;"><span></span></th>
+            </tr>
+            </thead>
+        </table>
         <div class="row cl">
             <label class="form-label col-3">
-                <div class="tit-2">
-                    处理结果(<label id="customerIsSolve" style="color: red"></label>)
-                    <label id="postage" style="color: red"></label>
-                </div>
+                <div class="tit-2">客诉问题</div>
             </label>
-            <div class="formControls col-10 col-sm-10">
+            <div class="formControls col-9">
             </div>
         </div>
-        <div id="div_costomer" style="display: none;">
-            <div class="row cl">
-                <label class="form-label col-1 col-sm-1"></label>
-                <div class="formControls col-10 col-sm-10">
-                    <ul class="time-line-list">
-                        <!--<li id="li-1"><span class="arrow"></span><div id="number-1" class="number">1</div><div id="txt-1">录入客诉</div></li>
-                        <li id="li-2"><span class="arrow"></span><div id="number-2" class="number">2</div><div id="txt-2">督促用户寄回</div></li>
-                        <li id="li-3"><span class="arrow"></span><div id="number-3" class="number">3</div><div id="txt-3">录入快递单号</div></li>
-                        <li id="li-4"><span class="arrow"></span><div id="number-4" class="number">4</div><div id="txt-4">仓库收货</div></li>
-                        <li id="li-5"><span class="arrow"></span><div id="number-5" class="number">5</div><div id="txt-5">换新发货</div></li>
-                        <li id="li-6"><span class="arrow"></span><div id="number-6" class="number">6</div><div id="txt-6">发货通知用户</div></li>
-                        <li id="li-7"><span class="arrow"></span><div id="number-7" class="number">7</div><div id="txt-7">收货后回访</div></li>-->
-                    </ul>
-                </div>
-            </div>
-            <div class="row cl" id="tableHtml">
-                <label class="form-label col-1 col-sm-1">订单信息：</label>
-                <div class="formControls col-9 col-sm-9 text-c">
-                    <table class="table table-border table-bg table-bordered" >
-                        <thead>
-                            <tr>
-                                <th>销售</th>
-                                <th>订单号</th>
-                                <th>姓名</th>
-                                <th>电话</th>
-                                <th>订单金额</th>
-                                <th>购买产品</th>
-                                <th>购买日期</th>
-                                <th>地址</th>
-                            </tr>
-                        </thead>
-                        <tbody id="salesOrderHtml">
-                            <tr>
-                                <td id="companyName"></td>
-                                <td id="salesOrderId"></td>
-                                <td id="salesAddressName"></td>
-                                <td id="salesAddressTel"></td>
-                                <td id="salesPayMoney"></td>
-                                <td id="salesItem"></td>
-                                <td id="salesPayTime"></td>
-                                <td id=""></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">客诉问题：</th>
+                <th width="10" style="font-weight: normal;"><span id="describeTitle"></span></th>
+                <th width="10"></th>
+                <th width="10">问题描述：</th>
+                <th width="10" style="font-weight: normal;"><span id="questionProfile"></span></th>
+            </tr>
+            <tr>
+                <th width="10">问题回复：</th>
+                <th width="10" style="font-weight: normal;"><span id="describeContent"></span></th>
+                <th width="10"></th>
+                <th width="10">备注信息：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerDesc"></span></th>
+            </tr>
+            </thead>
+        </table>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">
+                    订单信息：
+                </th>
+                <th width="40" style="font-weight: normal;">
+                    <div class="row cl" id="tableHtml">
+                        <div class="formControls col-10 col-sm-10 text-c">
+                            <table class="table table-border table-bg table-bordered" >
+                                <thead>
+                                <tr>
+                                    <th>销售</th>
+                                    <th>订单号</th>
+                                    <th>姓名</th>
+                                    <th>电话</th>
+                                    <th>订单金额</th>
+                                    <th>购买产品</th>
+                                    <th>购买日期</th>
+                                    <th>地址</th>
+                                </tr>
+                                </thead>
+                                <tbody id="salesOrderHtml">
+                                <tr>
+                                    <td id="companyName"></td>
+                                    <td id="salesOrderId"></td>
+                                    <td id="salesAddressName"></td>
+                                    <td id="salesAddressTel"></td>
+                                    <td id="salesPayMoney"></td>
+                                    <td id="salesItem"></td>
+                                    <td id="salesPayTime"></td>
+                                    <td id=""></td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </th>
+            </tr>
+            </thead>
+        </table>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">
+                    处理结果(<span id="customerIsSolve" style="color: red"></span>)
+                    <span id="postage" style="color: red"></span>
+                </th>
+                <th width="40" style="font-weight: normal;">
+                    <div class="row cl">
+                        <label class="form-label col-1 col-sm-1"></label>
+                        <div class="formControls col-10 col-sm-10">
+                            <ul class="time-line-list">
+
+                            </ul>
+                        </div>
+                    </div>
+                </th>
+            </tr>
+            </thead>
+        </table>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">寄回产品：</th>
+                <th width="10" style="font-weight: normal;"><span id="closeprodcue"></span></th>
+                <th width="10"></th>
+                <th width="10">寄送产品：</th>
+                <th width="10" style="font-weight: normal;"><span id="sendprodcue"></span></th>
+            </tr>
+            <tr>
+                <th width="10">TDS收集：</th>
+                <th width="10" style="font-weight: normal;"><span id="customerTDS"></span></th>
+                <th width="10"></th>
+                <th width="10">收货地址：</th>
+                <th width="10" style="font-weight: normal;"><div id="sendMergeAddressDiv"><span id="relationSendMergeAddress"></span></div></th>
+            </tr>
+            <tr>
+                <th width="10">客服备注：</th>
+                <th width="10" style="font-weight: normal;"><span id="describeHandleDesc"></span></th>
+                <th width="10"></th>
+                <th width="10"></th>
+                <th width="10" style="font-weight: normal;"></th>
+            </tr>
+            </thead>
+        </table>
+        <#--<div id="div_costomer" style="display: none;">
             <div class="row cl" id="divCloseProdcue">
                 <label class="form-label col-1 col-sm-1">寄回产品：</label>
                 <div class="formControls col-7 col-sm-7">
@@ -177,7 +234,7 @@
             <div class="row cl" style="margin-top: 0px;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-5 col-sm-5">
-                    <!--TDS收集-->
+                    <!--TDS收集&ndash;&gt;
                     <label id="customerTDS"></label>
                     <div style="border-bottom:#ddd 1px solid; overflow:hidden"></div>
                 </div>
@@ -202,13 +259,13 @@
             <label class="form-label col-1 col-sm-1">客服备注：</label>
             <div class="formControls col-7 col-sm-7" id="describeHandleDesc" style="border: 1px solid #ddd;">
             </div>
-        </div>
+        </div>--><#--
         <div class="row cl">
             <label class="form-label col-1 col-sm-1">回访信息：</label>
             <div class="formControls col-7 col-sm-7">
                 <label id="txtVisit"></label>
             </div>
-        </div>
+        </div>-->
     </form>
     </div>
 </article>
@@ -314,6 +371,11 @@
                     $('#customerDesc').html(customer.customerDesc);
                     $('#customerName').html(customer.customerName);
                     $('#customerTel').html(customer.customerTel);
+                    $('#companyName').html(customer.companyName);
+                    $('#storeName').html(customer.storeName);
+                    $('#customerName').html(customer.customerName);
+                    $('#customerTel').html(customer.customerTel);
+                    $('#customerWechatName').html(customer.customerWechatName);
                     var txtcustomerIsSolve = '';
                     switch (customer.customerIsSolve) {
                         case 1:txtcustomerIsSolve = '已解决';break;
@@ -405,7 +467,7 @@
                     if(customer.customerArea != null && customer.customerArea != ""){
                         customerArea = convertUndefinedToEmpty(customer.customerArea)+",";
                     }
-                    $('#customerTDS').html("<strong>TDS收集:</strong>"+ customerArea+"进水"+
+                    $('#customerTDS').html(customerArea+"进水"+
                             (customer.customerInTDS==undefined?0:customer.customerInTDS)+"ppm"+",出水"+(customer.customerOutTDS==undefined?0:customer.customerOutTDS)+"ppm");
 
                     if (customer.customerIsVisit == 2) {
@@ -415,7 +477,7 @@
                             case 2:visitTime = '12:00-14:00';break;
                             case 3:visitTime = '14:00-18:00';break;
                         }
-                        var visitText = "";
+                        /*var visitText = "";
                         if(customer.visitStatus == 1 || customer.visitStatus == 2){
                             visitText  += '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDesignatedAdminName)+'</span>)&nbsp;&nbsp;'+
                                     '需要在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
@@ -431,7 +493,7 @@
                                     convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
                                     convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
                         }
-                        $('#txtVisit').html(visitText);
+                        $('#txtVisit').html(visitText);*/
 
                     }
                 }

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

@@ -39,16 +39,16 @@
     <div class="text-c">
         <form action="${path}/admin/customer/select_customer_list" method="post">
             <button type="button" style="cursor:pointer; float: left;height: 35px;margin-right: 30px;margin-bottom: 10px;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
-            <input type="text" class="my-input trim_input"  style="width:90px;margin-right: 0px; margin-bottom: 10px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
-            <input type="text" class="my-input trim_input"  style="width:90px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
-            <input type="text" class="my-input trim_input"  style="width:90px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
-            <input type="text" class="my-input trim_input"  style="width:90px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
-            <input type="text" style="width:90px;height:36px;margin-right: 0px;margin-bottom: 10px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
-            <input type="text" style="width:90px;height:36px;margin-right: 0px;margin-bottom: 10px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 10px;margin-left: -152px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;margin-bottom: 10px;" value="${customerInfo.customerTel!}" placeholder="请输入电话号码" id="customerTel" name="customerTel">
+            <input type="text" style="width:120px;height:36px;margin-right: 0px;margin-bottom: 10px;" name="startTime" id="startTime" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.startTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/>-
+            <input type="text" style="width:120px;height:36px;margin-right: 0px;margin-bottom: 10px;" name="endTime" id="endTime" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" value="${(customerInfo.endTime?string("yyyy-MM-dd"))!''}" readonly="readonly"/><br>
 
             <#--<input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.describeTitle!}" placeholder="请输入问题描述" id="describeTitle" name="describeTitle">-->
 
-            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 100px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+            <select class="my-select" name="customerIsSolve" id="customerIsSolve" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">处理结果</option>
                 <option value="1" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 1 >selected="selected"</#if></#if>>已解决</option>
                 <option value="2" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 2 >selected="selected"</#if></#if>>未解决</option>
@@ -59,7 +59,7 @@
                 <option value="7" <#if customerInfo.customerIsSolve??><#if customerInfo.customerIsSolve == 7 >selected="selected"</#if></#if>>无理由退货</option>
             </select>
 
-            <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 100px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+            <select class="my-select" name="customerSourceType" id="customerSourceType" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">来源</option>
                 <option value="1" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 1 >selected="selected"</#if></#if>>400电话</option>
                 <option value="2" <#if customerInfo.customerSourceType??><#if customerInfo.customerSourceType == 2 >selected="selected"</#if></#if>>微信公众号</option>
@@ -67,20 +67,20 @@
             </select>
 
             <select class="my-select" name="typeId" id="typeId" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
-                <option value ="">客诉产品</option>
+                <option value ="">产品类型</option>
                 <#if typeList?? &&  (typeList?size > 0) >
                     <#list typeList as type>
                         <option value ="${type.typeId!}" <#if customerInfo.typeId??><#if customerInfo.typeId ==type.typeId >selected="selected"</#if></#if>>${type.typeName!}</option>
                     </#list>
                 </#if>
             </select>
-
+<#--
             <select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value ="">是否需要回访</option>
                 <option value="">是否回访</option>
                 <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
                 <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
-            </select>
+            </select>-->
 
             <select class="my-select" name="adminId" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value ="">全部跟进客服</option>
@@ -91,14 +91,14 @@
                 </#if>
             </select>
 
-            <select class="my-select" name="visitDesignatedAdminId" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+           <#-- <select class="my-select" name="visitDesignatedAdminId" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                 <option value ="">全部回访客服</option>
                 <#if adminList?? &&  (adminList?size > 0) >
                     <#list adminList as admin>
                         <option value ="${admin.adminId!}" <#if customerInfo.visitDesignatedAdminId??><#if customerInfo.visitDesignatedAdminId ==admin.adminId >selected="selected"</#if></#if>>${admin.adminName!}</option>
                     </#list>
                 </#if>
-            </select>
+            </select>-->
 
             <select class="my-select" name="complaintId" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                 <option value ="">全部问题大类</option>
@@ -134,7 +134,7 @@
             <th width="80">客诉产品</th>
             <#--<th width="80">客诉类型</th>-->
             <th width="80">问题类型</th>
-            <th width="100">问题简述</th>
+            <th width="80">问题简述</th>
             <th width="30">开箱损</th>
             <th width="30">二次售后</th>
             <th width="60">销售</th>
@@ -143,7 +143,7 @@
             <th width="60">TDS</th>
             <th width="80">物流单号</th>
             <th width="80">处理结果</th>
-            <th width="80">需要回访</th>
+            <#--<th width="80">需要回访</th>-->
             <th width="80">客诉时间</th>
             <th width="100">操作</th>
         </tr>
@@ -187,7 +187,7 @@
                             <#--<td>${customer.complaintClassName!''}</td>-->
                             <td>${customer.smallClassName!''}</td>
                             <td>
-                                <span class="label txt2" title="${customer.describeTitle!}" >${customer.describeTitle!'暂无'}</span><br/>
+                                ${customer.describeTitle!'暂无'}<br/>
                                     <#if customer.describeTitle??>
                                         <a style="text-decoration:none;" href="javascript:void(0);" title="查看详情" onclick="getDescribeInfo(${customer.customerId!''})">
                                             <font color=#06c>查看详情</font>
@@ -358,7 +358,7 @@
                                     )
                                 </#if>
                             </td>
-                            <td>
+                            <#--<td>
                                 <#if customer.customerIsVisit == "1">
                                     不需要回访
                                 <#elseif customer.customerIsVisit == "2">
@@ -374,7 +374,7 @@
                                         </a>&nbsp;
                                     </#if>
                                 </#if>
-                            </td>
+                            </td>-->
                             <td>
                                 ${(customer.customerCreateTime?string("yyyy-MM-dd"))!''}<br>
                                 ${(customer.customerCreateTime?string("HH:mm:ss"))!''}
@@ -386,18 +386,18 @@
                                     </a><br/>
                                 </#if>
 
-                                <#if customer.customerIsSolve == 2>
+                                <#--<#if customer.customerIsSolve == 2>
                                     <a style="text-decoration:none" href="javascript:void(0);" title="已解决" onclick="updateCustomerIsSolve(${customer.customerId!''})">
                                         <font color=#06c>已解决</font>
                                     </a><br/>
-                                </#if>
+                                </#if>-->
                                 <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${customer.customerId!''})">
                                     <font color=#06c>详情</font>
                                 </a><br/>
                                 <a style="text-decoration:none" href="javascript:void(0);" title="修改客诉" onclick="admin_update_customer(${customer.customerId!''})">
                                     <font color=#06c>修改客诉</font>
                                 </a><br/>
-                                <#if customer.customerIsVisit == "2">
+                                <#--<#if customer.customerIsVisit == "2">
                                     <#if customer.visitStatus == 1 && customer.customerIsVisit == "2">
                                         <a style="text-decoration:none" href="javascript:void(0);" title="已完成回访" onclick="toUpdateVisit(${customer.customerId!''})">
                                             <font color=#06c>已完成回访</font>
@@ -408,7 +408,7 @@
                                     <a style="text-decoration:none" href="javascript:void(0)" title="需要回访" onclick="toAddVisit(${customer.customerId!''})">
                                         <font color=#06c>需要回访</font>
                                     </a><br/>
-                                </#if>
+                                </#if>-->
                                 <a style="text-decoration:none" href="javascript:void(0)" title="查询签收信息" onclick="toSignclosed(${customer.customerId!''})">
                                     <font color=#06c>签收信息</font>
                                 </a><br/>

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

@@ -42,6 +42,7 @@
         <form name="form1" action="${path}/admin/detect/select_detect_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_detect('${path}/admin/detect/to_add_detect');">新建品检</button>
             <select id="productId" name="productId" class="my-select" style="width: 120px;">
+                <option value="" >请选择产品</option>
             <#if (productList?size > 0)>
                 <#list productList as product>
                 <#if productId??>
@@ -226,6 +227,10 @@
         getProduct($(this).children('option:selected').val())
     })
     function  getProduct(productId) {
+        if(productId == ""){
+            $("#productColorId").append('<option value="">暂无产品颜色</option>');
+            return;
+        }
         $.ajax({
             cache: true,
             type: "POST",
@@ -241,7 +246,7 @@
                             $("#productColorId").append('<option value='+productColor.colorId+'>'+productColor.colorName+'</option>');
                         }
                     }else{
-                        $("#productColorId").append('<option>暂无产品颜色</option>');
+                        $("#productColorId").append('<option value="">暂无产品颜色</option>');
                     }
 
                 }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/report/customer_report.ftl

@@ -37,7 +37,14 @@
 
             <input type="text" placeholder="请选择开始日期" id="startTime"  name="startTime" class="my-input Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})"  readonly="readonly">
             <input type="text" placeholder="请选择结束日期" id="endTime"  name="endTime" class="my-input Wdate" onclick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d',minDate:'#F{$dp.$D(\'startTime\',{d:0})}'})"  readonly="readonly">
-
+            <select class="my-select" name="typeId" id="typeId" style="height: 36px;width: 120px;">
+                <option value ="">产品类型</option>
+            <#if typeList?? &&  (typeList?size > 0) >
+                <#list typeList as type>
+                    <option value ="${type.typeId!}">${type.typeName!}</option>
+                </#list>
+            </#if>
+            </select>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" name="" onclick="getStatistics()"><i class="Hui-iconfont">&#xe665;</i> 查询</button>
         </form>
     </div>
@@ -94,11 +101,11 @@
     function getStatistics() {
         var startTime = $("#startTime").val();
         var endTime = $("#endTime").val();
+        var typeId = $("#typeId").val();
 
         if(endTime == null || endTime == "" || typeof (endTime) == "undefined"){
             endTime = new Data();
         }
-
         var startTimes = startTime.split("-");
         var startTimeHtml = startTimes[0] + "年" + startTimes[1] + "月" +startTimes[2]+"日";
         var endTimes = endTime.split("-");
@@ -113,7 +120,8 @@
             type: "POST",
             data: {
                 startTime :startTime,
-                endTime : endTime
+                endTime : endTime,
+                typeId : typeId
             },
             url: "${path}/admin/customer_report/question_statistics",
             success: function(data){
@@ -193,10 +201,12 @@
                 "width: 32%;text-align: left !important;",
                 "display: none;",
                 "width: 6%;",
-                "width: 10%;background: linear-gradient(to left, #fffcfc, #ff84d4);background-repeat: no-repeat;"
+                "width: 10%;background: linear-gradient(to left, #fffcfc, #ff84d4);background-repeat: no-repeat;",
+                "width: 10%;background: linear-gradient(to left, #AAAAFF, #4A4AFF);background-repeat: no-repeat;"
             ];
 
             if (table_array.length > 0) {
+                var color = 1;
                 //创建行
                 $.each(table_array, function(index, item) {
                     var tr = $('<tr></tr>');
@@ -214,8 +224,24 @@
                                 str += '<td class="text-c" style="'+ style_array[i] +'"><a href="javascript:void(0);" style="color: #06c;" onclick="to_customer_list(' + table_array[index][i+1] + ')">' + table_array[index][i] + '<a></td>';
                                 break;
                             case 11:
-                                str += '<td class="text-c" style="'+ style_array[i] +'background-size: ' + table_array[index][i] + ' 100%;">' + table_array[index][i] + '</td>';
-                                break;
+                                if(color == 1){
+                                    str += '<td class="text-c" style="'+ style_array[i] +'background-size: ' + table_array[index][i] + ' 100%;">' + table_array[index][i] + '</td>';
+                                    if(index+1 < table_array.length){
+                                        if(table_array[index][4] != table_array[index+1][4]){
+                                            color = 2;
+                                        }
+                                    }
+                                    break;
+                                }else{
+                                    str += '<td class="text-c" style="'+ style_array[i+1] +'background-size: ' + table_array[index][i] + ' 100%;">' + table_array[index][i] + '</td>';
+                                    if(index+1 < table_array.length){
+                                        if(table_array[index][4] != table_array[index+1][4]){
+                                            color = 1;
+                                        }
+                                    }
+                                    break;
+                                }
+
                             default:
                                 str += '<td class="text-c" style="'+ style_array[i] +'">' + table_array[index][i] + '</td>';
                                 break;

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

@@ -117,7 +117,7 @@
 
 
             <div class="row cl address_info" style="position: relative;">
-                <label class="form-label col-3 col-sm-3">寄件区域：</label>
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄件区域：</label>
                 <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
                         <select class="select init_province" id="provinces">
@@ -143,9 +143,9 @@
 
 
                 <div class="row cl" id="" style="">
-                    <label class="form-label col-3 col-sm-3">商品信息：</label>
+                    <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>签收产品：</label>
                     <div class="formControls col-8 col-sm-8">
-                        <input type="button" class="btn btn-primary add-order-button" onclick="add_product()" value="添加商品" >
+                        <input type="button" class="btn btn-primary add-order-button" onclick="add_product()" value="添加产品" >
 
                         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;display: none" id="all_add_product">
                             <thead>

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

@@ -30,18 +30,15 @@
 <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>
-            <input type="text" style="" class="input-text" placeholder="客诉编号" id="signclosedCustomerId" name="signclosedCustomerId">
-            <button type="button" class="my-btn-submit" onclick="select();">查询</button>
+        <div class="input-box"  >
+            <span class="input-dic spanhidth" style="margin-top: 12px;">客诉编号：</span>
+            <input type="text" style="width: 400px;" class="input-text" placeholder="客诉编号" id="signclosedCustomerId" name="signclosedCustomerId">
+            <button type="button" class="my-btn-submit" style="margin-top: 4px;" onclick="select();">查询</button>
         </div>
-        <div style="text-align:center;display: none" id="associatedId">
-        <#if signclosedId??>
-            <input type="hidden" value="${signclosedId!''}" id="signclosedId" name="signclosedId">
-        </#if>
-           <button type="button" class="my-btn-submit" onclick="update();">确认关联</button>
+        <div id="noCustomerDiv" style="display: none; text-align:center;">
+            <h3><strong style="color: #93da67">?没有搜索到客诉哦</strong></h3>
         </div>
-        <div id="customerDiv" style="display: none">
+        <div id="customerDiv" style="display: none;text-align: -moz-center;text-align: -webkit-center;">
             <#--<div class="row cl">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>客诉时间：</strong>
@@ -50,39 +47,36 @@
 
                 </div>
             </div>-->
-            <div class="row cl">
-                <div class="formControls col-2 col-sm-2">
-                    <strong>客诉标题：</strong>
-                </div>
-                <div class="formControls col-6 col-sm-6" id="txtDescribeTitle">
-
-                </div>
-            </div>
-            <div class="row cl">
-                <div class="formControls col-2 col-sm-2">
-                    <strong>客诉回复：</strong>
-                </div>
-                <div class="formControls col-6 col-sm-6" id="txtDescribeContent">
-
-                </div>
-            </div>
-            <div class="row cl">
-                <div class="formControls col-2 col-sm-2">
-                    <strong>姓名：</strong>
-                </div>
-                <div class="formControls col-6 col-sm-6" id="customerName">
-
-                </div>
-            </div>
-
-            <div class="row cl">
-                <div class="formControls col-2 col-sm-2">
-                    <strong>手机号：</strong>
-                </div>
-                <div class="formControls col-6 col-sm-6" id="customerTel">
-
-                </div>
-            </div>
+                <table class="table table-border table-bg table-bordered" style="margin-top: 10px;width: 500px;">
+                    <thead>
+                    <tr>
+                        <th width="5" style="text-align: center">客诉标题</th>
+                        <td width="50" style="font-weight: normal;"><span id="txtDescribeTitle"></span></td>
+                    </tr>
+                    <tr>
+                        <th width="5" style="text-align: center">客诉回复</th>
+                        <td width="50" style="font-weight: normal;"><span id="txtDescribeContent"></span></td>
+                    </tr>
+                    <tr>
+                        <th width="5" style="text-align: center">客诉人姓名</th>
+                        <td width="50" style="font-weight: normal;"><span id="customerName"></span></td>
+                    </tr>
+                    <tr>
+                        <th width="5" style="text-align: center">客诉人手机号</th>
+                        <td width="50" style="font-weight: normal;"><span id="customerTel"></span></td>
+                    </tr>
+                    <tr>
+                        <th width="5" style="text-align: center">客诉时间</th>
+                        <td width="50" style="font-weight: normal;"><span id="customerCreateTime"></span></td>
+                    </tr>
+                    </thead>
+                </table>
+        </div>
+        <div style="text-align:center;display: none" id="associatedId">
+        <#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>
@@ -101,13 +95,19 @@
                 if (data.returnCode == 200) {
                     var describe = data.returnMsg.describe;
                     var customer = data.returnMsg.customerInfo;
-                    /*$('#customerCreateTime').html(formatDate(describe.customerCreateTime,"yyyy-MM-dd"));*/
+                    $('#customerCreateTime').html(formatDate(describe.customerCreateTime,"yyyy年MM月dd日"));
                     $('#txtDescribeTitle').html(describe.describeTitle);
                     $('#txtDescribeContent').html(describe.describeContent);
                     $('#customerName').html(customer.customerName);
                     $('#customerTel').html(customer.customerTel);
+                    $("#noCustomerDiv").hide();
                     $("#customerDiv").show();
                     $("#associatedId").show();
+                }else {
+                    $("#customerDiv").hide();
+                    $("#associatedId").hide();
+                    $("#noCustomerDiv").show();
+
                 }
             },
             error: function(XmlHttpRequest, textStatus, errorThrown){

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

@@ -34,17 +34,17 @@
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> RST管理
-    <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;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div class="page-container">
     <div class="text-c">
         <form name="form1" action="${path}/admin/signclosed/select_signclosed_list" method="post">
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
-            <input class="my-input" style="width: 70px;" type="hidden" name="isBinding" value="${isBinding!}"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
+            <input class="my-input" style="width: 120px;" type="hidden" name="isBinding" value="${isBinding!}"/>
 
             <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
         </form>
@@ -60,10 +60,10 @@
                 <th width="200">签收产品</th>
                 <th width="200">状态</th>
                 <th width="130">退货地区</th>
-                <th width="90">售后原因</th>
-                <th width="150">客服备注</th>
-                <th width="150">返厂日期</th>
-                <th width="100">备注</th>
+                <#--<th width="90">售后原因</th>
+                <th width="150">客服备注</th>-->
+                <th width="150">签收日期</th>
+                <th width="100">仓库备注</th>
                 <th width="100">操作</th>
             </tr>
             </thead>
@@ -114,16 +114,16 @@
                         </#if>
                     ${signclosed.signclosedLogisticsNumber!}</td>
                     <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
-                    <td class="text-c" width="180"><span class="fom_send_tel">${signclosed.signclosedSendTel!}</span></td>
+                    <td class="text-c" width="180">${signclosed.signclosedSendTel!}</td>
                     <td class="text-c" width="100">
                         <div>
                         <#if signclosed.signclosedProductInfoList??>
                             <#if (signclosed.signclosedProductInfoList?size > 0)>
                                 <#list signclosed.signclosedProductInfoList as info>
                                     <#if info.signclosedProductType == 1 >
-                                        <span class="label label-success radius txt" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
+                                        <span class="label label-success radius" title="${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台">${info.productName!''}-${info.productNumber!''}(${info.colorName!''})x ${info.productNum!''}台</span><br>
                                     <#else >
-                                        <span class="label label-success radius txt" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
+                                        <span class="label label-success radius" title="${info.productName!''} x ${info.productNum!''}件">${info.productName!''} x ${info.productNum!''}件>${info.productName!''} x ${info.productNum!''}件</span><br>
                                     </#if>
                                 </#list>
                             <#else >
@@ -142,8 +142,8 @@
                         </#if>
                     </#if></td>
                     <td class="text-c" width="100">${signclosed.signclosedAddrProvinces!}-${signclosed.signclosedAddrCity!}-${signclosed.signclosedAddrArea!}</td>
-                    <td class="text-c" width="100"><span class="label txt2" title="${signclosed.customerIdDescribe!}" >${signclosed.customerIdDescribe!}</span><br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>
-                    <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>
+                    <#--<td class="text-c" width="100"><span class="label txt2" title="${signclosed.customerIdDescribe!}" >${signclosed.customerIdDescribe!}</span><br><#if signclosed.customerIdDescribe??><#if signclosed.customerIdDescribe != ""><a href="#" onclick="getDescribeInfo(${signclosed.signclosedCustomerId!});"style="color : #4149FF;">查看详情</a></#if></#if></td>
+                    <td class="text-c" width="100">${signclosed.signclosedCustomerDesc!}</td>-->
                     <td class="text-c" width="100">${(signclosed.signclosedDate?string("yyyy-MM-dd"))!''}</td>
 
                     <td class="text-c" width="100">${signclosed.signclosedDesc!}</td>

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

@@ -41,10 +41,10 @@
     <div class="text-c">
         <form name="form1" action="${path}/admin/signclosed/select_signclosed_list" method="post">
             <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_signclosed('${path}/admin/signclosed/to_add_signclosed');">新建签收</button>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
-            <input class="my-input" style="width: 70px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
+            <input class="my-input" style="width: 120px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>
             <#--<select class="my-select" name="signclosedType" style="height: 30px;width: 150px">
                 <option value ="">签收类型</option>
                 <option value ="1" <#if signclosedType??><#if signclosedType == 1>selected="selected"</#if></#if>>客诉寄回</option>
@@ -123,7 +123,7 @@
                         </#if>
                     ${signclosed.signclosedLogisticsNumber!}</td>
                     <td class="text-c" width="100">${signclosed.signclosedSendName!}</td>
-                    <td class="text-c" width="180"><span class="fom_send_tel">${signclosed.signclosedSendTel!}</span></td>
+                    <td class="text-c" width="180">${signclosed.signclosedSendTel!}</td>
                     <td class="text-c" width="100">
                         <div>
                         <#if signclosed.signclosedProductInfoList??>

watero-rst-web/src/main/webapp/WEB-INF/views/login.ftl

@@ -61,7 +61,7 @@
                         <input type="checkbox" name="online" id="remember_me" value="">&nbsp;&nbsp;使我保持登录状态</label>
                 </div>
             </div>
-            <div class="row loginbox_btn">
+            <div>
                 <div class="formControls col-8 col-offset-3">
                     <input name="" id="login-btn" type="submit" class="btn btn-block btn-primary radius size-L my-btn-login" value="&nbsp;登&nbsp;&nbsp;&nbsp;&nbsp;录&nbsp;">
                 </div>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -61,69 +61,44 @@
             <div class="formControls col-9">
             </div>
         </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">订单编号：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesOrderId!'暂无订单编号'}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">交易号：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesDealCode!''}</label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">销售公司：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.companyName!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">店铺：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.storeName!''}</label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">是否支付：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">批次号：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesBatchId!'暂无批次batchCreateTime'}</span></td>
+                <td width="10"></td>
+                <th width="10">下单日期：</th>
+                <td width="10" style="font-weight: normal;"><span>${(order.batchCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">订单编号：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesOrderId!'暂无订单编号'}</span></td>
+                <td width="10"></td>
+                <th width="10">交易号：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesDealCode!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">销售公司：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.companyName!''}</span></td>
+                <td width="10"></td>
+                <th width="10">销售渠道：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.storeName!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">是否支付：</th>
+                <td width="10" style="font-weight: normal;"><span>
                 <#if order.salesPayStatus == 0>
-                    未付款
+                    未
                 <#elseif order.salesPayStatus == 2>
                     已付款
-                </#if>
-                </label>
-            </div>
-            <label class="form-label col-2 col-sm-2">是否发货：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>
-                    <#if order.salesShippingStatus == 0>
-                        未发货
-                    <#elseif order.salesShippingStatus == 1>
-                        已发货
-                    <#elseif order.salesShippingStatus == 1>
-                        备货中
-                    </#if>
-                </label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">订单金额（￥）：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesAmount/100!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">支付金额（￥）：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesPayMoney/100!''}</label>
-            </div>
-        </div>
-        <div class="row cl">
-
-            <label class="form-label col-2 col-sm-2">邮费（￥）：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesShippingFee/100!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">付款方式：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>
+                </#if></span></td>
+                <td width="10"></td>
+                <th width="10">支付金额：</th>
+                <td width="10" style="font-weight: normal;"><span>¥${order.salesPayMoney/100!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">付款方式：</th>
+                <td width="10" style="font-weight: normal;"><span>
                 <#if order.salesPayType == 1>
                     微信支付
                 <#elseif order.salesPayType == 2>
@@ -135,20 +110,13 @@
                 <#elseif order.salesPayType == 5>
                     支付宝支付
                 </#if>
-                </label>
-            </div>
-
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">支付时间：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${(order.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">发货时间：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</label>
-            </div>
-        </div>
+                </span></td>
+                <td width="10"></td>
+                <th width="10">支付时间：</th>
+                <td width="10" style="font-weight: normal;"><span>${(order.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</span></td>
+            </tr>
+            </thead>
+        </table>
         <div class="row cl">
             <label class="form-label col-3">
                 <div class="tit-2">
@@ -158,10 +126,8 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">购买产品信息：</label>
-            <div class="formControls col-7 col-sm-7 text-c">
-                <table class="table table-border table-bg table-bordered">
+            <#--<label class="form-label col-2 col-sm-2">购买产品信息：</label>-->
+                <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
                     <tr class="text-c">
                         <th>产品名称</th>
                         <th>产品颜色</th>
@@ -183,37 +149,63 @@
                         </#list>
                     </#if>
                 </table>
-            </div>
-        </div>
+
         <div class="row cl">
             <label class="form-label col-3">
                 <div class="tit-2">
-                    邮寄信息
+                    用户信息
                 </div>
             </label>
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">收货人姓名：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesAddressName!''}</span></td>
+                <td width="10"></td>
+                <th width="10">手机号码：</th>
+                <td width="10" style="font-weight: normal;"><span>${order.salesAddressTel!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">收货人地址：</th>
+                <td colspan="4" style="font-weight: normal;"><span>${order.salesAddressInfo!''}</span></td>
+            </tr>
+            <tr>
+                <th width="10">备注：</th>
+                <td colspan="4" style="font-weight: normal;"><span>${order.salesUserRemark!''}</span></td>
+            </tr>
+            </thead>
+        </table>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2">收货人姓名：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesAddressName!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">收货人电话：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesAddressTel!''}</label>
-            </div>
-        </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">收货人地址：</label>
-            <div class="formControls col-9 col-sm-9">
-                <label>${order.salesAddressInfo!''}</label>
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    发货信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <div class="row cl">
-            <label class="form-label col-2 col-sm-2">快递公司：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <th width="10">是否发货：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                <#if order.salesShippingStatus == 0>
+                    未发货
+                <#elseif order.salesShippingStatus == 1>
+                    已发货
+                <#elseif order.salesShippingStatus == 1>
+                    备货中
+                </#if></span></td>
+                <td width="10"></td>
+                <th width="10">发货时间：</th>
+                <td width="10" style="font-weight: normal;"><span>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</span></td>
+            </tr>
+            <tr>
+                <th width="10">物流公司：</th>
+                <td width="10" style="font-weight: normal;"><span>
                 <#if order.salesPostFirm??>
                     <#if order.salesPostFirm == 'sto'>
                         申通快递
@@ -250,25 +242,36 @@
                     <#elseif order.salesPostFirm == 'dbkd'>
                         德邦物流
                     </#if>
+                </#if></span></td>
+                <td width="10"></td>
+                <th width="10">物流单号：</th>
+                <td width="10" style="font-weight: normal;"><span>
+                ${order.salesPostNum!'暂无快递单号'}
+                <#if order.salesPostNum??>
+                    <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${order.salesPostNum!''}&billName=${order.salesPostFirm!''}',300,400);">查看物流</a>
                 </#if>
-                </label>
-            </div>
-            <label class="form-label col-2 col-sm-2">快递单号：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesPostNum!'暂无快递单号'}</label>
-            </div>
-        </div>
+                </span></td>
+            </tr>
+            </thead>
+        </table>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2">用户备注：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${order.salesUserRemark!''}</label>
-            </div>
-            <label class="form-label col-2 col-sm-2">创建时间：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    后台信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-         <button type="button" style="cursor:pointer;height: 35px;margin-left: 400px;"onClick="javascript :history.back(-1);" class="my-btn-search">返回</button>
+
+        <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
+            <thead>
+            <tr>
+                <td>${order.salesAdminRemark!'暂无后台信息'}</td>
+            </tr>
+            </thead>
+        </table>
+         <button type="button" style="cursor:pointer;height: 35px;margin-top: 10px;"onClick="javascript :history.back(-1);" class="my-btn-search"><<返回</button>
     </form>
     </div>
 </article>
@@ -303,7 +306,10 @@
             attachObject:'#suggest'
         });
     });
-
+    /*查看物流*/
+    function openLogistics(title, url, w, h) {
+        layer_show(title,url,w,h);
+    }
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -99,13 +99,14 @@
                 <th width="60">收货人姓名</th>
                 <th width="70">收货人电话</th>
                 <th width="100">收货地址</th>
+                <th width="50">是否发货</th>
                 <th width="60">物流公司</th>
                 <th width="60">物流单号</th>
-                <th width="50">订单金额</th>
+                <#--<th width="50">订单金额</th>
                 <th width="50">支付金额</th>
-                <th width="50">是否付款</th>
-                <th width="50">是否发货</th>
-                <th width="50">订单备注</th>
+                <th width="50">是否付款</th>-->
+                <th width="50">用户备注</th>
+                <th width="50">后台备注</th>
                 <th width="60">创建时间</th>
                 <th width="50">操作</th>
             </tr>
@@ -125,6 +126,15 @@
                     </#if>
                     <td>${order.salesAddressInfo!''}</td>
                     <td>
+                        <#if order.salesShippingStatus == 0>
+                            未发货
+                        <#elseif order.salesShippingStatus == 1>
+                            已发货
+                        <#elseif order.salesShippingStatus == 1>
+                            备货中
+                        </#if>
+                    </td>
+                    <td>
                         <#if order.salesPostFirm??>
                             <#if order.salesPostFirm == 'sto'>
                                 申通快递
@@ -164,7 +174,7 @@
                         </#if>
                     </td>
                     <td>${order.salesPostNum!''}</td>
-                    <td>${order.salesAmount/100!''}</td>
+                    <#--<td>${order.salesAmount/100!''}</td>
                     <td>${order.salesPayMoney/100!''}</td>
                     <td>
                         <#if order.salesPayStatus == 0>
@@ -172,17 +182,10 @@
                         <#elseif order.salesPayStatus == 2>
                             已付款
                         </#if>
-                    </td>
-                    <td>
-                        <#if order.salesShippingStatus == 0>
-                            未发货
-                        <#elseif order.salesShippingStatus == 1>
-                            已发货
-                        <#elseif order.salesShippingStatus == 1>
-                            备货中
-                        </#if>
-                    </td>
+                    </td>-->
+                    <td>${order.salesUserRemark!''}</td>
                     <td>${order.salesAdminRemark!''}</td>
+
                     <td>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
                     <td>
                         <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="sales_order_detail(${order.salesId!''})">

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -229,7 +229,8 @@ $(function (){
 function initVisitEvent(){
     $("input[name='customerIsVisit']").change(function (){
         if($(this).val() == 2){
-            $("#needToVisit").css("display","block");
+            /*$("#needToVisit").css("display","block");*/
+            $("#needToVisit").css("display","none");
         }else{
             $("#needToVisit").css("display","none");
         }
@@ -272,7 +273,8 @@ function visitByType(type){
         $("#needToVisit").css("display","none");
     }else{
         $("#customer-visit-1").iCheck('check');  //设置需要回访
-        $("#needToVisit").css("display","block");
+        $("#needToVisit").css("display","none");
+        /*$("#needToVisit").css("display","block");*/
     }
     initVisitEvent();
 }