Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-11-02 2e08d6d4c0710d3e535b5944faa9df4af828c0f7

 zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html

@@ -25,30 +25,28 @@
               <button  onclick="myGrid.resetForm()" type="button"   class="btn btn-default btn-sm"><i class="fa fa-refresh " ></i> 重置</button>
            </div>
         </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="parentId">商品分类</label>-->
<!--            <select class="form-control select2" size="1" name="cateId" id="parentId">-->
<!--               <option value="" selected="selected">&#45;&#45;选择分类&#45;&#45;</option>-->
<!--            </select>-->
<!--         </div>-->

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

         <div class="form-group mr-20">
            <label>会员</label>
            <input autocomplete="off" placeholder="姓名/编号/电话"  name="vipQueryKey" type="text" class="form-control"  >
         </div>
<!--         <div class="form-group mr-20">-->
<!--            <label>会员</label>-->
<!--            <input autocomplete="off" placeholder="姓名/编号/电话"  name="vipQueryKey" type="text" class="form-control"  >-->
<!--         </div>-->


         <div class="form-group mr-20">
            <label>到期时间</label><!--    入库时间的查询增加一个查询的其实时间两个字段 -->
            <input autocomplete="off"   id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">-
            <input autocomplete="off"   name="endTime"  type="text" class="form-control datetimepicker" id="select_end">
         </div>
<!--         <div class="form-group mr-20">-->
<!--            <label>到期时间</label>&lt;!&ndash;    入库时间的查询增加一个查询的其实时间两个字段 &ndash;&gt;-->
<!--            <input autocomplete="off"   id="select_begin" name="beginTime" type="text" class="form-control datetimepicker">- -->
<!--            <input autocomplete="off"   name="endTime"  type="text" class="form-control datetimepicker" id="select_end">-->
<!--         </div>-->
      </form>
      <div id="option-bar" >
         <button matrix:btn="bedList-exportExcel" onclick="exportExcel()" type="button" class="btn btn-default btn-sm"><i class="fa fa-download" ></i> 导出</button>
@@ -87,15 +85,12 @@
             url:basePath+"/admin/moneyCardUseStatistics/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/moneyCardUseStatistics/exportSummaryItemDetail?"+param;
   }



   function initFunctionList() {