修改页面样式，修复bug

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

@@ -40,7 +40,7 @@ public class BackGoods  implements Serializable {
 
     private String backGoodsAlipayName;             //转账账户姓名
 
-    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:待转
+    private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
 
     private Date backGoodsCreateTime;
 

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

@@ -61,7 +61,7 @@ public class CustomerCommon implements Serializable {
     private Integer relationState;
     //转账账户 
     private String relationAlipay;
-    //是否已转账邮费  0:不需要 1:已转  2:待转 
+    //是否已转账邮费  0:不需要 1:已转  2:已申请待转账   3:未申请
     private Integer relationIsTransfer;
     //创建时间 
     private Date relationCreateTime;

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

@@ -39,7 +39,7 @@ public class NoreasonBack  implements Serializable {
     private String noreasonBackAlipay;          //转账账户
     private String noreasonBackAlipayName;          //转账账户姓名
 
-    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:待转
+    private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
 
     private Date noreasonBackCreateTime;
 

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

@@ -67,7 +67,7 @@ public class Renewed  implements Serializable {
     private String renewedAlipay;
     //转账账户 (账户姓名)
     private String renewedAlipayName;
-     //是否已转账邮费  0:不需要 1:已转  2:待转 
+     //是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
     private Integer renewedIsTransfer;
      //创建时间 
     private Date renewedCreateTime;

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

@@ -67,7 +67,7 @@ public class Repair implements Serializable {
     private String repairAlipay;
     //  转账账户 姓名
     private String repairAlipayName;
-    //  是否已转账邮费  0:不需要 1:已转  2:待转 
+    //  是否已转账邮费  0:不需要 1:已转  2:已申请待转  3:未申请
     private Integer repairIsTransfer;
     //  创建时间 
     private Date repairCreateTime;

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

@@ -133,7 +133,7 @@ public class CustomerServiceImpl implements CustomerService {
             customerCommon.setOrderId(salesOrder.getSalesId()); //订单id
             customerCommon.setTransactionNumber(customerInfo.getTransactionNumber());   //外部交易号
 
-            customerCommon.setRelationIsTransfer(0);    //是否已转账邮费  0:不需要
+            customerCommon.setRelationIsTransfer(3);    //是否已转账邮费  3：未申请
             customerCommon.setRelationBackPostage(0);   //邮费默认为0
 
             customerCommon.setRelationBackName(customerCommon.getRelationSendName()); //姓名

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

@@ -287,6 +287,23 @@ public class AdminCustomerController {
 
 
     /**
+     * 查询问题描述
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:add:customer")
+    @RequestMapping(value = "/select_company")
+    public ResponseJson getCompany(HttpServletRequest request) throws Exception {
+
+        //获取销售公司
+        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
+
+        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+        rj.addResponseKeyValue("companyInfoList", companyInfoList);
+        return rj;
+    }
+
+    /**
      * 搜索订单列表弹出框
      *
      * @return
@@ -480,7 +497,7 @@ public class AdminCustomerController {
     @RequiresPermissions("customer:select:customer")
     @RequestMapping("/select_customer_list")
     public ModelAndView selectCustomerList(HttpServletRequest request, CustomerInfo customerInfo,
-                                           @RequestParam(value = "isFirst", defaultValue = "1", required = false) Integer isFirst,
+                                           @RequestParam(value = "isFirst", defaultValue = "2", required = false) Integer isFirst,
                                            @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
@@ -489,7 +506,6 @@ public class AdminCustomerController {
             //获取登录员工id
             Integer adminId = AdminUtils.getLoginAdminId();
             customerInfo.setAdminId(adminId);
-            isFirst = 2;
         }
         PagedResult<CustomerInfo> pagedResult = customerService.listCustomer(pageNO, pageSize, customerInfo, totalNum == 0);
         if (totalNum != 0) {
@@ -511,7 +527,6 @@ public class AdminCustomerController {
         mv.addObject("typeList", typeList);
         mv.addObject("complaintTypeList", complaintTypeList);
         mv.addObject("adminList", adminList);
-        mv.addObject("isFirst", isFirst);
         customerInfo.setVisit(null);
         customerInfo.setCustomerCommon(null);
         customerInfo.setComplaintDetectList(null);

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

@@ -47,6 +47,9 @@ public class AdminCustomerReportController {
     @RequiresPermissions("customer:question:report")
     @RequestMapping(value = "/question_statistics")
     public ResponseJson listStoreInfo(HttpServletRequest request,CustomerInfo customerInfo) {
+
+        Date customerUpdateTime = customerInfo.getCustomerUpdateTime();
+
         ComplaintTypeInfo complaintTypeInfo = new ComplaintTypeInfo();
         List<ComplaintTypeInfo> complaintTypeInfoList = complaintTypeInfoService.listComplaintQuestionToReport(complaintTypeInfo);
         Integer num = 0;

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

@@ -310,12 +310,28 @@
                             <td style="text-align: center;" colspan="8">暂未选择订单</td>
                         </tr>
                     </table>
-                    <input type="hidden" id="companyId" name="companyId" value="" >
-                    <input type="hidden" id="storeId" name="storeId" value="" >
                     <input type="hidden" id="orderId" name="salesId" value="" >
                 </div>
             </div>
 
+            <div class="row cl" id="salesChannelsSelect" style="display: none">
+                <input type="hidden" id="companyId" name="companyId" value="" >
+                <input type="hidden" id="storeId" name="storeId" value="" >
+                <label class="form-label col-1 col-sm-1">销售渠道：</label>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectCompany" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectStore" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+            </div>
+
             <div class="row cl" id="recipientInfoTitle" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收件信息：</label>
                 <div class="formControls col-8 col-sm-8">请先选择订单，系统自动填充姓名，电话和地址信息。</div>

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

@@ -38,7 +38,6 @@
     <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;" class="my-btn-search" onclick="toAddCustomer();">新建客诉</button>
-            <input type="hidden" value="${isFirst!'1'}" placeholder="判断是否是第一次进去客诉列表" id="isFirst" name="isFirst">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px; margin-left: -65px;" value="${customerInfo.customerId!}" placeholder="客诉编号" id="customerId" name="customerId">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.sendLogisticsNo!}" placeholder="物流编号" id="sendLogisticsNo" name="sendLogisticsNo">
             <input type="text" class="my-input"  style="width:90px;margin-right: 0px;" value="${customerInfo.customerName!}" placeholder="请输入姓名" id="customerName" name="customerName">
@@ -322,11 +321,9 @@
                                 <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${customer.customerId!''})">
                                     <font color=#06c>详情</font>
                                 </a><br/>
-                                <#if customer.customerIsSolve != 1>
                                 <a style="text-decoration:none" href="javascript:void(0);" title="修改客诉" onclick="admin_update_customer(${customer.customerId!''})">
                                     <font color=#06c>修改客诉</font>
                                 </a><br/>
-                                </#if>
                                 <#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!''})">

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

@@ -562,7 +562,6 @@
                 companyId : companyId
             },
             url: "${path}/admin/customer/select_storeInfo",
-            async: false,
             success: function(data){
                 var id;
                 if (data.returnCode == 200) {

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

@@ -146,7 +146,11 @@
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
-                        <label for="tel-8">待转账</label>
+                        <label for="tel-8">已申请待转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-9" name="backGoodsIsTransfer" value="3" seleType="postage">
+                        <label for="tel-9">未申请</label>
                     </div>
                 </div>
             </div>

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

@@ -334,8 +334,24 @@
                 </div>
             </div>
 
-            <input type="hidden" id="companyId" name="companyId" value="<#if salesOrder??>${salesOrder.salesCompanyId}</#if>">
-            <input type="hidden" id="storeId" name="storeId" value="<#if salesOrder??>${salesOrder.salesStoreId}</#if>">
+            <div class="row cl" id="salesChannelsSelect" style="">
+                <input type="hidden" id="companyId" name="companyId" value="<#if salesOrder??>${salesOrder.salesCompanyId}</#if>">
+                <input type="hidden" id="storeId" name="storeId" value="<#if salesOrder??>${salesOrder.salesStoreId}</#if>">
+                <label class="form-label col-1 col-sm-1">销售渠道：</label>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectCompany" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <span class="select-box">
+                         <select id="selectStore" class="select" name="">
+                         </select>
+                     </span>
+                </div>
+            </div>
+
             <input type="hidden" id="orderId" name="salesId" value="<#if salesOrder??>${salesOrder.salesId}</#if>">
             <div class="row cl" id="recipientInfoTitle" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>收件信息：</label>

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

@@ -132,7 +132,11 @@
                         </div>
                         <div class="radio-box">
                             <input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2" seleType="postage">
-                            <label for="tel-8">待转账</label>
+                            <label for="tel-8">已申请待转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-9" name="noreasonBackIsTransfer" value="3" seleType="postage">
+                            <label for="tel-9">未申请</label>
                         </div>
                     </div>
                 </div>

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

@@ -148,7 +148,11 @@
                     </div>
                     <div class="radio-box">
                         <input type="radio" id="tel-8" name="renewedIsTransfer" value="2" seleType="postage">
-                        <label for="tel-8">待转账</label>
+                        <label for="tel-8">已申请待转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-9" name="renewedIsTransfer" value="3" seleType="postage">
+                        <label for="tel-9">未申请</label>
                     </div>
                 </div>
             </div>

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

@@ -149,7 +149,11 @@
                         </div>
                         <div class="radio-box">
                             <input type="radio" id="tel-8" name="repairIsTransfer" value="2" seleType="postage">
-                            <label for="tel-8">待转账</label>
+                            <label for="tel-8">已申请待转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-9" name="repairIsTransfer" value="3" seleType="postage">
+                            <label for="tel-9">未申请</label>
                         </div>
                     </div>
                 </div>

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

@@ -92,6 +92,10 @@
         var startTime = $("#startTime").val();
         var endTime = $("#endTime").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("-");

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

@@ -103,8 +103,8 @@ var tool = [
     'emotion', //表情
     'spechars', //特殊字符
     'searchreplace', //查询替换
-    'map', //Baidu地图
-    'gmap', //Google地图
+    // 'map', //Baidu地图
+    // 'gmap', //Google地图
     'insertvideo', //视频
     'help', //帮助
     'justifyleft', //居左对齐
@@ -175,7 +175,6 @@ var isInitSendAddressSms = false;
 // });
 /*===============================加载三个文本域  -- end -- =============================== */
 
-
 /*===============================定义全局变量以及监听事件和初始化  -- start -- =============================== */
 /*处理结果的执行状态*/
 var isSolve = {
@@ -200,17 +199,30 @@ var isSolveTitleMsg = {
 }
 /*===============================定义全局变量以及监听事件和初始化  -- end -- =============================== */
 
-
 /*===============================正则表达式  -- start -- =============================== */
 var phoneReg = /^[1][3,4,5,7,8][0-9]{9}$/;
 /*===============================正则表达式  -- end -- =============================== */
 
 /*=============================== 页面加载完成启动事件  -- start -- =============================== */
 $(function (){
+    /* 所有trim_input 样式，input框都需要去除前后空格*/
     $(".trim_input").change(function(){
         var value = $.trim($(this).val());
         $(this).val(value);
     })
+
+    /*监听销售公司选择事件*/
+    $("#selectCompany").change(function (){
+        var companyId = $(this).val();
+        $("#companyId").val(companyId);
+        setStore(companyId,$("#selectStore"));       //获取店铺
+    })
+
+    /*监听店铺选择事件*/
+    $("#selectStore").change(function (){
+        var storeId = $(this).val();
+        $("#storeId").val(storeId);
+    })
 })
 /*===============================页面加载完成启动事件  -- end -- =============================== */
 
@@ -400,10 +412,12 @@ function initProcessResult(type){
             case 1:
                 otherHied();
                 visitByType(1);
+                getCompany();
                 break;
             case 2:
                 otherHied();
                 visitByType(2);
+                getCompany();
                 break;
             default:
                 break;
@@ -436,10 +450,12 @@ function initProcessResult(type){
             case 1:
                 otherHied();
                 visitByType(1);
+                getCompany();
                 break;
             case 2:
                 otherHied();
                 visitByType(2); //需要回访
+                getCompany();
                 break;
             case 3: //换新
                 result = isSolve.renewed;
@@ -460,6 +476,8 @@ function initProcessResult(type){
                 $("#updateProduct").hide(); //换新产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
+
+                $("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 4: //维修
                 result = isSolve.maintain;
@@ -480,6 +498,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();//维修产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
+                $("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 5://补发
                 result = isSolve.reissue;
@@ -500,6 +519,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").hide();    //邮费转账账户 -- 隐藏
                 visitByType(2); //需要回访
+                $("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 6: //退货
                 result = isSolve.backGoods;
@@ -520,6 +540,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
+                $("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 7://无理由退货
                 result = isSolve.noReasonBack;
@@ -540,6 +561,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
+                $("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             default:
                 break;
@@ -566,6 +588,7 @@ function initProcessResult(type){
 
 /*已解决|未解决 */
 function otherHied(){
+    $("#salesChannelsSelect").show();  //展示销售公司
     $("#processResultStatus").hide();   //处理结果的执行状态  已解决未解决没有该信息
     $("#orderHead").hide();
     $("#order").hide();
@@ -1370,7 +1393,73 @@ function TDSLinkage(node,maxNumber,minNumber){
     }
 }
 
+/**
+ * 获取销售公司
+ */
+function getCompany(companyId){
+    var currentlyCompanyId = $("#companyId").val();
+    if(currentlyCompanyId != null && currentlyCompanyId != ""){
+        companyId = currentlyCompanyId;
+    }
+    $.ajax({
+        type: "get",
+        data: {
+        },
+        url: url_path + "/admin/customer/select_company",
+        success: function(data){
+            if (data.returnCode == 200) {
+                var html = '<option value="">销售公司</option>';
+                for(var i=0;i<data.returnMsg.companyInfoList.length;i++){
+                    var company = data.returnMsg.companyInfoList[i];
+                    html += '<option value="'+ company.companyId +'">'+ company.companyName +'</option>';
+                }
+                $("#selectCompany").html(html);
+
+                if(typeof(companyId) != "undefined"){
+                    $("#selectCompany option[value='" + companyId + "']").attr("selected","true");
+                    if(isUpdate){ //修改页面需要自动获取店铺
+                        setStore(companyId,$("#selectStore"));       //获取店铺
+                    }
+                }
+            }
+        },
+        error: function(XmlHttpRequest, textStatus, errorThrown){
+        }
+    });
+}
+
+/**
+ * 展示销售公司
+ */
+function setStore(companyId,node){
 
+    var html = '<option value="">店铺</option>';
+    $.ajax({
+        type: "POST",
+        data: {
+            companyId : companyId
+        },
+        url: url_path + "/admin/customer/select_storeInfo",
+        success: function(data){
+            var id;
+            if (data.returnCode == 200) {
+                for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
+                    var storeInfo = data.returnMsg.storeInfoList[i];
+                    html += '<option value="'+ storeInfo.storeId +'">'+ storeInfo.storeName +'</option>';
+                }
+            }else{
+                html = '';
+            }
+            $(node).html(html);
+            var currentlyStoreId = $("#storeId").val();
+            if(currentlyStoreId != null && currentlyStoreId != ""){
+                $("#selectStore option[value='" + currentlyStoreId + "']").attr("selected","true");
+            }
+        },
+        error: function(XmlHttpRequest, textStatus, errorThrown){
+        }
+    });
+}
 
 
 /*===============================客诉提交  -- start -- =============================== */