客诉修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderStatController.java

@@ -68,6 +68,7 @@ public class AdminSalesOrderStatController {
     @RequiresPermissions("salesOrder:statistics:sell")
     public ResponseJson listOrderPage(HttpServletRequest request, SalesOrder salesOrder) throws Exception {
         ResponseJson rj = ResponseJson.getSUCCESS();
+        salesOrder.setIsCustmerAddOrder(2);
 
         List<SalesOrder> salesOrderList = new ArrayList();
 

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

@@ -227,7 +227,7 @@
                             <input type="text" class="input-text" value="" placeholder="填写收件人姓名" id="sendName" name="salesAddressName" datatype="s1-20" errormsg="联系人格式不正确！" >
                         </div>
                         <div class="formControls col-3 col-sm-3">
-                            <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="salesAddressTel" datatype="m" errormsg="联系人电话格式不正确！">
+                            <input type="text" class="input-text associated-phone" value="" placeholder="填写收件人手机号" id="sendTel" name="salesAddressTel" errormsg="联系人电话格式不正确！">
                         </div>
                         <div class="formControls col-3 col-sm-3">
                             <input type="text" placeholder="购买日期" id="salesPayTime"  name="salesPayTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '%y-%M-%d'})"  readonly="readonly">

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/sell_order_statistics.ftl

@@ -53,7 +53,7 @@
     <div class="pd-20 cl">
         <form action="" method="post" class="form form-horizontal" id="form-order-add"  >
 
-            <div class="mt-20" style="">
+            <div class="mt-20 order_sell_table" style="" >
                 <table class="table table-border table-bg table-bordered">
                     <thead>
                         <tr class="text-c">
@@ -84,8 +84,7 @@
         date.setDate(1);
         date.setHours(0);
         date.setMinutes(0);
-        date.setSeconds(0);
-        var startDate = formatDate(date,"yyyy-MM-dd HH:mm:ss");
+        date.setSeconds(0);       var startDate = formatDate(date,"yyyy-MM-dd HH:mm:ss");
 
         var endDate = new Date();
         endDate.setMonth(endDate.getMonth()+1);
@@ -111,6 +110,7 @@
 
                 var num = 0;
                 var isMethod=null;
+                var typeChangeNum = 1;
                 for(var i=0; i<res.returnMsg.salesOrderList.length;i++){
                     var so = res.returnMsg.salesOrderList[i];
                     var typeName = so.procTypeName;
@@ -119,34 +119,108 @@
                         typeName = "正常订单";
                         methodName = "销售订单";
                     }
+
+                    var oldNum = num;
+                    var isChange = false;
+
                     if(isMethod == null){
                         isMethod = typeName;
-                    }
-                    if(isMethod == typeName){
-                        num+=so.itemNum;
+                        num=so.itemNum;
                     }else{
-                        isMethod = typeName;
-                        num = 0;
+                        if(isMethod == typeName){
+                            num+=so.itemNum;
+                        }else{
+                            isChange = true;
+                            isMethod = typeName;
+                            num = so.itemNum;
+                            typeChangeNum++;
+                        }
                     }
+
                     html +=  '<tr>'
-                        + ' <td>'+ so.companyName +'</td>'
-                        + ' <td>'+ typeName +'</td>'
-                        + ' <td>'+ methodName +'</td>'
-                        + ' <td>'+  +'</td>'
-                        + ' <td>'+ so.itemProductName +'('+ so.itemProductColor +')</td>'
-                        + ' <td>'+ so.itemNum +'</td>'
-                        + ' <td>'+ so.itemNum +'</td>'
-                        + ' </tr>';
+                            + ' <td >'+ so.companyName +'</td>'
+                            + ' <td>'+ typeName +'</td>'
+                            + ' <td>'+ methodName +'</td>'
+                            + ' <td>allTypeNum_'+ typeChangeNum +'</td>'
+                            + ' <td>'+ so.itemProductName +'('+ so.itemProductColor +')</td>'
+                            + ' <td>'+ so.itemNum +'</td>'
+                            + ' <td>'+ so.itemNum +'</td>'
+                            + ' </tr>';
+
+                    if(isChange){
+                        html = html.myReplace("allTypeNum_"+(typeChangeNum-1),oldNum);
+                    }
                 }
+                html = html.myReplace("allTypeNum_"+(typeChangeNum),num);
+
                 $("#allDay").html(html);
                 if(loadIndex != 0 ){
                     layer.close(loadIndex);
                 }
+
+                tableMana(0);
+                tableMana(1);
+                tableMana(2);
+//                tableMana(3);
+                tableManByTd(3,1);
             }
         });
-    })
+    });
 
+    String.prototype.myReplace=function(f,e){//吧f替换成e
+        var reg=new RegExp(f,"g"); //创建正则RegExp对象
+        return this.replace(reg,e);
+    }
 </script>
 
 </body>
-</html>
+
+<script>
+    function tableMana(num) {
+        var rowspanName = null;
+        var rowspanNum = 1;
+        var $rowspan=null;
+        $("#allDay").find("tr").each(function(){
+            var $tdNode =  $(this).find("td").eq(num);
+            $tdNode.hide();
+            if(rowspanName == null){
+                rowspanName = $tdNode.html();
+                $rowspan = $tdNode;
+                return true;
+            }
+            if(rowspanName == $tdNode.html()){
+                rowspanNum ++;
+            }else{
+                $rowspan.show();
+                $rowspan.attr("rowspan",rowspanNum);
+
+                $rowspan = $tdNode;
+                rowspanNum = 1;
+                rowspanName = $tdNode.html();
+            }
+        });
+        $rowspan.show();
+        $rowspan.attr("rowspan",rowspanNum);
+    }
+
+    function tableManByTd(num,oldNum) {
+        $("#allDay").find("tr").each(function() {
+            var $oldTdNode = $(this).find("td").eq(oldNum);
+            var $tdNode = $(this).find("td").eq(num);
+            var rowspanNum = $oldTdNode.attr("rowspan");
+            var rowspanShow = $oldTdNode.is(':visible');
+
+            $tdNode.attr("rowspan", rowspanNum);
+            if (!rowspanShow) {
+                $tdNode.hide();
+            }
+        });
+
+    }
+</script>
+
+</html>
+
+
+
+