Merge branch 'developer'

935090232@qq.com

2022-02-24 8c6026959d3006bbf9dce3f3c9311e70a02b80c1

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

@@ -77,15 +77,18 @@
         <thead>
            <tr>
               <th data-formatter="MGrid.indexfn" data-align="center"  data-width="30px" >序号</th>
               <th data-field="consume_time"  data-formatter="MGrid.getTime"  data-sortable="true"   >服务日期</th>
               <th data-field="SHOP_NAME" >门店</th>
               <th data-field="yy_time"  data-formatter="MGrid.getTime"  data-sortable="true"   >预约时间</th>
               <th data-field="consume_time"  data-formatter="MGrid.getTime"  data-sortable="true"   >划扣时间</th>
               <th data-field="SERVICE_NO" >服务单号</th>
               <th data-field="PROJ_NAME" >服务名称</th>
               <th data-field="TYPE_NAME" >分类</th>
               <th data-field="VIP_NAME" >客户名</th>
                   <th data-field="COUNT"  data-sortable="true"     >次数</th>
                   <th data-field="PRICE"  data-sortable="true"       >单价</th>
                   <th data-field="su_name" >美疗师</th>
                   <th data-field="SOURCE" >来源</th>
               <th data-field="COUNT"  data-sortable="true"     >次数</th>
               <th data-field="PRICE"  data-sortable="true"       >划扣单价</th>
               <th data-field="extract"  data-sortable="true"  >提成</th>
               <th data-field="su_name" >美疗师</th>
               <th data-field="SOURCE" >来源</th>
            </tr>
         </thead>
      </table>
@@ -107,18 +110,17 @@
         //有删除权限
         var delUrl="";
         myGrid=MGrid.initGrid({
             url:basePath+"/admin/serviceStatistics/showList"
            url:basePath+"/admin/serviceStatistics/showList",
            sortName:"yy_time",
            sortOrder:"desc"
          });
      });
		
      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/serviceStatistics/exportShowList?"+param;
   }


   function initFunctionList() {