Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-item.html

@@ -27,7 +27,7 @@
         </div>
         <div class="form-group mr-20">
            <label >订单状态</label>
            <select class="form-control " name="status"  >
            <select class="form-control " name="statu"  >
               <option value=''>--请选择订单状态--</option>
               <option value='欠款'>欠款</option>
               <option value='待付款'>待付款</option>
@@ -84,9 +84,10 @@
               <th data-field="VIP_NAME" >客户名</th>
                   <th data-field="COUNT"  data-sortable="true"   >购买数量</th>
                   <th data-field="ZK_PRICE"  data-sortable="true"   >单价</th>
               <th data-field="total"      >小计</th>
                   <th data-field="su_name" >健康顾问</th>
                   <th data-field="pay_method" >支付方式</th>
                   <th data-field="status" >状态</th>
                   <th data-field="statu" >状态</th>
            </tr>
         </thead>
      </table>
@@ -111,15 +112,11 @@
             url:basePath+"/admin/orderStatistics/showList"
          });
      });
		
      function exportExcel(){
         var select_begin = $("#select_begin").val();
         var select_end = $("#select_end").val();
         var select_id = $("#select_id").val();
         var goodsName = $("#goodsName").val();
         var guwen = $("#goodsName").val();
         window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen;
      }

   function exportExcel(){
      var param=MForm.toUrlParam("#serchform");
      window.location.href=basePath+"/admin/orderStatistics/exportShowList?"+param;
   }


   function initFunctionList() {