Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -26,7 +26,7 @@
            </div>
         </div>
         <div class="form-group mr-20">
            <label  >订单状态</label>
            <label>订单状态</label>
            <select class="form-control " name="state"  >
               <option value=''>--请选择订单状态--</option>
               <option value='待预约'>待预约</option>
@@ -36,14 +36,14 @@
            </select>
         </div>
         <div class="form-group mr-20">
            <label  >产品名称</label>
            <label>服务名称</label>
            <input autocomplete="off"   name="projName" type="text" class="form-control" >
         </div>

         <div class="form-group mr-20">
            <label for="projTypeId">项目分类</label>
            <label for="projTypeId">商品分类</label>
            <select class="form-control select2" size="1" name ="cateId"  id="projTypeId">
               <option value=''>--选择项目分类--</option>
               <option value=''>--选择分类--</option>
            </select>
         </div>

@@ -91,25 +91,20 @@
             url:basePath+"/admin/serviceStatistics/summaryItemDetail"
          });
      });
		
      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/exportSummaryItemDetail?"+param;
   }

   function initFunctionList() {
      $.AjaxProxy({
         a : false,
         c : false
      }).invoke(basePath+"/admin/projtype/all", function(loj) {
         a: false,
         c: false,
         p: {salePlatform: '线下'}
      }).invoke(basePath + "/admin/shoppinggoodscategory/all", function (loj) {
         $("#projTypeId").createSelectTree(loj.attr("result").rows, {
            append : true,
            value:"typeName"
            append: true,
            value: "name",
         });
      });
   }