~jiangyouyao/beauty-erp.git

			@@ -27,14 +27,14 @@
			</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>

			@@ -43,6 +43,14 @@
			<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><!-- 入库时间的查询增加一个查询的其实时间两个字段 -->
			@@ -58,6 +66,7 @@
			<tr>
			<th data-formatter="MGrid.indexfn" data-align="center" data-width="30px" >序号</th>
			<th data-field="VIP_NAME" >客户名</th>
			<th data-field="SHOP_NAME" >客户门店</th>
			<th data-field="PROJ_NAME" >服务名称</th>
			<th data-field="FAIL_TIME" data-formatter="MGrid.getTime" data-sortable="true" >到期日期</th>
			<th data-field="SURPLUS_COUNT" data-sortable="true" >剩余次数</th>
			@@ -104,25 +113,22 @@
			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() {
			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",
			});
			});
			}