客诉修改

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

@@ -11,35 +11,15 @@
 <#include "/base/add_base.ftl">
     <title>出库列表</title>
     <style>
-        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
-        .tit-2:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
-        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
-        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
-        .ac_results li {border:1px solid #fff}
-        .ac_results li a span {float:right}
-        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
-        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 25px;}
-        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
-        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
-        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
-        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
-        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
-        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
-        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
-        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
-        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
-        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
-        .time-line-list>li:first-child .arrow{display: none;}
-        .table-bg th{background-color: #e2f6ff;}
-        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
-        .msg-phone{height: 35px;line-height: 35px;}
-        .col-sm-1{width: 150px;}
-
-        .all_down{text-decoration: underline;color: #00c;}
-
-        .bold{    color: #f00;font-weight: bold;}
+        html{-webkit-text-size-adjust:none;}
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #e2f6ff;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
     </style>
 </head>
 <body>
@@ -50,20 +30,32 @@
 </nav>
 
 <article class="page-container" style="padding: 10px;">
+
+    <div class="text-c">
+        <form action="" method="post">
+            <input type="text" style="margin-top: -3px;width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})" value="" readonly="readonly"/> -
+            <input type="text" style="margin-top: -3px;width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})" value="" readonly="readonly"/>
+
+            <button type="button" class="my-btn-search" style="" id="" name="" onclick="getOrderStatistics();"><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+        </form>
+    </div>
+
     <div class="pd-20 cl">
         <form action="" method="post" class="form form-horizontal" id="form-order-add"  >
-
             <div class="mt-20 order_sell_table" style="" >
                 <table class="table table-border table-bg table-bordered">
                     <thead>
                         <tr class="text-c">
+                            <th colspan="6" style="text-align: left"></th>
+                        </tr>
+                        <tr class="text-c">
                             <th>销售公司</th>
                             <th>订单类型</th>
                             <th>类型描述</th>
                             <th>订单数量</th>
                             <th>产品名称</th>
                             <th>产品数量</th>
-                            <th>实发数量</th>
+                            <#--<th>实发数量</th>-->
                         </tr>
                     </thead>
                     <tbody id="allDay">
@@ -78,22 +70,35 @@
 
 <tfoot>
 </tfoot>
+<#--时间控件-->
+<script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+
 <script>
     $(function (){
         var date = new Date();
         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);
-        endDate.setDate(1);
+        var endDate = new Date(date.getFullYear(),date.getMonth()+1,0);
         endDate.setHours(23);
         endDate.setMinutes(59);
         endDate.setSeconds(59);
         endDate = formatDate(endDate,"yyyy-MM-dd HH:mm:ss");
 
+
+        $("#startDate").val(startDate);
+        $("#endDate").val(endDate);
+
+        getOrderStatistics();
+    });
+
+    function getOrderStatistics(){
+        var startDate =  $("#startDate").val();
+        var endDate =  $("#endDate").val();
+
         loadIndex = layer.load(1, {
             shade: [0.5,'#fff'] //0.1透明度的白色背景
         });
@@ -115,10 +120,16 @@
                     var so = res.returnMsg.salesOrderList[i];
                     var typeName = so.procTypeName;
                     var methodName = so.procMethodName;
+                    var newTypeName = so.procTypeName;
+                    var newMethodName = so.procMethodName;
                     if(!isEmpty(so.procTypeName) && !isEmpty(so.procMethodName)){
                         typeName = "正常订单";
                         methodName = "销售订单";
+                        newTypeName = "正常订单";
+                        newMethodName = "销售订单";
                     }
+                    typeName = so.companyName + so.procTypeName;
+                    methodName = so.companyName + so.procTypeName + so.procMethodName;
 
                     var oldNum = num;
                     var isChange = false;
@@ -138,13 +149,13 @@
                     }
 
                     html +=  '<tr>'
-                            + ' <td >'+ so.companyName +'</td>'
-                            + ' <td>'+ typeName +'</td>'
-                            + ' <td>'+ methodName +'</td>'
-                            + ' <td>allTypeNum_'+ typeChangeNum +'</td>'
+                            + ' <td msg="'+ so.companyName +'">'+ so.companyName +'</td>'
+                            + ' <td msg="'+ so.companyName + typeName +'">'+ newTypeName +'</td>'
+                            + ' <td msg="'+ so.companyName + typeName + methodName +'">'+ newMethodName +'</td>'
+                            + ' <td style="text-align: center">allTypeNum_'+ typeChangeNum +'</td>'
                             + ' <td>'+ so.itemProductName +'('+ so.itemProductColor +')</td>'
-                            + ' <td>'+ so.itemNum +'</td>'
-                            + ' <td>'+ so.itemNum +'</td>'
+                            + ' <td style="text-align: center">'+ so.itemNum +'</td>'
+                            //                            + ' <td>'+ so.itemNum +'</td>'
                             + ' </tr>';
 
                     if(isChange){
@@ -161,11 +172,10 @@
                 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对象
@@ -184,11 +194,11 @@
             var $tdNode =  $(this).find("td").eq(num);
             $tdNode.hide();
             if(rowspanName == null){
-                rowspanName = $tdNode.html();
+                rowspanName = $tdNode.attr("msg");
                 $rowspan = $tdNode;
                 return true;
             }
-            if(rowspanName == $tdNode.html()){
+            if(rowspanName == $tdNode.attr("msg")){
                 rowspanNum ++;
             }else{
                 $rowspan.show();
@@ -196,7 +206,7 @@
 
                 $rowspan = $tdNode;
                 rowspanNum = 1;
-                rowspanName = $tdNode.html();
+                rowspanName = $tdNode.attr("msg");
             }
         });
         $rowspan.show();
@@ -215,7 +225,6 @@
                 $tdNode.hide();
             }
         });
-
     }
 </script>
 

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

@@ -151,7 +151,8 @@
                         if(ulc.options.ulcLevel.length-1 > level ){
                             var ulcId = ulc.options.ulcLevel[level+1].ulcId,ulcName=ulc.options.ulcLevel[level+1].ulcName;
                             if(ulc.ulcIsEmpty(ulcName)){
-                                ulcId = ulc.getUlcIdByName(ulc.options.ulcLevel[level+1]);
+                                var itemUlcId = ulc.getUlcIdByName(ulc.options.ulcLevel[level+1]);
+                                ulcId = itemUlcId;
                             }
                             if(ulc.ulcIsEmpty(ulcId)){
                                 ulcId = ulc.options.ulcLevel[level+1].ulcId;
@@ -241,10 +242,6 @@
             return this;
         },
         getUlcIdByName:function(node,name){
-            /**
-             *  形参 1：level级别
-             *  形参 2：名称，非必填，为空的时候，使用节点获取名称
-             */
             var $node = node.ulcNode;
             if(name == null){
                 name = node.ulcName;
@@ -253,22 +250,35 @@
                 return "";
             }
             var ulc = this;
+            var oldName = name;
             for (var i=0;i<ulc.options.judgeNameShield.length;i++){
                 name = name.replace(ulc.options.judgeNameShield[i],"");
             }
             var max = 0,maxValue="";
             $node.find("option").each(function(){
-                var number=0,attrName = "";
-                if($(this).text().indexOf(name) > -1){
+                var number=0;
+                var thisName = $(this).text()
+                if(thisName.indexOf(name) > -1){
                     number ++;
-                    if($(this).text() == name){
+                    if(thisName == name){
+                        number ++;
+                    }
+                }
+                for (var i=0;i<ulc.options.judgeNameShield.length;i++){
+                    thisName = thisName.replace(ulc.options.judgeNameShield[i],"");
+                }
+                if(oldName.indexOf(thisName) > -1){
+                    number ++;
+                    if(thisName == name){
+                        number ++;
+                    }
+                    if(oldName == name){
                         number ++;
                     }
-                    attrName = $(this).val();
                 }
                 if(max < number){
                     max = number;
-                    maxValue = attrName;
+                    maxValue = $(this).val();
                 }
             });
             return maxValue;
@@ -404,7 +414,7 @@ function init_ulc(node){
         var $ulc2 = $(".init_ulc").find(".ulc_level_2");
         var ulc = $(".init_ulc").initUlc({
             urlPrefix: "",          // 根路径
-            judgeNameShield : ["x1","x2"],      //在比对option的text的值时，需要去掉某些值，才能展示出包含的参数，如"省","市","县","乡","镇","市","自治区" -- 可选
+            judgeNameShield : ["x1","x2"],      //在比对option的text的值时，需要去掉某些值，才能展示出包含的参数，如"省","市","县","乡","镇","市","自治区" 如果需要加上"壮族自治区"和"自治区"，应先写"壮族自治区" -- 可选
             allCallback: function xx(data){}        //回调函数名称，可选 -- 所有的select点击，都会触发此函数，回调的值为所有的selece选中的data数据 -- 可选
             ulcLevel :  [           //select的集合
                 {

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

@@ -93,7 +93,7 @@ function initAddress(addressNode){
     var $country = $(".address_info").find(".init_country");
     var ulc = $(".address_info").initUlc({
         urlPrefix: root_path,
-        judgeNameShield : ["省","市","县","乡","镇","市","自治区"],
+        judgeNameShield : ["省","市","县","乡","镇","市","洲","州","地区","壮族自治区","维吾尔自治区","自治区"],
         ulcLevel :  [
             {
                 ulcNode: $provice,	//节点
@@ -178,7 +178,7 @@ function initAddress(addressNode){
 function init_address(node){
     var ulc = $(node).initUlcByHtml({
         urlPrefix: root_path,
-        judgeNameShield : ["省","市","县","乡","镇","市","自治区"],
+        judgeNameShield : ["省","市","县","乡","镇","市","洲","州","地区","壮族自治区","维吾尔自治区","自治区"],
         ulcLevel:null
     });
     return ulc;