客诉页面优化

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

@@ -105,6 +105,9 @@
       <if test="customerId != null and customerId != ''">
         and c.customer_id = #{customerId}
       </if>
+      <if test="typeId != null and typeId != ''">
+        and c.type_id = #{typeId}
+      </if>
     </where>
     ORDER BY FIELD(c.customer_is_solve, 5, 3, 4, 6, 7, 2, 1),c.customer_id desc
   </select>

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

@@ -1377,6 +1377,11 @@
                 layer.msg("请填写问题标题！", {icon: 5, time: 3000});
                 return false;
             }
+            if(describeTitle.length > 50){
+                layer.close(index);
+                layer.msg("问题标题长度不能高于50个字符！", {icon: 5, time: 3000});
+                return false;
+            }
             if(desc == null || desc == ""){
                 layer.close(index);
                 layer.msg("请填写问题内容！", {icon: 5, time: 3000});
@@ -1781,8 +1786,8 @@
                     var fristInputStyle = "border-top: 1px solid #ddd;";
                     if(color.colorProductId == product.productId) {
                         colorHtml += '<tr >' +
-                                '         <td width="85" style="border-left: none;text-align: center;'+ fristInputStyle +'">' + color.colorName + '</td>' +
-                                '         <td width="15" style="'+ fristInputStyle +' padding: 0px;width: 25px;">' +
+                                '         <td width="55" style="border-left: none;text-align: center;'+ fristInputStyle +'">' + color.colorName + '</td>' +
+                                '         <td width="45" style="'+ fristInputStyle +' padding: 0px;width: 25px;">' +
                                 '             <input type="hidden" class="input-produce-id" value="' + color.colorProductId + '">' +
                                 '             <input type="hidden" class="input-color-id" value="' + color.colorId + '">' +
                                 '             <input type="text" class="input-text input-color-number number-input" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="产品数量"  id="color-' + color.colorProductId + '-' + color.colorId + '" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)" >' +
@@ -1805,8 +1810,8 @@
                     if(produceFit.productId == product.productId) {
                         var fristInputStyle = "border-top: 1px solid #ddd;";
                         produceFittingsHtml += '<tr >' +
-                                '         <td width="85" style="border-left: none;text-align: center; '+ fristInputStyle +'">' + produceFit.fittingsName +'</td>' +
-                                '         <td width="15" style="'+ fristInputStyle +'padding: 0px;width: 25px;">' +
+                                '         <td width="55" style="border-left: none;text-align: center; '+ fristInputStyle +'">' + produceFit.fittingsName +'</td>' +
+                                '         <td width="45" style="'+ fristInputStyle +'padding: 0px;width: 25px;">' +
                                 '             <input type="hidden" class="input-produce-id" value="' + produceFit.productId + '">' +
                                 '             <input type="hidden" class="input-fittings-id" value="' + produceFit.fittingsId +'">' +
                                 '             <input type="text" class="input-text input-fittings-number" style="width: 100%;border: none;text-align: center;" value="'+ number +'" placeholder="配件数量" id="fittings-' + produceFit.productId + '-' + produceFit.fittingsId +'" name="" onkeyup="keyFun($(this),999)" onpaste="keyFun($(this),999)" >' +
@@ -2194,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 > 16 && visitTimeSelect == 3) {
+            } else if (hours >= 18 && visitTimeSelect == 3) {
                 msg = '该时间已超过当前时间，请重新选择回访时间!';
                 flag = false;
                 return;
@@ -213,7 +213,7 @@
                 }
             });
         } else {
-            layer.msg(msg, {icon: 5, time: 500});
+            layer.msg(msg, {icon: 5, time: 2000});
         }
     }