Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-11-30 8fc1e2dc0b0b0ebacfefe32850dad64be4440b1e

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

@@ -42,7 +42,14 @@
            <label>会员</label>
            <input autocomplete="off" placeholder="姓名/编号/电话"  name="vipQueryKey" type="text" class="form-control"  >
         </div>

         <div class="form-group mr-20">
            <label >所属门店</label> <select
               class="form-control autoFull"
               data-url="/admin/shopInfo/findShops" data-value="id"
               data-filed="shopName"  name="shopId">
            <option value="">--请选择所属门店--</option>
         </select>
         </div>

         <div class="form-group mr-20">
            <label>到期时间</label><!--    入库时间的查询增加一个查询的其实时间两个字段 -->
@@ -104,17 +111,15 @@
             url:basePath+"/admin/projUseStatistics/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;
         var param=MForm.toUrlParam("#serchform");
         window.location.href=basePath+"/admin/projUseStatistics/exportShowList?"+param;
      }



   function initFunctionList() {
      $.AjaxProxy({
         a: false,