客诉页面优化

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

@@ -63,6 +63,7 @@
       v.visit_status,
       v.visit_complete_date,
       v.visit_name,
+      v.visit_tel,
       v.visit_date,
       v.visit_time_select,
       v.visit_complete_name,

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

@@ -2191,7 +2191,7 @@
         $("#closedProdcues").val(JSON.stringify(closedProdcues));
         $("#closedFittings").val(JSON.stringify(closedFittings));
 
-        var visitTimeSelect = $("input[name='visitTimeSelect']").val();
+        var visitTimeSelect = $("input[name='visitTimeSelect']:checked").val();
         var visit_date = $('#datemin').val();
         var myDate = new Date();
         var date = myDate.getFullYear()+"-"+(myDate.getMonth()+1)+"-"+myDate.getDate();
@@ -2199,13 +2199,13 @@
         //如果两个时间相等，则判断可选的回访时间
         if(Date.parse(visit_date) == Date.parse(date)){
             var msg = "该时间已超过当前时间，请重新选择回访时间!";
-            if (hours >= 12 && visitTimeSelect == 1) {
+            if (hours > 12 && visitTimeSelect == 1) {
                 vailErrorMsg($("#datemin"),msg);
                 return false;
-            } else if (hours >= 14 && visitTimeSelect == 2) {
+            } else if (hours > 14 && visitTimeSelect == 2) {
                 vailErrorMsg($("#datemin"),msg);
                 return false;
-            } else if (hours >= 18 && visitTimeSelect == 3) {
+            } else if (hours > 18 && visitTimeSelect == 3) {
                 vailErrorMsg($("#datemin"),msg);
                 return false;
             }

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

@@ -139,15 +139,15 @@
         var hours = myDate.getHours();
         //如果两个时间相等，则判断可选的回访时间
         if(Date.parse(visit_date) == Date.parse(date)){
-            if (hours >= 12 && visitTimeSelect == 1) {
+            if (hours > 12 && visitTimeSelect == 1) {
                 msg = '该时间已超过当前时间，请重新选择回访时间!';
                 flag = false;
                 return;
-            } else if (hours >= 14 && visitTimeSelect == 2) {
+            } else if (hours > 14 && visitTimeSelect == 2) {
                 msg = '该时间已超过当前时间，请重新选择回访时间!';
                 flag = false;
                 return;
-            } else if (hours >= 18 && visitTimeSelect == 3) {
+            } else if (hours > 18 && visitTimeSelect == 3) {
                 msg = '该时间已超过当前时间，请重新选择回访时间!';
                 flag = false;
                 return;

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

@@ -352,19 +352,31 @@
                     $('#customerTDS').html("<strong>TDS收集:</strong>"+  convertUndefinedToEmpty(customerCommon.relationSendMergeAddress) +",进水"+
                             (customer.customerInTDS==undefined?0:customer.customerInTDS)+"ppm"+",出水"+(customer.customerOutTDS==undefined?0:customer.customerOutTDS)+"ppm");
 
-                    if (customer.customerIsVisit == '2') {
+                    if (customer.customerIsVisit == 2) {
                         var visitTime = '';
                         switch (customer.visitTimeSelect) {
                             case 1:visitTime = '9:00-12:00';break;
                             case 2:visitTime = '12:00-14:00';break;
                             case 3:visitTime = '14:00-18:00';break;
                         }
-                        var visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
-                                        '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
-                                        '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
-                                        convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
-                                        convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
+                        var visitText = "";
+                        if(customer.visitStatus == 1){
+                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
+                                    '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                                    convertUndefinedToEmpty(customer.visitName)+'&nbsp;&nbsp;'+
+                                    convertUndefinedToEmpty(customer.visitTel)+'</span>&nbsp;&nbsp;进行回访';
+
+                    }
+                        if(customer.visitStatus == 2){
+                            visitText = '(<span class="txt-red">'+convertUndefinedToEmpty(customer.visitName)+'</span>)&nbsp;&nbsp;'+
+                                    '在&nbsp;&nbsp;<span class="txt-red">'+convertUndefinedToEmpty(customer.visitDate)+
+                                    '&nbsp;&nbsp;'+convertUndefinedToEmpty(visitTime)+'</span>对&nbsp;&nbsp;<span class="txt-red">'+
+                                    convertUndefinedToEmpty(customer.visitCompleteName)+'&nbsp;&nbsp;'+
+                                    convertUndefinedToEmpty(customer.visitCompleteTel)+'</span>&nbsp;&nbsp;完成回访';
+                        }
                         $('#txtVisit').html(visitText);
+
                     }
                 }
             },

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

@@ -138,7 +138,7 @@
                             <td>${customer.companyName!''}<br/>${customer.storeName!''}</td>
                             <td>${(customer.salesTime?string("yyyy-MM-dd"))!''}</td>
                             <td>${customer.customerArea!''}</td>
-                            <td>进${customer.customerInTDS!'0'}<br/>出${customer.customerOutTDS!'0'}</td>
+                            <td>进${customer.customerInTDS!'0'}PPM<br/>出${customer.customerOutTDS!'0'}PPM</td>
                             <td id="txt_customerIsSolve">
                                 <#if customer.customerIsSolve == 1>
                                     已解决